Author: jcouteau Date: 2010-01-14 08:43:33 +0000 (Thu, 14 Jan 2010) New Revision: 2913 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java Log: Improve code Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2010-01-13 16:10:41 UTC (rev 2912) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2010-01-14 08:43:33 UTC (rev 2913) @@ -21,7 +21,6 @@ import java.io.File; import java.io.IOException; import java.util.Collection; -import java.util.Iterator; import java.util.List; import fr.ifremer.isisfish.datastore.SimulationStorage; @@ -67,7 +66,9 @@ * Method to create the isis.factors dataframe in R. * * @param plan Design plan of the sensitivity analysis - * @param outputdirectory ??? + * @param outputdirectory the directory on which we will calculate the + * destination RData file. The RData file will be named directory.RData and + * saved in the directory parent. * * @throws SensitivityException */ @@ -84,12 +85,7 @@ String binfValues = ""; String bsup = "Bsup<-c(%s)"; String bsupValues = ""; - String attributes = "attributes(isis.factors)<-list(" + - "%s" + - "\"nomModel\"=\"isis-fish-externeR\"," + - "names=c(\"nomFacteur\",\"Nominal\",\"Continu\",\"Binf\",\"Bsup\"))"; String attribute = "attr(isis.factors,\"%s\")<-\"%s\""; - String attributesValues = ""; String isisfactors = "isis.factors<-data.frame(" + "\"nomFacteur\"=nomFacteur," + "\"Nominal\"=Nominal," + @@ -177,7 +173,7 @@ } } - String Rcall = ""; + String Rcall; try { @@ -206,15 +202,13 @@ Rcall = String.format(attribute, "nomModel", "isis-fish-externeR"); engine.voidEval(Rcall); - for (int i = 0; i < factors.size(); i++) { - Factor factor = factors.get(i); + for (Factor factor:factors) { if (factor.getDomain() instanceof DiscreteDomain) { String attributeValues = "list("; Collection values = ((DiscreteDomain) factor.getDomain()) - .getValues().values(); - for (Iterator j = values.iterator(); j.hasNext();) { + .getValues().values(); + for (Object j:values) { attributeValues += j + ","; - j.next(); } attributeValues = attributeValues.substring(0, attributeValues.length() - 1);