Remove regression_svrlight_modular.cs if SVMLight is disabled (issue #…

…1600) use appropriate macro in PermutationMatrix_unittest.cc
shogun-toolbox · Sep 17, 2013 · cfdbbca · cfdbbca
1 parent b8753cb
commit cfdbbca
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/examples/undocumented/csharp_modular/CMakeLists.txt b/examples/undocumented/csharp_modular/CMakeLists.txt
@@ -1,5 +1,8 @@
 FILE(GLOB TARGETS_SRC RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.cs)
 LIST(REMOVE_ITEM TARGETS_SRC Load.cs)
+IF (NOT USE_SVMLIGHT)
+	LIST(REMOVE_ITEM TARGETS_SRC regression_svrlight_modular.cs)
+ENDIF()
 
 SET(CSHARP_FLAGS "${CMAKE_CURRENT_SOURCE_DIR}/Load.cs;/lib:${CSHARP_MODULAR_BUILD_DIR};/r:modshogun")
 
@@ -8,14 +11,14 @@ FOREACH(EXAMPLE_SRC ${TARGETS_SRC})
 	STRING(REGEX REPLACE "(.*).cs" "\\1.exe" EXAMPLE_BINARY ${EXAMPLE_SRC})
 
 	ADD_CUSTOM_COMMAND(OUTPUT ${EXAMPLE_NAME}
-						COMMAND	${CSHARP_COMPILER} ${CMAKE_CURRENT_SOURCE_DIR}/${EXAMPLE_SRC} ${CSHARP_FLAGS} -out:${EXAMPLE_BINARY}
-						DEPENDS csharp_modular
-						WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+		COMMAND	${CSHARP_COMPILER} ${CMAKE_CURRENT_SOURCE_DIR}/${EXAMPLE_SRC} ${CSHARP_FLAGS} -out:${EXAMPLE_BINARY}
+		DEPENDS csharp_modular
+		WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 	LIST(APPEND CSHARP_EXAMPLES ${EXAMPLE_NAME})
 
 	add_test(NAME ${EXAMPLE_NAME}
-			WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-			COMMAND ${CSHARP_INTERPRETER} ${CMAKE_CURRENT_BINARY_DIR}/${EXAMPLE_BINARY})
+		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+		COMMAND ${CSHARP_INTERPRETER} ${CMAKE_CURRENT_BINARY_DIR}/${EXAMPLE_BINARY})
 	set_property(TEST ${EXAMPLE_NAME} PROPERTY
 		ENVIRONMENT "MONO_PATH=${CSHARP_MODULAR_BUILD_DIR}")
 ENDFOREACH()

diff --git a/tests/unit/evaluation/ica/PermutationMatrix_unittest.cc b/tests/unit/evaluation/ica/PermutationMatrix_unittest.cc
@@ -14,7 +14,7 @@ TEST(PermutationMatrix, is_perm)
 	SGMatrix<float64_t> A = SGMatrix<float64_t>::create_identity_matrix(d,1);
 
 	bool isperm = is_permutation_matrix(A);
-	EXPECT_EQ(isperm,true);
+	EXPECT_TRUE(isperm);
 }
 
 TEST(PermutationMatrix, is_not_perm)
@@ -25,7 +25,7 @@ TEST(PermutationMatrix, is_not_perm)
 	A(2,3) = 1;	
 
 	bool isperm = is_permutation_matrix(A);
-	EXPECT_EQ(isperm,false);
+	EXPECT_FALSE(isperm);
 }
 
 #endif //HAVE_EIGEN3