Changeset 32 for trunk/CrossPare/src/de/ugoe/cs/cpdp/ExperimentConfiguration.java

Timestamp:

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

Author:

ftrautsch

Message:

integrating decent into crosspare

File:

• trunk/CrossPare/src/de/ugoe/cs/cpdp/ExperimentConfiguration.java (modified) (6 diffs)

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();
         }