Changeset 32 for trunk/CrossPare/src/de/ugoe

Timestamp:

05/05/15 16:29:40 (10 years ago)

Author:

ftrautsch

Message:

integrating decent into crosspare

Location:

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

Files:

• ExperimentConfiguration.java (modified) (6 diffs)
• Runner.java (modified) (5 diffs)
• dataprocessing/AttributeNonRemoval.java (added)
• dataprocessing/NominalAttributeFilter.java (added)
• dataprocessing/SimulationFilter.java (added)
• decentApp (added)
• decentApp/ARFFxResourceTool.java (added)
• decentApp/DECENTEpsilonModelHandler.java (added)
• decentApp/DECENTResourceTool.java (added)
• decentApp/FileWatcher.java (added)
• decentApp/ResourceTool.java (added)
• execution (added)
• execution/ClassifierCreationExperiment.java (added)
• execution/CrossProjectExperiment.java (moved) (moved from trunk/CrossPare/src/de/ugoe/cs/cpdp/Experiment.java) (4 diffs)
• execution/IExecutionStrategy.java (added)
• loader/AbstractFolderLoader.java (modified) (1 diff)
• loader/DecentDataLoader.java (added)
• loader/DecentFolderLoader.java (added)
• loader/IDecentVersionLoader.java (added)
• loader/IVersionLoader.java (modified) (1 diff)

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

@@ -119 +119 @@
          */
         private List<IEvaluationStrategy> evaluators;
