Author: jcouteau Date: 2012-02-29 11:03:35 +0100 (Wed, 29 Feb 2012) New Revision: 274 Url: http://forge.codelutin.com/repositories/revision/isis-fish-data/274 Log: Fix compil Modified: trunk/sensitivityanalysis/SensitivityCalculatorRDOptimal.java Modified: trunk/sensitivityanalysis/SensitivityCalculatorRDOptimal.java =================================================================== --- trunk/sensitivityanalysis/SensitivityCalculatorRDOptimal.java 2012-02-28 16:26:12 UTC (rev 273) +++ trunk/sensitivityanalysis/SensitivityCalculatorRDOptimal.java 2012-02-29 10:03:35 UTC (rev 274) @@ -241,18 +241,11 @@ //Rename R objects for saving purpose renameObjects(engine,simulationName); - //Clean temporary R objects - for (String object:engine.ls()) { - if (!object.startsWith(simulationName)){ - engine.remove(object); - } - } + // Save Isis R session + engine.saveRData(outputDirectory.getParentFile(), + outputDirectory.getName()); - // Save Isis R session - engine.saveRData(outputDirectory.getParentFile(), - outputDirectory.getName()); - } catch (RException eee) { throw new SensitivityException("Can't generate scenarios", eee); } @@ -386,9 +379,16 @@ } //Rename R objects for saving purpose - renameObjects(engine, firstStorageName); + + //Clean temporary R objects + for (String object:engine.ls()) { + if (!object.startsWith(simulationName)){ + engine.remove(object); + } + } + //Save Isis R session engine.saveRData(outputDirectory.getParentFile(), outputDirectory.getName());