adaption for new SHOGUN-namespace-defines

shogun-toolbox · Dec 8, 2013 · 4b3c20f · 4b3c20f
1 parent 69afb16
commit 4b3c20f
Show file tree

Hide file tree

Showing 477 changed files with 1,834 additions and 1,842 deletions.
diff --git a/examples/undocumented/csharp_modular/CMakeLists.txt.old b/examples/undocumented/csharp_modular/CMakeLists.txt.old
@@ -1,6 +1,6 @@
 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)
+IF (NOT SHOGUN_USE_SVMLIGHT)
 	LIST(REMOVE_ITEM TARGETS_SRC regression_svrlight_modular.cs)
 ENDIF()
 

diff --git a/examples/undocumented/libshogun/classifier_gaussian_process_binary_classification.cpp b/examples/undocumented/libshogun/classifier_gaussian_process_binary_classification.cpp
@@ -10,7 +10,7 @@
 #include <lib/config.h>
 
 // Eigen3 is required for working with this example
-#ifdef HAVE_EIGEN3
+#ifdef SHOGUN_HAVE_EIGEN3
 
 #include <base/init.h>
 #include <labels/BinaryLabels.h>
@@ -126,4 +126,4 @@ int main(int argc, char **argv)
 	return 0;
 }
 
-#endif /* HAVE_EIGEN3 */
+#endif /* SHOGUN_HAVE_EIGEN3 */
diff --git a/examples/undocumented/libshogun/classifier_knn.cpp b/examples/undocumented/libshogun/classifier_knn.cpp
@@ -24,7 +24,7 @@ int main(int, char*[])
 {
 	init_shogun_with_defaults();
 
-#ifdef HAVE_LAPACK /* because of CDataGenerator::generate_gaussians */
+#ifdef SHOGUN_HAVE_LAPACK /* because of CDataGenerator::generate_gaussians */
 
 	// Labels and features containers
 	SGVector<float64_t> lab(CLASSES*NUM);
@@ -53,7 +53,7 @@ int main(int, char*[])
 	SG_UNREF(knn)
 	SG_UNREF(output)
 
-#endif /* HAVE_LAPACK */
+#endif /* SHOGUN_HAVE_LAPACK */
 
 	exit_shogun();
 	return 0;

diff --git a/examples/undocumented/libshogun/classifier_lda.cpp b/examples/undocumented/libshogun/classifier_lda.cpp
@@ -29,8 +29,8 @@ using namespace shogun;
 
 void test()
 {
-#ifdef HAVE_LAPACK
-#ifdef HAVE_EIGEN3
+#ifdef SHOGUN_HAVE_LAPACK
+#ifdef SHOGUN_HAVE_EIGEN3
 	SGVector< float64_t > lab(CLASSES*NUM);
 	SGMatrix< float64_t > feat(DIMS, CLASSES*NUM);
 

diff --git a/examples/undocumented/libshogun/classifier_qda.cpp b/examples/undocumented/libshogun/classifier_qda.cpp
@@ -24,8 +24,8 @@ using namespace shogun;
 
 void test()
 {
-#ifdef HAVE_EIGEN3
-#ifdef HAVE_LAPACK
+#ifdef SHOGUN_HAVE_EIGEN3
+#ifdef SHOGUN_HAVE_LAPACK
 	SGVector< float64_t > lab(CLASSES*NUM);
 	SGMatrix< float64_t > feat(DIMS, CLASSES*NUM);
 
@@ -53,8 +53,8 @@ void test()
 	// Free memory
 	SG_UNREF(output);
 	SG_UNREF(qda);
-#endif // HAVE_LAPACK
-#endif // HAVE_EIGEN3
+#endif // SHOGUN_HAVE_LAPACK
+#endif // SHOGUN_HAVE_EIGEN3
 }
 
 int main(int argc, char ** argv)

diff --git a/examples/undocumented/libshogun/classifier_svmlight_string_features_precomputed_kernel.cpp b/examples/undocumented/libshogun/classifier_svmlight_string_features_precomputed_kernel.cpp
@@ -17,7 +17,7 @@
 
 using namespace shogun;
 
-#ifdef USE_SVMLIGHT
+#ifdef SHOGUN_USE_SVMLIGHT
 void test_svmlight()
 {
 	/* data is random length strings with only zeros (A) or ones (B) */

diff --git a/examples/undocumented/libshogun/converter_diffusionmaps.cpp b/examples/undocumented/libshogun/converter_diffusionmaps.cpp
@@ -10,7 +10,7 @@
 
 #include <lib/config.h>
 
-#ifdef HAVE_EIGEN3
+#ifdef SHOGUN_HAVE_EIGEN3
 #include <base/init.h>
 #include <features/DenseFeatures.h>
 #include <converter/DiffusionMaps.h>

diff --git a/examples/undocumented/libshogun/converter_factoranalysis.cpp b/examples/undocumented/libshogun/converter_factoranalysis.cpp
@@ -9,7 +9,7 @@
 
 #include <lib/config.h>
 
-#ifdef HAVE_EIGEN3
+#ifdef SHOGUN_HAVE_EIGEN3
 #include <base/init.h>
 #include <features/DenseFeatures.h>
 #include <converter/FactorAnalysis.h>

diff --git a/examples/undocumented/libshogun/converter_hessianlocallylinearembedding.cpp b/examples/undocumented/libshogun/converter_hessianlocallylinearembedding.cpp
@@ -10,7 +10,7 @@
 
 #include <lib/config.h>
 
-#ifdef HAVE_EIGEN3
+#ifdef SHOGUN_HAVE_EIGEN3
 #include <base/init.h>
 #include <features/DenseFeatures.h>
 #include <converter/HessianLocallyLinearEmbedding.h>

diff --git a/examples/undocumented/libshogun/converter_isomap.cpp b/examples/undocumented/libshogun/converter_isomap.cpp
@@ -10,7 +10,7 @@
 
 #include <lib/config.h>
 
-#ifdef HAVE_EIGEN3
+#ifdef SHOGUN_HAVE_EIGEN3
 #include <base/init.h>
 #include <features/DenseFeatures.h>
 #include <converter/Isomap.h>

diff --git a/examples/undocumented/libshogun/converter_jade_bss.cpp b/examples/undocumented/libshogun/converter_jade_bss.cpp
@@ -16,7 +16,7 @@
 
 using namespace shogun;
 
-#ifdef HAVE_EIGEN3
+#ifdef SHOGUN_HAVE_EIGEN3
 
 #include <features/DenseFeatures.h>
 #include <mathematics/Math.h>
@@ -100,15 +100,15 @@ void test()
 	return;
 }
 
-#endif // HAVE_EIGEN3
+#endif // SHOGUN_HAVE_EIGEN3
 
 int main(int argc, char ** argv)
 {
 	init_shogun_with_defaults();
 
-#ifdef HAVE_EIGEN3
+#ifdef SHOGUN_HAVE_EIGEN3
 	test();
-#endif // HAVE_EIGEN3
+#endif // SHOGUN_HAVE_EIGEN3
 	exit_shogun();
 
 	return 0;

diff --git a/examples/undocumented/libshogun/converter_kernellocallylinearembedding.cpp b/examples/undocumented/libshogun/converter_kernellocallylinearembedding.cpp
@@ -10,7 +10,7 @@
 
 #include <lib/config.h>
 
-#ifdef HAVE_EIGEN3
+#ifdef SHOGUN_HAVE_EIGEN3
 #include <base/init.h>
 #include <features/DenseFeatures.h>
 #include <converter/KernelLocallyLinearEmbedding.h>

diff --git a/examples/undocumented/libshogun/converter_laplacianeigenmaps.cpp b/examples/undocumented/libshogun/converter_laplacianeigenmaps.cpp
@@ -10,7 +10,7 @@
 
 #include <lib/config.h>
 
-#ifdef HAVE_EIGEN3
+#ifdef SHOGUN_HAVE_EIGEN3
 #include <base/init.h>
 #include <features/DenseFeatures.h>
 #include <converter/LaplacianEigenmaps.h>

diff --git a/examples/undocumented/libshogun/converter_linearlocaltangentspacealignment.cpp b/examples/undocumented/libshogun/converter_linearlocaltangentspacealignment.cpp
@@ -10,7 +10,7 @@
 
 #include <lib/config.h>
 
-#ifdef HAVE_EIGEN3
+#ifdef SHOGUN_HAVE_EIGEN3
 #include <base/init.h>
 #include <features/DenseFeatures.h>
 #include <converter/LinearLocalTangentSpaceAlignment.h>

diff --git a/examples/undocumented/libshogun/converter_localitypreservingprojections.cpp b/examples/undocumented/libshogun/converter_localitypreservingprojections.cpp
@@ -10,7 +10,7 @@
 
 #include <lib/config.h>
 
-#ifdef HAVE_EIGEN3
+#ifdef SHOGUN_HAVE_EIGEN3
 #include <base/init.h>
 #include <features/DenseFeatures.h>
 #include <converter/LocalityPreservingProjections.h>

diff --git a/examples/undocumented/libshogun/converter_locallylinearembedding.cpp b/examples/undocumented/libshogun/converter_locallylinearembedding.cpp
@@ -9,7 +9,7 @@
  */
 
 #include <lib/config.h>
-#ifdef HAVE_EIGEN3
+#ifdef SHOGUN_HAVE_EIGEN3
 #include <base/init.h>
 #include <features/DenseFeatures.h>
 #include <converter/LocallyLinearEmbedding.h>

diff --git a/examples/undocumented/libshogun/converter_localtangentspacealignment.cpp b/examples/undocumented/libshogun/converter_localtangentspacealignment.cpp
@@ -10,7 +10,7 @@
 
 #include <lib/config.h>
 
-#ifdef HAVE_EIGEN3
+#ifdef SHOGUN_HAVE_EIGEN3
 #include <base/init.h>
 #include <features/DenseFeatures.h>
 #include <converter/LocalTangentSpaceAlignment.h>

diff --git a/examples/undocumented/libshogun/converter_multidimensionalscaling.cpp b/examples/undocumented/libshogun/converter_multidimensionalscaling.cpp
@@ -10,7 +10,7 @@
 
 #include <lib/config.h>
 
-#ifdef HAVE_EIGEN3
+#ifdef SHOGUN_HAVE_EIGEN3
 #include <base/init.h>
 #include <features/DenseFeatures.h>
 #include <converter/MultidimensionalScaling.h>

diff --git a/examples/undocumented/libshogun/converter_neighborhoodpreservingembedding.cpp b/examples/undocumented/libshogun/converter_neighborhoodpreservingembedding.cpp
@@ -10,7 +10,7 @@
 
 #include <lib/config.h>
 
-#ifdef HAVE_EIGEN3
+#ifdef SHOGUN_HAVE_EIGEN3
 #include <base/init.h>
 #include <features/DenseFeatures.h>
 #include <converter/NeighborhoodPreservingEmbedding.h>

diff --git a/examples/undocumented/libshogun/converter_stochasticproximityembedding.cpp b/examples/undocumented/libshogun/converter_stochasticproximityembedding.cpp
@@ -10,7 +10,7 @@
 
 #include <lib/config.h>
 
-#ifdef HAVE_EIGEN3
+#ifdef SHOGUN_HAVE_EIGEN3
 #include <base/init.h>
 #include <features/DenseFeatures.h>
 #include <converter/StochasticProximityEmbedding.h>

diff --git a/examples/undocumented/libshogun/evaluation_cross_validation_regression.cpp b/examples/undocumented/libshogun/evaluation_cross_validation_regression.cpp
@@ -26,7 +26,7 @@ void print_message(FILE* target, const char* str)
 
 void test_cross_validation()
 {
-#ifdef HAVE_LAPACK
+#ifdef SHOGUN_HAVE_LAPACK
 	/* data matrix dimensions */
 	index_t num_vectors=100;
 	index_t num_features=1;
@@ -111,7 +111,7 @@ void test_cross_validation()
 	SG_UNREF(result);
 	SG_UNREF(cross);
 	SG_UNREF(features);
-#endif /* HAVE_LAPACK */
+#endif /* SHOGUN_HAVE_LAPACK */
 }
 
 int main(int argc, char **argv)

diff --git a/examples/undocumented/libshogun/library_hdf5.cpp b/examples/undocumented/libshogun/library_hdf5.cpp
@@ -10,7 +10,7 @@ using namespace shogun;
 int main(int argc, char** argv)
 {
 	init_shogun_with_defaults();
-#ifdef HAVE_HDF5
+#ifdef SHOGUN_HAVE_HDF5
 	CHDF5File* hdf = new CHDF5File((char*) "../data/australian.libsvm.h5",'r', "/data/data");
 	float64_t* mat;
 	int32_t num_feat;

diff --git a/examples/undocumented/libshogun/library_mldatahdf5.cpp b/examples/undocumented/libshogun/library_mldatahdf5.cpp
@@ -10,7 +10,7 @@ using namespace shogun;
 int main(int argc, char** argv)
 {
 	init_shogun_with_defaults();
-#if defined(HAVE_HDF5) && defined( HAVE_CURL)
+#if defined(SHOGUN_HAVE_HDF5) && defined( SHOGUN_HAVE_CURL)
 	CMLDataHDF5File* hdf = new CMLDataHDF5File((char *)"australian", "/data/data");
 	float64_t* mat=NULL;
 	int32_t num_feat;
@@ -27,7 +27,7 @@ int main(int argc, char** argv)
 
 	SG_FREE(mat);
 	SG_UNREF(hdf);
-#endif // HAVE_CURL && HAVE_HDF5
+#endif // SHOGUN_HAVE_CURL && SHOGUN_HAVE_HDF5
 	exit_shogun();
 	return 0;
 }
diff --git a/examples/undocumented/libshogun/mathematics_lapack.cpp b/examples/undocumented/libshogun/mathematics_lapack.cpp
@@ -18,7 +18,7 @@
 
 using namespace shogun;
 
-#ifdef HAVE_LAPACK
+#ifdef SHOGUN_HAVE_LAPACK
 
 bool is_equal(float64_t a, float64_t b, float64_t eps)
 {
@@ -189,13 +189,13 @@ void test_lapack()
 	delete[] double_eigenvalues;
 	delete[] double_matrix;
 }
-#endif // HAVE_LAPACK
+#endif // SHOGUN_HAVE_LAPACK
 
 int main(int argc, char** argv)
 {
 	init_shogun_with_defaults();
 
-#ifdef HAVE_LAPACK
+#ifdef SHOGUN_HAVE_LAPACK
 	SG_SPRINT("checking lapack\n");
 	test_lapack();
 
@@ -204,7 +204,7 @@ int main(int argc, char** argv)
 
 	SG_SPRINT("matrix_multiply\n");
 	test_matrix_multiply();
-#endif // HAVE_LAPACK
+#endif // SHOGUN_HAVE_LAPACK
 
 	exit_shogun();
 	return 0;

diff --git a/examples/undocumented/libshogun/modelselection_grid_search_linear.cpp b/examples/undocumented/libshogun/modelselection_grid_search_linear.cpp
@@ -46,7 +46,7 @@ int main(int argc, char **argv)
 {
 	init_shogun(&print_message, &print_message, &print_message);
 
-#ifdef HAVE_LAPACK
+#ifdef SHOGUN_HAVE_LAPACK
 	int32_t num_subsets=5;
 	int32_t num_vectors=11;
 
@@ -109,7 +109,7 @@ int main(int argc, char **argv)
 	SG_UNREF(result);
 	SG_UNREF(best_combination);
 	SG_UNREF(grid_search);
-#endif // HAVE_LAPACK
+#endif // SHOGUN_HAVE_LAPACK
 	exit_shogun();
 
 	return 0;

diff --git a/examples/undocumented/libshogun/modelselection_parameter_tree.cpp b/examples/undocumented/libshogun/modelselection_parameter_tree.cpp
@@ -185,7 +185,7 @@ CModelSelectionParameters* create_param_tree_3()
 	return root;
 }
 
-#ifdef HAVE_EIGEN3
+#ifdef SHOGUN_HAVE_EIGEN3
 CModelSelectionParameters* create_param_tree_4a()
 {
 	CModelSelectionParameters* root=new CModelSelectionParameters();
@@ -364,7 +364,7 @@ int main(int argc, char **argv)
 	test_tree(tree);
 	SG_UNREF(tree);
 
-#ifdef HAVE_EIGEN3
+#ifdef SHOGUN_HAVE_EIGEN3
 	tree=create_param_tree_4a();
 	SG_REF(tree);
 	test_tree(tree);

diff --git a/examples/undocumented/libshogun/parameter_modsel_parameters.cpp b/examples/undocumented/libshogun/parameter_modsel_parameters.cpp
@@ -52,7 +52,7 @@ int main(int argc, char** argv)
 {
 	init_shogun(&print_message);
 
-#ifndef HAVE_LAPACK
+#ifndef SHOGUN_HAVE_LAPACK
 	CSGObject* object;
 
 	object=new CLibSVM();
@@ -78,7 +78,7 @@ int main(int argc, char** argv)
 	object=new CMinkowskiMetric();
 	print_modsel_parameters(object);
 	SG_UNREF(object);
-#endif // HAVE_LAPACK
+#endif // SHOGUN_HAVE_LAPACK
 
 	exit_shogun();
 	return 0;

diff --git a/examples/undocumented/libshogun/regression_gaussian_process_ard.cpp b/examples/undocumented/libshogun/regression_gaussian_process_ard.cpp
@@ -10,7 +10,7 @@
 #include <lib/config.h>
 
 // temporally disabled, since API was changed
-#if defined(HAVE_EIGEN3) && defined(HAVE_NLOPT) && 0
+#if defined(SHOGUN_HAVE_EIGEN3) && defined(SHOGUN_HAVE_NLOPT) && 0
 
 #include <base/init.h>
 #include <labels/RegressionLabels.h>

diff --git a/examples/undocumented/libshogun/regression_gaussian_process_fitc.cpp b/examples/undocumented/libshogun/regression_gaussian_process_fitc.cpp
@@ -10,7 +10,7 @@
 #include <lib/config.h>
 
 // temporally disabled, since API was changed
-#if defined(HAVE_EIGEN3) && defined(HAVE_NLOPT) && 0
+#if defined(SHOGUN_HAVE_EIGEN3) && defined(SHOGUN_HAVE_NLOPT) && 0
 
 #include <base/init.h>
 #include <labels/RegressionLabels.h>

diff --git a/examples/undocumented/libshogun/regression_gaussian_process_gaussian.cpp b/examples/undocumented/libshogun/regression_gaussian_process_gaussian.cpp
@@ -10,7 +10,7 @@
 #include <lib/config.h>
 
 // temporally disabled, since API was changed
-#if defined(HAVE_EIGEN3) && defined(HAVE_NLOPT) && 0
+#if defined(SHOGUN_HAVE_EIGEN3) && defined(SHOGUN_HAVE_NLOPT) && 0
 
 #include <base/init.h>
 #include <labels/RegressionLabels.h>

diff --git a/examples/undocumented/libshogun/regression_gaussian_process_laplace.cpp b/examples/undocumented/libshogun/regression_gaussian_process_laplace.cpp
@@ -10,7 +10,7 @@
 #include <lib/config.h>
 
 // temporally disabled, since API was changed
-#if defined(HAVE_EIGEN3) && defined(HAVE_NLOPT) && 0
+#if defined(SHOGUN_HAVE_EIGEN3) && defined(SHOGUN_HAVE_NLOPT) && 0
 
 #include <base/init.h>
 #include <labels/RegressionLabels.h>