fix warnings in modular interfaces

shogun-toolbox · Jun 27, 2012 · d74ef69 · d74ef69
1 parent 4a337b8
commit d74ef69
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/src/interfaces/modular/Evaluation.i b/src/interfaces/modular/Evaluation.i
@@ -36,6 +36,7 @@
 %rename(CrossValidationSplitting) CCrossValidationSplitting;
 
 /* Include Class Headers to make them visible from within the target language */
+%include <shogun/evaluation/EvaluationResult.h>
 %include <shogun/evaluation/Evaluation.h>
 %include <shogun/evaluation/BinaryClassEvaluation.h>
 %include <shogun/evaluation/ClusteringEvaluation.h>
@@ -48,6 +49,7 @@
 %include <shogun/evaluation/MeanSquaredLogError.h>
 %include <shogun/evaluation/ROCEvaluation.h>
 %include <shogun/evaluation/PRCEvaluation.h>
+%include <shogun/evaluation/MachineEvaluation.h>
 %include <shogun/evaluation/CrossValidation.h>
 %include <shogun/evaluation/SplittingStrategy.h>
 %include <shogun/evaluation/StratifiedCrossValidationSplitting.h>

diff --git a/src/interfaces/modular/Evaluation_includes.i b/src/interfaces/modular/Evaluation_includes.i
@@ -1,4 +1,5 @@
 %{
+ #include <shogun/evaluation/EvaluationResult.h>
  #include <shogun/evaluation/Evaluation.h>
  #include <shogun/evaluation/BinaryClassEvaluation.h>
  #include <shogun/evaluation/ClusteringEvaluation.h>
@@ -11,6 +12,7 @@
  #include <shogun/evaluation/MeanSquaredLogError.h>
  #include <shogun/evaluation/ROCEvaluation.h>
  #include <shogun/evaluation/PRCEvaluation.h>
+ #include <shogun/evaluation/MachineEvaluation.h>
  #include <shogun/evaluation/CrossValidation.h>
  #include <shogun/evaluation/SplittingStrategy.h>
  #include <shogun/evaluation/StratifiedCrossValidationSplitting.h>

diff --git a/src/interfaces/modular/Machine.i b/src/interfaces/modular/Machine.i
@@ -66,7 +66,9 @@ APPLY_REGRESSION(CGaussianProcessRegression);
 APPLY_STRUCTURED(CStructuredOutputMachine);
 APPLY_STRUCTURED(CLinearStructuredOutputMachine);
 APPLY_STRUCTURED(CKernelStructuredOutputMachine);
+#ifdef USE_MOSEK
 APPLY_STRUCTURED(CPrimalMosekSOSVM);
+#endif
 }
 
 %rename(apply_generic) CMachine::apply(CFeatures* data=NULL);
@@ -91,7 +93,9 @@ APPLY_STRUCTURED(CPrimalMosekSOSVM);
 %rename(apply_generic) CStructuredOutputMachine::apply(CFeatures* data=NULL);
 %rename(apply_generic) CLinearStructuredOutputMachine::apply(CFeatures* data=NULL);
 %rename(apply_generic) CKernelStructuredOutputMachine::apply(CFeatures* data=NULL);
+#ifdef USE_MOSEK
 %rename(apply_generic) CPrimalMosekSOSVM::apply(CFeatures* data=NULL);
+#endif
 
 #undef APPLY_MULTICLASS
 #undef APPLY_BINARY