change test dataset

Author: Maximilian Wenk

src/Main.java

@@ -9,7 +9,10 @@ public static void main (String[] args) throws Exception {
         // in the same project
         boolean index = true;
         boolean header = true;
-        String dataset = "Dry_Bean_Dataset.csv";
+        String dataset = "Iris_unordered_2.csv";
+        dataset = "Dry_Bean_Dataset.csv";
+
+
 
         ClassificationOfFloatValues ob = new ClassificationOfFloatValues(dataset);
         ob.setIndex(true);

src/classification/ClassificationOfFloatValues.java

@@ -94,7 +94,9 @@ public void evaluateResults() {
                 this.predictedTestData,
                 this.sortedProbability,
                 this.numberOfClasses);
-        int[][] asdf = evaluationObject.getConfusionMatrixSimple();
+        System.out.println("\nSimple Confusion Matrix");
+        evaluationObject.getConfusionMatrixSimple();
+        System.out.println("\nNormalized Confusion Matrix");
         evaluationObject.getConfusionMatrixNormalized();
     }
     public void confusionMatrix() {

src/classification/DATA_evaluation.java

@@ -50,14 +50,14 @@ private void confusionMatrix() {
         }
 
 
-
+        /*
         for (int i = 0; i < this.numberOfClasses; i++) {
             for (int j = 0; j < this.numberOfClasses; j++) {
                 System.out.print(this.confustionMatrix[i][j] + " ");
             }
             System.out.println();
         }
-
+        */
 
     }
 
@@ -91,6 +91,7 @@ protected int[][] getConfusionMatrixSimple() {
             System.out.println();
         }
 
+
         return confusionMatrixSimple;
     }
     protected float[][] getConfusionMatrixNormalized() {

src/classification/DistanceClassification.java

@@ -177,8 +177,8 @@ private void testClassificationModel() {
                 tempDelta[j][this.rowCount -1] = (float) Math.sqrt(tempCalcDistance);
                 this.predictedTestData[i][j][1] = Float.toString(tempDelta[j][this.rowCount -1]);
 
-                System.out.print(" " + this.predictedTestData[i][j][0] + " ");
-                System.out.println(this.predictedTestData[i][j][1]);
+                //System.out.print(" " + this.predictedTestData[i][j][0] + " ");
+                //System.out.println(this.predictedTestData[i][j][1]);