Changeset 1990

Timestamp:

02/02/09 09:01:22 (3 years ago)

Author:

florent.chuffart

Message:

add InputDesignMexicoPlanPanel class

Location:

trunk/simexplorer/simexplorer-methods/src/main/java/org/simexplorer/methods/plan

Files:

• InputDesignMexicoPlan.java (modified) (3 diffs)
• InputDesignMexicoPlanPanel.java (added)

trunk/simexplorer/simexplorer-methods/src/main/java/org/simexplorer/methods/plan/InputDesignMexicoPlan.java

@@ -1 +1 @@
 /*
  *
- *  Copyright (c) 2008, Cemagref
+ *  Copyright © 2008, Cemagref
  *
  *  This program is free software; you can redistribute it and/or
@@ -20 +20 @@
 package org.simexplorer.methods.plan;
 
+import groovy.lang.GroovyShell;
+import groovy.lang.Script;
+
 import java.util.ArrayList;
 import java.util.List;
@@ -25 +28 @@
 import org.simexplorer.core.processors.AbstractArrayPlan;
 import org.simexplorer.core.processors.ApplicativeContext;
-import org.simexplorer.methods.processors.GroovyProcessor;
 import org.simexplorer.core.data.factors.ExperimentalFactor;
 import org.simexplorer.core.data.factors.ExperimentalFactorsValues;
-import org.simexplorer.exception.InternalProcessingError;
-import org.simexplorer.exception.UserBadDataError;
+import org.simexplorer.core.processors.annotations.Constant;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 public class InputDesignMexicoPlan extends AbstractArrayPlan {
 
-  private String inputFileName = "inputDesign.xml";
+    @Constant
+  private String inputFileURI; //= "http://cfp6040.clermont.cemagref.fr/~florent.chuffart/hdpp_inputs/inputDesign1V5.xml"; // <-- example
 
-  
-  
-  //TODO ude grovy code editor instead, of processor
   @Override
   protected void computeValues(ApplicativeContext context, List<ExperimentalFactor> factors) {
+
     this.listOfListOfValues = new ArrayList<ExperimentalFactorsValues>();
-    //this.size = 3;//null;//new Int();
-    String groovycode = new StringBuilder().append("import org.simexplorer.core.data.factors.ExperimentalFactorsValues;\n")
-    .append("inputDesign = new XmlParser().parse(new File(inputFileName));\n")
-    .append("factorsNames = inputDesign.scenario[0].d.'@name';\n")
-    .append("inputDesign.scenario.each {listOfListOfValues << new ExperimentalFactorsValues (factorsNames, it.d.collect{it.value()[0]})};\n")
+    String groovyCode = new StringBuilder()
+    .append("import org.simexplorer.core.data.factors.ExperimentalFactorsValues\n")
+    .append("import org.simexplorer.efsfile.EFSFile\n")
+    .append("inputDesign = new XmlParser().parse( new EFSFile(inputFileURI).cache())\n")
+    .append("factorsNames = inputDesign.scenario[0].d.'@name'\n")
+    .append("inputDesign.scenario.each {listOfListOfValues << new ExperimentalFactorsValues (factorsNames, (it.d.collect{(it.value()[0]).toInteger()}))}\n")
     .toString();
-    // TODO don't use a GroovyProcessor, see #58
-    try {
-      GroovyProcessor groovyProcessor = new GroovyProcessor("xml parser");
-
-      groovyProcessor.setVariable("inputFileName", inputFileName);
-      groovyProcessor.setVariable("listOfListOfValues", listOfListOfValues);
-
-      groovyProcessor.setCode(groovycode);
-      groovyProcessor.process(context);
-      
-      
-    } catch (InternalProcessingError ex) {
-      Logger.getLogger(InputDesignMexicoPlan.class.getName()).log(Level.SEVERE, null, ex);
-    } catch (UserBadDataError ex) {
-      Logger.getLogger(InputDesignMexicoPlan.class.getName()).log(Level.SEVERE, null, ex);
-    }
+    GroovyShell groovyShell = new GroovyShell();
+    groovyShell.setVariable("inputFileURI",inputFileURI);
+    groovyShell.setVariable("listOfListOfValues", listOfListOfValues);
+    Script compiledScript = groovyShell.parse(groovyCode);
+    compiledScript.run();
     this.size = listOfListOfValues.size();
   }
 
-  public String getInputFileName() {
-    return inputFileName;
-  }
-
-  public void setInputFileName(String inputFileName) {
-    this.inputFileName = inputFileName;
+  public void setInputFileURI(String inputFileURI) {
+    this.inputFileURI = inputFileURI;
   }