Changeset 125 for trunk/CrossPare/src/de/ugoe/cs

Timestamp:

06/08/16 10:02:55 (9 years ago)

Author:

sherbold

Message:

• fixed bug in GPTraining that led to the possibility that no classifier is generated in case of bad performance on the training data

File:

• trunk/CrossPare/src/de/ugoe/cs/cpdp/training/GPTraining.java (modified) (3 diffs)

trunk/CrossPare/src/de/ugoe/cs/cpdp/training/GPTraining.java

@@ -484 +484 @@
                 
                 // number of runs, yields the best of these
+                double smallest_error_count_train = Double.MAX_VALUE; 
+                Classifier bestTrain = null;
                 for(int k=0; k < this.numberRuns; k++) {
+                    double[] errors_eval = {0.0, 0.0};
                     Classifier classifier = new GPRun();
                     ((GPRun)classifier).configure(this.populationSize, this.initMinDepth, this.initMaxDepth, this.tournamentSize, this.maxGenerations, this.errorType2Weight, this.maxDepth, this.maxNodes);
@@ -497 +500 @@
                             // if type1 and type2 errors are < 0.5 we allow the model in the candidates
                             errors = this.evaluate((GPRun)classifier, traindataSet.get(j));
+                            errors_eval[0] += errors[0];
+                            errors_eval[1] += errors[1];
                             if((errors[0] < 0.5) && (errors[1] < 0.5)) {
                                 candidates.add(classifier);
                             }
                         }
+                    }
+                    
+                    // if the candidate made fewer errors it is now the best
+                    if(errors_eval[0] + errors_eval[1] < smallest_error_count_train) {
+                        bestTrain = classifier;
+                        smallest_error_count_train = errors_eval[0] + errors_eval[1];
                     }
                 }
@@ -528 +539 @@
                 }
                 
-                
+                if( best==null ) {
+                    best = bestTrain;
+                }
                 // now we have the best classifier for this training data
                 classifiers.add(best);