Commit 30c1c52

author

Maximilian Wenk

committed

change test dataset

1 parent c6f7833 commit 30c1c52Copy full SHA for 30c1c52

File tree

+12

-6

lines changed

+12

-6

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,10 @@ public static void main (String[] args) throws Exception {`
`9`	`9`	`// in the same project`
`10`	`10`	`boolean index = true;`
`11`	`11`	`boolean header = true;`
`12`		`- String dataset = "Dry_Bean_Dataset.csv";`
	`12`	`+ String dataset = "Iris_unordered_2.csv";`
	`13`	`+ dataset = "Dry_Bean_Dataset.csv";`
	`14`	`+`
	`15`	`+`
`13`	`16`
`14`	`17`	`ClassificationOfFloatValues ob = new ClassificationOfFloatValues(dataset);`
`15`	`18`	`ob.setIndex(true);`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,9 @@ public void evaluateResults() {`
`94`	`94`	`this.predictedTestData,`
`95`	`95`	`this.sortedProbability,`
`96`	`96`	`this.numberOfClasses);`
`97`		`- int[][] asdf = evaluationObject.getConfusionMatrixSimple();`
	`97`	`+ System.out.println("\nSimple Confusion Matrix");`
	`98`	`+ evaluationObject.getConfusionMatrixSimple();`
	`99`	`+ System.out.println("\nNormalized Confusion Matrix");`
`98`	`100`	`evaluationObject.getConfusionMatrixNormalized();`
`99`	`101`	`}`
`100`	`102`	`public void confusionMatrix() {`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -50,14 +50,14 @@ private void confusionMatrix() {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`
`53`		`-`
	`53`	`+/*`
`54`	`54`	`for (int i = 0; i < this.numberOfClasses; i++) {`
`55`	`55`	`for (int j = 0; j < this.numberOfClasses; j++) {`
`56`	`56`	`System.out.print(this.confustionMatrix[i][j] + " ");`
`57`	`57`	`}`
`58`	`58`	`System.out.println();`
`59`	`59`	`}`
`60`		`-`
	`60`	`+ */`
`61`	`61`
`62`	`62`	`}`
`63`	`63`
`@@ -91,6 +91,7 @@ protected int[][] getConfusionMatrixSimple() {`
`91`	`91`	`System.out.println();`
`92`	`92`	`}`
`93`	`93`
	`94`	`+`
`94`	`95`	`return confusionMatrixSimple;`
`95`	`96`	`}`
`96`	`97`	`protected float[][] getConfusionMatrixNormalized() {`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -177,8 +177,8 @@ private void testClassificationModel() {`
`177`	`177`	`tempDelta[j][this.rowCount -1] = (float) Math.sqrt(tempCalcDistance);`
`178`	`178`	`this.predictedTestData[i][j][1] = Float.toString(tempDelta[j][this.rowCount -1]);`
`179`	`179`
`180`		`- System.out.print(" " + this.predictedTestData[i][j][0] + " ");`
`181`		`- System.out.println(this.predictedTestData[i][j][1]);`
	`180`	`+ //System.out.print(" " + this.predictedTestData[i][j][0] + " ");`
	`181`	`+ //System.out.println(this.predictedTestData[i][j][1]);`
`182`	`182`
`183`	`183`
`184`	`184`

Comments

(0)