diff --git a/run b/run index cd2271a..5b009f3 100755 --- a/run +++ b/run @@ -1 +1,9 @@ -java -jar target/PBC4Project-1.0-SNAPSHOT-jar-with-dependencies.jar +rm error.log 2> /dev/null +java -jar target/PBC4Project-1.0-SNAPSHOT-jar-with-dependencies.jar 2>error.log +if [ -s error.log ] +then + echo "Error in the program" + cat error.log +else + echo "Program executed successfully" +fi diff --git a/src/main/java/com/testpbc4/App.java b/src/main/java/com/testpbc4/App.java index 807946d..502b90b 100644 --- a/src/main/java/com/testpbc4/App.java +++ b/src/main/java/com/testpbc4/App.java @@ -19,9 +19,7 @@ public class App { static String path = "data/"; static String datasetsFile = path + "datasets.txt"; static String outputFile = "results_pbc4.txt"; - static boolean debug = true; - static boolean stratify = false; - static boolean normalizeData = false; + static boolean debug = false; public static void printAndExit(String s) { System.out.println(s); @@ -30,10 +28,8 @@ public class App { private static Instances getInstances(String fileName) { DataSource source = null; - System.out.println(String.format("Reading file " + path + "%s.arff", fileName)); try { source = new DataSource(String.format(path + "%s.arff", fileName)); - System.out.println("File read."); return source.getDataSet(); } catch (Exception e) { printAndExit( @@ -51,21 +47,12 @@ public class App { Instances instances; Instances training = null; Instances test = null; - long startTime; - // Normalize normalize = new Normalize(); - // normalize.setInputFormat(instancesIn); - // if (normalizeData) { - // instances = Filter.useFilter(instancesIn, normalize); - // } else { instances = instancesIn; - // } instances.randomize(rand); - if (stratify) { - instances.stratify(numFolds); - } + instances.stratify(numFolds); for (int i = 0; i < numFolds; i++) { - startTime = System.currentTimeMillis(); + long startTime = System.currentTimeMillis(); training = instances.trainCV(numFolds, i); test = instances.testCV(numFolds, i); pb4.buildClassifier(training); @@ -138,26 +125,22 @@ public class App { double[] complexityStat = new double[2]; int[] seeds = { 57, 31, 1714, 17, 23, 79, 83, 97, 7, 1 }; String dataset; - String debugMsg, stratMsg, normMsg; ArrayList timeSpent; ArrayList accuracy; ArrayList complexity; - debugMsg = debug ? "With debug output" : ""; - stratMsg = stratify ? "stratified" : "without stratification"; - normMsg = normalizeData ? " with normalization" : " without normalization"; try { file = new File(datasetsFile); } catch (Exception e) { printAndExit(String.format("*** Error trying to read datasets file... (%s)", e.getMessage())); } - System.out.println(String.format("%d fold cross validation %s %s %s", - numFolds, stratMsg, debugMsg, normMsg)); + System.out.println(String.format("%d fold cross validation stratified", numFolds)); initializeOutput(); sc = new Scanner(file); while (sc.hasNextLine()) { dataset = sc.nextLine(); + System.out.print(String.format("Processing dataset %-30s [ ", dataset)); if (debug && dataset.equals("balloons")) { printAndExit("* Check error output. Debug End."); } @@ -165,14 +148,13 @@ public class App { accuracy = new ArrayList<>(); complexity = new ArrayList<>(); for (int seed : seeds) { + System.out.print(String.format("%d ", seed)); // Establece la semilla gen = new Random(seed); // Obtiene los datos instances = getInstances(dataset); instances.randomize(gen); instances.setClassIndex(instances.numAttributes() - 1); - System.out.println("Instances:"); - System.out.println(instances.toString()); try { validation(instances, seed, accuracy, timeSpent, complexity); } catch (Exception e) { @@ -181,6 +163,7 @@ public class App { } } + System.out.println("]"); accuracyStat = meanAndDeviation(accuracy); timeStat = meanAndDeviation(timeSpent); complexityStat = meanAndDeviation(complexity); diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 675a9e7..f07874c 100644 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1 +1 @@ -/Users/rmontanana/Code/PBC4cip/src/main/java/com/testpbc4/App.java +/home/rmontanana/Code/PBC4cipTest/src/main/java/com/testpbc4/App.java diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst index 743c8cf..fec4eb0 100644 --- a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst +++ b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst @@ -1 +1 @@ -/Users/rmontanana/Code/PBC4cip/src/test/java/com/testpbc4/AppTest.java +/home/rmontanana/Code/PBC4cipTest/src/test/java/com/testpbc4/AppTest.java diff --git a/target/surefire-reports/TEST-com.testpbc4.AppTest.xml b/target/surefire-reports/TEST-com.testpbc4.AppTest.xml index 9f6e221..6093efb 100644 --- a/target/surefire-reports/TEST-com.testpbc4.AppTest.xml +++ b/target/surefire-reports/TEST-com.testpbc4.AppTest.xml @@ -1,59 +1,58 @@ - + - + - - + + - - - + + + - - - - + + + - + - - + + - - + + - + - + - - + + - + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - + \ No newline at end of file diff --git a/target/surefire-reports/com.testpbc4.AppTest.txt b/target/surefire-reports/com.testpbc4.AppTest.txt index 57273b9..604e589 100644 --- a/target/surefire-reports/com.testpbc4.AppTest.txt +++ b/target/surefire-reports/com.testpbc4.AppTest.txt @@ -1,4 +1,4 @@ ------------------------------------------------------------------------------- Test set: com.testpbc4.AppTest ------------------------------------------------------------------------------- -Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.009 s -- in com.testpbc4.AppTest +Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.010 s -- in com.testpbc4.AppTest