Merge pull request #19 from vaskonov/waves

improvements learing curves

utils/learning_curves.js

@@ -101,7 +101,7 @@ module.exports.learning_curves = function(classifiers, dataset, parameters, step
 
 	    _.each(classifiers, function(value, key, list) { 	
 	    	stats = trainAndTest_hash(value, mytrainset, test, 5)
-	    	report.push(stats[1]['stats'])
+	    	report.push(stats[2]['stats'])
 	    })
 
 		_.each(parameters, function(value, key, list){
@@ -111,15 +111,17 @@ module.exports.learning_curves = function(classifiers, dataset, parameters, step
 
 		_.each(parameters, function(value, key, list){
 			plotfor = "plot "
-			_(numOfFolds).times(function(n){
+			_(fold+1).times(function(n){
 			// _.each(parameters,  function(value, key, list){ 
-				plotfor = plotfor + " for [i=2:"+ (_.size(classifiers) + 1)+"] \'"+dir+value+"-fold"+n+"\' using 1:i with lines linecolor i, "
+				plotfor = plotfor + " for [i=2:"+ (_.size(classifiers) + 1)+"] \'"+dir+value+"-fold"+n+"\' using 1:i with linespoints linecolor i pt "+n+" ps 3, "
 				// fs.writeFileSync(dir+value+"-fold"+n, header, 'utf-8', function(err) {console.log("error "+err); return 0 })
 				// },this)
 			},this)
 			plotfor = plotfor.substring(0,plotfor.length-2);
-			command = "gnuplot -p -e \"reset; set term png truecolor; set grid ytics; set grid xtics; set key bottom right; set output \'"+dir + value+".png\'; set key autotitle columnhead; "+plotfor +"\""
+			command = "gnuplot -p -e \"reset; set term png truecolor size 1024,1024; set grid ytics; set grid xtics; set key bottom right; set output \'"+dir + value+".png\'; set key autotitle columnhead; "+plotfor +"\""
 			result = execSync.run(command)
+			// console.log(command)
+			// process.exit(0)
 		}, this)
 		}
 

utils/trainAndTest.js

@@ -45,6 +45,10 @@ module.exports.testLite2 = function(classifier, testSet1, explain) {
 		inputnormal = inputnormal.replace(/\./g," .")
 		inputnormal = inputnormal.replace(/\?/g," ?")
 		inputnormal = inputnormal.replace(/\!/g," !")
+		inputnormal = inputnormal.replace(/\%/g," %")
+		inputnormal = inputnormal.replace(/\$/g," $")
+
+
 
 		am = util.intent_attr_label_ambiguity(classes)
 	 	if (am.length > 0)