Author: jcouteau Date: 2009-04-22 16:32:05 +0000 (Wed, 22 Apr 2009) New Revision: 120 Modified: trunk/sensitivity/SensitivityCalculatorJavaExpandGrid.java trunk/sensitivity/SensitivityCalculatorRFrF2.java Log: Code formatting and some corrections Modified: trunk/sensitivity/SensitivityCalculatorJavaExpandGrid.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorJavaExpandGrid.java 2009-04-22 16:31:17 UTC (rev 119) +++ trunk/sensitivity/SensitivityCalculatorJavaExpandGrid.java 2009-04-22 16:32:05 UTC (rev 120) @@ -392,14 +392,7 @@ + ")"); log.info("Message sent to R : " + "isis.simule<-data.frame(isis.simule," + name + ")"); - } - for (int k = 0; k < sensitivityNumber; k++) { - - // Creates the R expression to import results in R - String name = simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k).getExportFilename(); - //Create the dataforaov data.frame String dataframe = "dataforaov<-data.frame(factors," + name + "=" + name + ")"; Modified: trunk/sensitivity/SensitivityCalculatorRFrF2.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorRFrF2.java 2009-04-22 16:31:17 UTC (rev 119) +++ trunk/sensitivity/SensitivityCalculatorRFrF2.java 2009-04-22 16:32:05 UTC (rev 120) @@ -19,9 +19,7 @@ package sensitivity; import java.io.File; -import java.io.Serializable; import java.util.List; -import java.util.Vector; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -31,15 +29,12 @@ import org.codelutin.math.matrix.MatrixFactory; import org.codelutin.math.matrix.MatrixND; import org.codelutin.util.FileUtil; -import org.rosuda.JRI.REXP; import fr.ifremer.isisfish.datastore.SimulationStorage; +import fr.ifremer.isisfish.simulator.sensitivity.AbstractSensitivityCalculator; import fr.ifremer.isisfish.simulator.sensitivity.DesignPlan; import fr.ifremer.isisfish.simulator.sensitivity.Factor; import fr.ifremer.isisfish.simulator.sensitivity.Scenario; -import fr.ifremer.isisfish.simulator.sensitivity.SensitivityCalculator; - -import fr.ifremer.isisfish.simulator.sensitivity.AbstractSensitivityCalculator; import fr.ifremer.isisfish.simulator.sensitivity.SensitivityScenarios; import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; @@ -163,8 +158,7 @@ for (int j = 0; j < nbExperiments; j++) { Scenario experimentScenario = new Scenario(); for (int i = 0; i < factorNumber; i++) { - Factor factor = plan.getFactors() - .get(i); + Factor factor = plan.getFactors().get(i); if ((factor.getDomain() instanceof MatrixContinuousDomain) || (factor.getDomain() instanceof EquationContinuousDomain)) { if (frf2.getValue(new int[] { i, j }) == -1) { @@ -178,15 +172,13 @@ } } else { if (frf2.getValue(new int[] { i, j }) == -1) { - factor - .setValueForIdentifier(((ContinuousDomain) factor - .getDomain()).getMinBound()); + factor.setValueForIdentifier(((ContinuousDomain) factor + .getDomain()).getMinBound()); } if (frf2.getValue(new int[] { i, j }) == 1) { - factor - .setValueForIdentifier(((ContinuousDomain) factor - .getDomain()).getMaxBound()); + factor.setValueForIdentifier(((ContinuousDomain) factor + .getDomain()).getMaxBound()); } } experimentScenario.addFactor(factor); @@ -197,8 +189,8 @@ try { //Create the factors vectors for (int j = 0; j < factorNumber; j++) { - Factor factor = thisExperimentScenarios - .get(0).getFactors().get(j); + Factor factor = thisExperimentScenarios.get(0).getFactors() + .get(j); if (factor.getDomain() instanceof EquationContinuousDomain) { String vector = "factor" + j + "<-c("; @@ -477,7 +469,6 @@ engine.voidEval("names(dataforaov)<-resultsnames"); log.info("Message sent to R : " + "names(dataforaov)<-resultsnames"); - //Save the results with the scenarios. engine.voidEval("write.csv(dataforaov,\""