Changeset 38 for trunk/CrossPare/src/de

Timestamp:

06/11/15 11:27:33 (9 years ago)

Author:

sherbold

Message:

• added Oversampling and Resampling processors
• fixed bug in ZScoreNormalizations
• added new load for the Audi data set that is based on changes
• minor changes to remove warnings

Location:

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

Files:

• Runner.java (modified) (1 diff)
• dataprocessing/Oversampling.java (added)
• dataprocessing/Resampling.java (added)
• dataprocessing/ZScoreNormalization.java (modified) (2 diffs)
• dataprocessing/ZScoreTargetNormalization.java (modified) (2 diffs)
• dataselection/SetWiseEMContextSelection.java (modified) (1 diff)
• loader/AUDIChangeFolderLoader.java (added)
• loader/AUDIChangeLoader.java (added)
• training/RandomClass.java (modified) (1 diff)

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

@@ -26 +26 @@
         public static void main(String[] args) {
                 new TextConsole(Level.FINE);
-                final int concurrentThreads = Runtime.getRuntime().availableProcessors();
+                final int concurrentThreads = Runtime.getRuntime().availableProcessors()-2;
                 final ExecutorService threadPool = Executors.newFixedThreadPool(concurrentThreads);
                 for( String arg : args ) {

trunk/CrossPare/src/de/ugoe/cs/cpdp/dataprocessing/ZScoreNormalization.java

@@ -44 +44 @@
         
         private void normalize(Instances instances) {
+                instances.toString();
                 final Attribute classAttribute = instances.classAttribute();
                 
@@ -56 +57 @@
                         }
                 }
-                
                 for( int i=0 ; i<instances.numAttributes(); i++) {
                         if( !instances.attribute(i).equals(classAttribute) ) {
-                                for( int j=0 ; j<instances.numAttributes() ; j++ ) {
+                                for( int j=0 ; j<instances.numInstances() ; j++ ) {
                                         Instance inst = instances.get(i);
-                                        double newValue = (inst.value(j)-means[j])/stddevs[j];
-                                        inst.setValue(j, newValue);
+                                        double newValue = (inst.value(i)-means[i])/stddevs[i];
+                                        if( newValue==Double.NaN ) {
+                                                System.out.println("foooooo");
+                                        }
+                                        inst.setValue(i, newValue);
                                 }
                         }

trunk/CrossPare/src/de/ugoe/cs/cpdp/dataprocessing/ZScoreTargetNormalization.java

@@ -44 +44 @@
                 for( int i=0 ; i<testdata.numInstances() ; i++ ) {
                         Instance instance = testdata.instance(i);
-                        for( int j=0 ; j<testdata.numInstances() ; j++ ) {
+                        for( int j=0 ; j<testdata.numAttributes() ; j++ ) {
                                 if( testdata.attribute(j)!=classAttribute ) {
                                         instance.setValue(j, instance.value(j)-meanTest[j]/stddevTest[j]);
@@ -85 +85 @@
                 for( int i=0 ; i<testdata.numInstances() ; i++ ) {
                         Instance instance = testdata.instance(i);
-                        for( int j=0 ; j<testdata.numInstances() ; j++ ) {
+                        for( int j=0 ; j<testdata.numAttributes() ; j++ ) {
                                 if( testdata.attribute(j)!=classAttribute ) {
                                         instance.setValue(j, instance.value(j)-meanTest[j]/stddevTest[j]);

trunk/CrossPare/src/de/ugoe/cs/cpdp/dataselection/SetWiseEMContextSelection.java

@@ -28 +28 @@
 public class SetWiseEMContextSelection implements ISetWiseDataselectionStrategy {
         
-        private String parameters;
         private String[] project_context_factors; // = new String[]{"TND", "TNC", "TNF", "TLOC"};
         

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

@@ -2 +2 @@
 
 import java.util.Random;
-import java.util.logging.Level;
 
-import de.ugoe.cs.util.console.Console;
 import weka.classifiers.AbstractClassifier;
 import weka.classifiers.Classifier;