Revert "Splitted methods in apply macro in Machine.i."

This reverts commit 40e4ea3fc603d90903274dac0e005a927fd88e3a.
shogun-toolbox · May 22, 2012 · f575c12 · f575c12
1 parent 5b12cea
commit f575c12
Showing 1 changed file with 3 additions and 15 deletions.
diff --git a/src/interfaces/modular/Machine.i b/src/interfaces/modular/Machine.i
@@ -22,42 +22,30 @@
 %define APPLY_MULTICLASS(CLASS)
     %extend CLASS
     {
-        CMulticlassLabels* apply(CFeatures* data)
+        CMulticlassLabels* apply(CFeatures* data=NULL)
         {
             return $self->apply_multiclass(data);
         }
-        CMulticlassLabels* apply()
-        {
-            return $self->apply_multiclass();
-        }
     }
 %enddef
 
 %define APPLY_BINARY(CLASS)
     %extend CLASS
     {
-        CBinaryLabels* apply(CFeatures* data)
+        CBinaryLabels* apply(CFeatures* data=NULL)
         {
             return $self->apply_binary(data);
         }
-        CBinaryLabels* apply()
-        {
-            return $self->apply_binary();
-        }
     }
 %enddef
 
 %define APPLY_REGRESSION(CLASS)
     %extend CLASS
     {
-        CRegressionLabels* apply(CFeatures* data)
+        CRegressionLabels* apply(CFeatures* data=NULL)
         {
             return $self->apply_regression(data);
         }
-        CRegressionLabels* apply()
-        {
-            return $self->apply_regression();
-        }
     }
 %enddef