+        
+        /**
+         * indicates, if the classifier should be saved
+         */
+        private Boolean saveClassifier = null;
+        
+        /**
+         * indicates, which execution strategy to choose
+         * (e.g. CrossProjectExperiment, ClassifierCreationExecution).
+         * Default is CrossProjectExperiment.
+         */
+        private String executionStrategy = "CrossProjectExperiment";
         
         /**
@@ -315 +327 @@
         }
         
+        /**
+         * returns boolean, if classifier should be saved
+         * @return boolean
+         */
+        public boolean getSaveClassifier() {
+                return saveClassifier;
+        }
+        
+        /**
+         * returns the execution strategy
+         * @return String execution strategy
+         */
+        public String getExecutionStrategy() {
+                return executionStrategy;
+        }
+        
         /* (non-Javadoc)
          * @see org.xml.sax.helpers.DefaultHandler#startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes)
@@ -393 +421 @@
                                 final IEvaluationStrategy evaluator = (IEvaluationStrategy) Class.forName("de.ugoe.cs.cpdp.eval." + attributes.getValue("name")).newInstance();
                                 evaluators.add(evaluator);
+                        }
+                        else if( qName.equals("saveClassifier")) {
+                                saveClassifier = true;
+                        }
+                        else if( qName.equals("executionStrategy")) {
+                                executionStrategy = attributes.getValue("name");
                         }
                         else if( qName.equals("partialconfig") ) {
@@ -423 +457 @@
          * If the current data path is the empty string (&quot;&quot;), it is override by the datapath of the other configuration. Otherwise, the current data path is kept.
          * @param other experiment whose information is added
-         */
-        private void addConfigurations(ExperimentConfiguration other) {
+         * @throws ExperimentConfigurationException 
+         */
+        private void addConfigurations(ExperimentConfiguration other) throws ExperimentConfigurationException {
                 if( "results".equals(resultsPath) ) {
                         resultsPath = other.resultsPath;
@@ -441 +476 @@
                 trainers.addAll(other.trainers);
                 evaluators.addAll(other.evaluators);
+                
+                if(!executionStrategy.equals(other.executionStrategy)) {
+                        throw new ExperimentConfigurationException("Executionstrategies must be the same, if config files should be added.");
+                }
+                
+                /* Only if saveClassifier is not set in the main config and
+                 * the other configs saveClassifier is true, it must be set.
+                 */
+                if(saveClassifier == null && other.saveClassifier == true) {
+                        saveClassifier = other.saveClassifier;
+                }
+
         }
         
@@ -464 +511 @@
                 builder.append("Pointwise trainers: " + trainers.toString() + StringTools.ENDLINE);
                 builder.append("Evaluators: " + evaluators.toString() + StringTools.ENDLINE);
-                
+                builder.append("Save Classifier?: " + saveClassifier + StringTools.ENDLINE);
+                builder.append("Execution Strategy: " + executionStrategy + StringTools.ENDLINE);
+                                
                 return builder.toString();
         }

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

@@ -2 +2 @@
 
 import java.io.File;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -7 +9 @@
 import java.util.logging.Level;
 
+import de.ugoe.cs.cpdp.execution.IExecutionStrategy;
 import de.ugoe.cs.util.console.Console;
 import de.ugoe.cs.util.console.TextConsole;
@@ -23 +26 @@
         public static void main(String[] args) {
                 new TextConsole(Level.FINE);
-                
                 final int concurrentThreads = Runtime.getRuntime().availableProcessors();
                 final ExecutorService threadPool = Executors.newFixedThreadPool(concurrentThreads);
@@ -47 +49 @@
         }
         
+        /**
+         * Creates the config and starts the corresponding experiment
+         * @param threadPool 
+         * @param configFile location of the config file
+         */
         public static void createConfig(ExecutorService threadPool, String configFile) {
                 ExperimentConfiguration config = null;
@@ -55 +62 @@
                         e.printStackTrace();
                 }
+
                 if( config!=null ) {
                         Console.trace(Level.FINE, config.toString());
-                        Experiment experiment = new Experiment(config);
-                        threadPool.execute(experiment);
+                        // Instantiate the class like it was given as parameter in the config file and cast it to the interface
+                        try {
+                                // Because we need to pass a parameter, a normal new Instance call is not possible
+                                Class<?> executionStrategyClass = Class.forName("de.ugoe.cs.cpdp.execution."+config.getExecutionStrategy());
+                                Constructor<?> executionStrategyConstructor = 
+                                                executionStrategyClass.getConstructor(ExperimentConfiguration.class);
+                        
+                                IExecutionStrategy experiment = (IExecutionStrategy) executionStrategyConstructor.newInstance(config);
+                                threadPool.execute(experiment);
+                        } catch (NoSuchMethodException e) {
+                                Console.printerrln("Class \"" + config.getExecutionStrategy()+ "\" does not have the right Constructor");
+                                e.printStackTrace();
+                        } catch (SecurityException e) {
+                                Console.printerrln("Security manager prevents reflection");
+                                e.printStackTrace();
+                        } catch (IllegalArgumentException e) {
+                                Console.printerrln("Class \"" + config.getExecutionStrategy()+ "\" does not have a Constructor, which"
+                                                + "matches the given arguments");
+                                e.printStackTrace();
+                        } catch (InvocationTargetException e) {
+                                Console.printerrln("Constructor in Class \"" + config.getExecutionStrategy()+ "\" is not public");
+                                e.printStackTrace();
+                        } catch (InstantiationException e) {
+                                Console.printerrln("Cannot instantiate Class \"" + config.getExecutionStrategy()+"\"");
+                                e.printStackTrace();
+                        } catch (IllegalAccessException e) {
+                                Console.printerrln("Cannot access Class \"" + config.getExecutionStrategy()+"\"");
+                                e.printStackTrace();
+                        } catch (ClassNotFoundException e) {
+                                Console.printerrln("Class \"" + config.getExecutionStrategy()+ "\" was not found");
+                                e.printStackTrace();
+                        }
+                        
                 }
+                
         }
 }

trunk/CrossPare/src/de/ugoe/cs/cpdp/execution/CrossProjectExperiment.java

@@ -1 @@
-package de.ugoe.cs.cpdp;
+package de.ugoe.cs.cpdp.execution;
 
 import java.io.File;
@@ -10 +10 @@
 
 import weka.core.Instances;
+import de.ugoe.cs.cpdp.ExperimentConfiguration;
 import de.ugoe.cs.cpdp.dataprocessing.IProcessesingStrategy;
 import de.ugoe.cs.cpdp.dataprocessing.ISetWiseProcessingStrategy;
@@ -51 +52 @@
  * @author Steffen Herbold
  */
-public class Experiment implements Runnable {
+public class CrossProjectExperiment implements IExecutionStrategy {
 
         /**
@@ -62 +63 @@
          * @param config configuration of the experiment
          */
-        public Experiment(ExperimentConfiguration config) {
+        public CrossProjectExperiment(ExperimentConfiguration config) {
                 this.config = config;
         }

trunk/CrossPare/src/de/ugoe/cs/cpdp/loader/AbstractFolderLoader.java

@@ -21 +21 @@
          * Path of the data.
          */
-        private String path = "";
+        protected String path = "";
 
         /**

trunk/CrossPare/src/de/ugoe/cs/cpdp/loader/IVersionLoader.java

@@ -26 +26 @@
          */
         public List<SoftwareVersion> load();
+
 }