enable options for execution

Author: zeyiwen

mascot/commandLineParser.cpp

@@ -45,10 +45,6 @@ void Parser::ParseLine(int argc, char **argv, char *pcFileName, char *pcSavedFil
 	param.weight_label = NULL;
 	param.weight = NULL;
 
-	if(argc != 6)
-	{
-		HelpInfo();
-	}
 	// parse options
 	for(i=1;i<argc;i++)
 	{
@@ -63,7 +59,20 @@ void Parser::ParseLine(int argc, char **argv, char *pcFileName, char *pcSavedFil
 			case 'c':
 				param.C = atof(argv[i]);
 				break;
-				/*
+			case 'b':
+				param.probability = atoi(argv[i]);
+				break;
+			case 'f':
+				nNumofFeature = atoi(argv[i]);
+				if(nNumofFeature < 1)
+				{
+					HelpInfo();
+				}
+				break;
+            case 'o':
+                cross_validation = atoi(argv[i]);
+                break;
+		/*
 			case 's':
 				param.svm_type = atoi(argv[i]);
 				break;
@@ -91,9 +100,6 @@ void Parser::ParseLine(int argc, char **argv, char *pcFileName, char *pcSavedFil
 			case 'h':
 				param.shrinking = atoi(argv[i]);
 				break;
-			case 'b':
-				param.probability = atoi(argv[i]);
-				break;
 			case 'q':
 				print_func = &print_null;
 				i--;
@@ -115,13 +121,6 @@ void Parser::ParseLine(int argc, char **argv, char *pcFileName, char *pcSavedFil
 				param.weight[param.nr_weight-1] = atof(argv[i]);
 				break;
 				*/
-			case 'f':
-				nNumofFeature = atoi(argv[i]);
-				if(nNumofFeature < 1)
-				{
-					HelpInfo();
-				}
-				break;
 			default:
 				fprintf(stderr,"Unknown option: -%c\n", argv[i-1][1]);
 				HelpInfo();

mascot/svmMain.cu

@@ -20,16 +20,6 @@ using std::endl;
 
 int main(int argc, char **argv)
 {
-	argc = 6;
-	argv = new char*[argc];
-	argv[1] = "-g";
-	argv[2] = "0.382";
-	argv[3] = "-c";
-	argv[4] = "100";
-//	argv[argc - 1] = "dataset/iris.scale";
-	argv[argc - 1] = "dataset/a1a";
-    parser.cross_validation = 0;//0 for cross-validation; 1 for training; 2 for evaluation
-
 	char fileName[1024];
 	char savedFileName[1024];
 	Parser parser;

mascot/trainingFunction.cu

@@ -46,7 +46,6 @@ svmModel trainSVM(SVMParam &param, string strTrainingFileName, int nNumofFeature
     rawDataRead.ReadFromFile(strTrainingFileName, nNumofFeature, v_v_DocVector, v_nLabel);
     svmProblem problem(v_v_DocVector, v_nLabel);
     svmModel model;
-    param.probability = 0;//train with probability
     model.fit(problem, param);
     return model;
 }

run.sh

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+
+###options
+#svm with probability output
+PROB="-b 0" #0 for no probability output; 1 for probability output.
+
+#task type
+TASK="-o 0" #0 for training; 1 for cross validation; 2 for evaluation
+
+#gamma for RBF kernel
+GAMMA="-g 0.382"
+
+#penalty
+C="-c 100"
+
+#number of features
+NUMFEATURE="-f 123"
+
+#file name (must appear as the last argument)
+FILENAME="dataset/a1a" #"dataset/iris.scale"
+
+#print out the command before execution
+set -x
+
+#command
+./bin/mascot $PROB $TASK $GAMMA $C $NUMFEATURE $FILENAME