Changeset 45 for trunk/CrossPare/src/de

Timestamp:

11/18/15 16:42:40 (9 years ago)

Author:

atrautsch

Message:

metric matching configurable

Location:

trunk/CrossPare/src/de/ugoe/cs/cpdp

Files:

• ExperimentConfiguration.java (modified) (1 diff)
• training/ISetWiseTestdataAwareTrainingStrategy.java (modified) (1 diff)
• training/MetricMatchingTraining.java (modified) (6 diffs)

trunk/CrossPare/src/de/ugoe/cs/cpdp/ExperimentConfiguration.java

@@ -489 +489 @@
                         .newInstance();
                 trainer.setParameter(attributes.getValue("param"));
+                trainer.setMethod(attributes.getValue("method"));
+                trainer.setThreshold(attributes.getValue("threshold"));
                 setwiseTestdataAwareTrainers.add(trainer);
             }

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

@@ -9 +9 @@
 
     String getName();
+    
+    void setMethod(String method);
+    void setThreshold(String threshold);
 }

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

@@ -23 +23 @@
 
 import org.apache.commons.collections4.list.SetUniqueList;
-import org.apache.commons.math3.stat.inference.ChiSquareTest;  
-import org.apache.commons.math3.stat.correlation.SpearmansCorrelation;  // spearman ist drin
-import org.apache.commons.math3.stat.inference.KolmogorovSmirnovTest; // kolmogorov nicht in der 3.1 
+import org.apache.commons.math3.stat.inference.ChiSquareTest;
+import org.apache.commons.math3.stat.correlation.SpearmansCorrelation;
+import org.apache.commons.math3.stat.inference.KolmogorovSmirnovTest;
 
 import de.ugoe.cs.util.console.Console;
@@ -42 +42 @@
     private final Classifier classifier = new MetricMatchingClassifier();
     
+    private String method;
+    private float threshold;
     
     /**
@@ -52 +54 @@
     }
     
-    /*
+    
     @Override
     public String getName() {
-        return "MetricMatching_" + this.classifier.getName();
-    }*/
+        return "MetricMatching_" + classifierName;
+    }
+
+
+    @Override
+    public void setMethod(String method) {
+        this.method = method;
+    }
+
+
+    @Override
+    public void setThreshold(String threshold) {
+        this.threshold = Float.parseFloat(threshold);
+    }
 
         /**
-         * We need the testdata instances to do a metric matching so in this special case we get this data
+         * We need the testdata instances to do a metric matching, so in this special case we get this data
          * before evaluation
          */
@@ -76 +90 @@
                         //tmp.kolmogorovSmirnovTest(0.05);
                         
-                        tmp.spearmansRankCorrelation(0.5);
-                        
-                        //Console.traceln(Level.INFO, "Tested traindata set " + num + " for matching attributes, found " + tmp.getRank() + " matches");
+                        if( this.method.equals("spearman") ) {
+                            tmp.spearmansRankCorrelation(this.threshold);
+                        }
+                        else if( this.method.equals("kolmogorov") ) {
+                            tmp.kolmogorovSmirnovTest(this.threshold);
+                        }
+                        else {
+                            throw new RuntimeException("unknown method");
+                        }
 
                         // we only select the training data from our set with the most matching attributes
@@ -129 +149 @@
                         this.classifier.buildClassifier(traindata);
                 }
-                
+
                 public void setMetricMatching(MetricMatch mm) {
                         this.mm = mm;
@@ -400 +420 @@
                 }
          }
-
-
 }