Author: chatellier Date: 2009-10-16 16:57:38 +0000 (Fri, 16 Oct 2009) New Revision: 2667 Modified: isis-fish/trunk/pom.xml isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java Log: Update nuiton-j2r et nuiton-widgets Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-10-16 15:18:12 UTC (rev 2666) +++ isis-fish/trunk/pom.xml 2009-10-16 16:57:38 UTC (rev 2667) @@ -71,7 +71,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-j2r</artifactId> - <version>1.0.0</version> + <version>1.0.1-SNAPSHOT</version> <scope>compile</scope> </dependency> @@ -452,7 +452,7 @@ <topia.version>2.2.1</topia.version> <nuiton-utils.version>1.1.2-SNAPSHOT</nuiton-utils.version> <nuiton-i18n.version>1.0.1</nuiton-i18n.version> - <nuiton-widgets.version>1.0.0</nuiton-widgets.version> + <nuiton-widgets.version>1.0.1-SNAPSHOT</nuiton-widgets.version> <eugene.version>1.0.0</eugene.version> <jrst.version>1.0.0</jrst.version> <aspectwerkz.version>2.0</aspectwerkz.version> 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 2009-10-16 15:18:12 UTC (rev 2666) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2009-10-16 16:57:38 UTC (rev 2667) @@ -46,8 +46,10 @@ * * @param plan Design plan of the sensitivity analysis * @param outputdirectory ??? + * + * @throws SensitivityException */ - public void setIsisFactorsR(DesignPlan plan, File outputdirectory) { + public void setIsisFactorsR(DesignPlan plan, File outputdirectory) throws SensitivityException { String nomFacteur = "nomFacteur<-c(%s)"; String factorNames = ""; @@ -157,8 +159,9 @@ String Rcall = ""; - REngine engine = new RProxy(); + try { + REngine engine = new RProxy(); //clear the engine (to be sure it's empty) log.info("rm(list=ls())"); @@ -228,7 +231,7 @@ if (log.isErrorEnabled()) { log.error("R evaluation failed", eee); } - throw new RuntimeException("R evaluation failed", eee); + throw new SensitivityException("R evaluation failed", eee); // Error while retrieving scenario }