Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit fab7b09

Browse files
committed
add evaluation of results
1 parent a6215c0 commit fab7b09

File tree

4 files changed

+40
-11
lines changed

4 files changed

+40
-11
lines changed

‎src/Main.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ public static void main (String[] args) throws Exception {
2121
ob.dataSubdivision();
2222
//System.out.println(ob.feedback()[0][2]);
2323
ob.distanceClassification();
24+
25+
ob.evaluateResults();
2426
}
2527

2628
}

‎src/classification/ClassificationOfFloatValues.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ public class ClassificationOfFloatValues {
2727
private boolean dataSubdivisionBool = false; // Data has been divided into training and test data
2828
private String MLAlgorithm; // Variable for saving which machine learning algorithm has been used
2929

30+
// --- Classification result data variables
31+
private String[][][] predictedTestData;
32+
private int[][] sortedProbability;
33+
3034

3135
// Function to add the members of the class
3236
public float[][] output() { return this.predictorData; }
@@ -83,6 +87,12 @@ public void dataValidation (float trainingData) {
8387

8488

8589
// --- Functions for evaluating the machine learning results -------------------------------------------------------
90+
public void evaluateResults() {
91+
DATA_evaluation evaluationObject = new DATA_evaluation(this.testDataResults,
92+
this.columnCount - this.numberOfTrainingData,
93+
this.predictedTestData,
94+
this.sortedProbability);
95+
}
8696
public void confusionMatrix() {
8797
if (this.MLAlgorithm == "DistanceClassification") {
8898
System.out.println("nice confusion");
@@ -134,6 +144,10 @@ public void distanceClassification (){
134144
// Testing the distance classification model
135145
classificationObject.setTestData(this.testDataPredictors, this.testDataResults, this.rowCount, this.columnCount - this.numberOfTrainingData);
136146
classificationObject.testModel();
147+
148+
// Get the test data
149+
this.predictedTestData = classificationObject.getPredictedTestData();
150+
this.sortedProbability = classificationObject.getSortedProbability();
137151
}
138152

139153
}

‎src/classification/DATA_evaluation.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
package classification;
2+
3+
public class DATA_evaluation {
4+
private String[][][] predictedTestData;
5+
private int[][] sortedProbability;
6+
7+
private int columnCount;
8+
private String [] testDataResults;
9+
10+
protected DATA_evaluation(String[] testDataResults, int columnCount, String[][][] predictedTestData, int[][] sortedProbability) {
11+
this.testDataResults = testDataResults;
12+
this.columnCount = columnCount;
13+
this.predictedTestData = predictedTestData;
14+
this.sortedProbability = sortedProbability;
15+
}
16+
}

‎src/classification/DistanceClassification.java

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,14 @@ protected float[][][] getSortedClassificationData() {
4343
return this.sortedClassificationData;
4444
}
4545

46+
protected String[][][] getPredictedTestData() {
47+
return this.predictedTestData;
48+
}
49+
50+
protected int[][] getSortedProbability() {
51+
return this.sortedProbability;
52+
}
53+
4654
protected float[][] getFeatureMean() {
4755
return this.featureMean;
4856
}
@@ -204,17 +212,6 @@ private void testClassificationModel() {
204212
}
205213
this.sortedProbability[i][j] = tempIndex;
206214
}
207-
208-
209-
210-
System.out.println(this.sortedProbability[i][0]);
211-
System.out.println(this.sortedProbability[i][1]);
212-
System.out.println(this.sortedProbability[i][2]);
213-
214-
215-
if (i == 5) {
216-
break;
217-
}
218215
}
219216
}
220217
}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /