March 2009 - Isis-fish-commits - mailman.cloud.codelutin.com

r1944 - in isis-fish/trunk/src: main/resources/templates/prescript test/java/fr/ifremer/isisfish/simulator
by chatellier＠users.labs.libre-entreprise.org 11 Mar '09

11 Mar '09

Author: chatellier Date: 2009-03-11 15:24:51 +0000 (Wed, 11 Mar 2009) New Revision: 1944 Modified: isis-fish/trunk/src/main/resources/templates/prescript/factorprescript.ftl isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java Log: Gestion des EquationContinuousDomain. Positionnement des valeurs dans le contexte. Modified: isis-fish/trunk/src/main/resources/templates/prescript/factorprescript.ftl =================================================================== --- isis-fish/trunk/src/main/resources/templates/prescript/factorprescript.ftl 2009-03-11 15:23:48 UTC (rev 1943) +++ isis-fish/trunk/src/main/resources/templates/prescript/factorprescript.ftl 2009-03-11 15:24:51 UTC (rev 1944) @@ -25,6 +25,9 @@ TopiaEntity entity = db.findByTopiaId("fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673"); BeanUtils.setProperty(entity, "minLength", value); +Or : + +context.setValue("K1", 2, "-"); --> import org.apache.commons.beanutils.BeanUtils; @@ -35,6 +38,10 @@ <#list scenario.factors as factor> // Factor : ${factor.name} +<#-- Following is java instanceof equivalent --> +<#if factor.domain.class.simpleName.equals("EquationContinuousDomain")> +context.setValue("${factor.domain.variableName}", ${factor.value}, "${factor.domain.operator}"); +<#else> <#assign value=factor.value /> <#assign serializedValue=beanUtils.convert(value)/> <#assign path=factor.path /> @@ -43,5 +50,6 @@ Object value = beanUtils.convert("${serializedValue}", ${value.class.name}.class); TopiaEntity entity = db.findByTopiaId("${topiaId}"); BeanUtils.setProperty(entity, "${propertyName}", value); +</#if> -</#list> \ No newline at end of file +</#list> Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java 2009-03-11 15:23:48 UTC (rev 1943) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java 2009-03-11 15:24:51 UTC (rev 1944) @@ -52,6 +52,7 @@ import fr.ifremer.isisfish.simulator.sensitivity.Scenario; import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; import fr.ifremer.isisfish.util.ConverterUtil; import freemarker.template.Configuration; import freemarker.template.Template; @@ -69,8 +70,6 @@ * * Last update : $Date: 24 févr. 2009 $ * By : $Author: chatellier $ - * - * FIXME fix this test (empty schema error) */ public class SimulationPreScriptTest { @@ -83,14 +82,13 @@ @BeforeClass public static void init() throws Exception { - //TestUtils.init(); freemarkerConfiguration = TestUtils.getFreemarkerConfiguration(); } @Before public void setUp() throws Exception { // not do it in @BeforeClass - // test wil fail ! + // test will fail ! TestUtils.init(); System.setProperty("hibernate.hbm2ddl.auto", "create"); } @@ -106,7 +104,9 @@ * @throws IOException * @throws TemplateException * @throws StorageException - * @throws TopiaException + * @throws TopiaException + * + * FIXME fix this test (empty schema error) */ @Test public void testFactorPreScriptFactorInt() throws IOException, TemplateException, StorageException, TopiaException { @@ -173,7 +173,7 @@ // FIXME should test value remplaced by precript //Assert.assertEquals(49, vesselType.getLength()); } - + /** * Creer un simulation. * Creer un populationSeasonInfoDAO. @@ -183,7 +183,9 @@ * @throws IOException * @throws TemplateException * @throws StorageException - * @throws TopiaException + * @throws TopiaException + * + * FIXME fix this test (empty schema error) */ @Test public void testFactorPreScriptFactorMatrix() throws IOException, TemplateException, StorageException, TopiaException { @@ -246,12 +248,12 @@ factors.add(factor1); factors.add(factor2); scenario.setFactors(factors); - + // context values Map<String, Object> root = new HashMap<String, Object>(); root.put("scenario", scenario); root.put("beanUtils", ConverterUtil.getConverter(null)); - + // process template Template template = freemarkerConfiguration .getTemplate("templates/prescript/factorprescript.ftl"); @@ -275,4 +277,49 @@ // FIXME should test value remplaced by precript //Assert.assertEquals(matrix2, populationSeasonInfo.getMigrationMatrix()); } + + /** + * Creer un scenario basé sur les EquationDomain. + * + * @throws IOException + * @throws TemplateException + * @throws StorageException + * @throws TopiaException + */ + @Test + public void testFactorPreScriptEquation() throws IOException, TemplateException, StorageException, TopiaException { + + // factor + Factor<Double> factorEquation = new Factor<Double>("test equation"); + EquationContinuousDomain<Double> domain1 = new EquationContinuousDomain<Double>(); + domain1.setMinBound(0.0); + domain1.setMaxBound(3.0); + domain1.setOperator("-"); + domain1.setVariableName("PopulationEquation.K1"); + factorEquation.setDomain(domain1); + factorEquation.setPath("org.codelutin.equation1#testFactorPreScriptEquation"); + factorEquation.setValueForIdentifier(2.0); + + log.info("Script = " + domain1.getClass().getSimpleName()); + + // scenario + Scenario scenario = new Scenario(); + List<Factor<? extends Serializable>> factors = new ArrayList<Factor<? extends Serializable>>(); + factors.add(factorEquation); + scenario.setFactors(factors); + + // context values + Map<String, Object> root = new HashMap<String, Object>(); + root.put("scenario", scenario); + root.put("beanUtils", ConverterUtil.getConverter(null)); + + // process template + Template template = freemarkerConfiguration.getTemplate("templates/prescript/factorprescript.ftl"); + Writer out = new StringWriter(); + template.process(root, out); + out.flush(); + String scriptContent = out.toString(); + //log.info("Script = " + scriptContent); + Assert.assertTrue(scriptContent.indexOf("\"PopulationEquation.K1\", 2, \"-\"") != -1); + } }

1 0

r1943 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 11 Mar '09

11 Mar '09

Author: chatellier Date: 2009-03-11 15:23:48 +0000 (Wed, 11 Mar 2009) New Revision: 1943 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java Log: Ajout des parametres concernant les plan de sensibilit?\195?\169s. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-03-11 15:23:13 UTC (rev 1942) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-03-11 15:23:48 UTC (rev 1943) @@ -401,6 +401,10 @@ SensitivityScenarios sensitivityScenarios = sensitivitycalculator .compute(designPlan); + // ajout des parametres de simulation + param.setSensitivityCalculator(sensitivitycalculator); + param.setNumberOfSensitivitySimulation(sensitivityScenarios.getScenarios().size()); + // on l'ajoute tout de suite a la liste des simulations demandee // init with default "id" must been changed for designPlan // simulation

1 0

r1942 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor
by chatellier＠users.labs.libre-entreprise.org 11 Mar '09

11 Mar '09

Author: chatellier Date: 2009-03-11 15:23:13 +0000 (Wed, 11 Mar 2009) New Revision: 1942 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DomainVisitor.java Log: Improve visitors. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DomainVisitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DomainVisitor.java 2009-03-11 15:23:06 UTC (rev 1941) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DomainVisitor.java 2009-03-11 15:23:13 UTC (rev 1942) @@ -48,7 +48,7 @@ * @param label value label or property name * @param value value */ - <E extends Serializable> void visit(Domain<E> domain, Serializable label, E value); + <E extends Serializable> void visit(Domain<E> domain, Serializable label, Serializable value); /** * End.

1 0

r1941 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml
by chatellier＠users.labs.libre-entreprise.org 11 Mar '09

11 Mar '09

Author: chatellier Date: 2009-03-11 15:23:06 +0000 (Wed, 11 Mar 2009) New Revision: 1941 Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinousDomainXMLVisitor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DiscreteDomainXMLVisitor.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DesignPlanXMLVisitor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DomainXMLVisitor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java Log: Improve visitors. Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinousDomainXMLVisitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinousDomainXMLVisitor.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinousDomainXMLVisitor.java 2009-03-11 15:23:06 UTC (rev 1941) @@ -0,0 +1,90 @@ +/* *##% + * Copyright (C) 2009 Code Lutin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package fr.ifremer.isisfish.mexico.xml; + +import java.io.Serializable; + +import fr.ifremer.isisfish.simulator.sensitivity.Domain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; + +/** + * XML domain visitor. + * + * @author chatellier + * @version $Revision: 1.0 $ + * + * Last update : $Date: 5 mars 2009 $ + * By : $Author: chatellier $ + */ +public class ContinousDomainXMLVisitor extends DomainXMLVisitor { + + /** XML text buffer. */ + protected StringBuffer xmlBuffer; + + /** + * Constructor. + * + * Init xml buffer. + */ + public ContinousDomainXMLVisitor() { + xmlBuffer = new StringBuffer(); + } + + /** + * Get xml buffer content. + * + * @return content as string + */ + public String getXML() { + String xml = xmlBuffer.toString(); + return xml; + } + + /** + * {@inheritDoc} + */ + @Override + public void start(Domain<? extends Serializable> domain) { + xmlBuffer.append("<domain>"); + xmlBuffer.append("<fixed"); + + ContinuousDomain<?> cDomain = (ContinuousDomain<?>)domain; + xmlBuffer.append(" cardinality=\"" + cDomain.getCardinality() + "\">"); + + xmlBuffer.append("<range min=\"" + cDomain.getMinBound() + "\" max=\"" + cDomain.getMaxBound() + "\" />"); + } + + /** + * {@inheritDoc} + */ + @Override + public <E extends Serializable> void visit(Domain<E> domain, + Serializable label, Serializable value) { + + } + + /** + * {@inheritDoc} + */ + @Override + public void end(Domain<? extends Serializable> domain) { + xmlBuffer.append("<fixed>"); + xmlBuffer.append("</domain>"); + } +} Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DesignPlanXMLVisitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DesignPlanXMLVisitor.java 2009-03-11 15:21:43 UTC (rev 1940) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DesignPlanXMLVisitor.java 2009-03-11 15:23:06 UTC (rev 1941) @@ -62,7 +62,8 @@ */ @Override public void start(DesignPlan designPlan) { - xmlBuffer.append("<designplan>"); + xmlBuffer.append("<experimentalDesign>"); + xmlBuffer.append("<factors>"); } /** @@ -81,7 +82,8 @@ */ @Override public void end(DesignPlan designPlan) { - xmlBuffer.append("</designplan>"); + xmlBuffer.append("</factors>"); + xmlBuffer.append("</experimentalDesign>"); } } Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DiscreteDomainXMLVisitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DiscreteDomainXMLVisitor.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DiscreteDomainXMLVisitor.java 2009-03-11 15:23:06 UTC (rev 1941) @@ -0,0 +1,92 @@ +/* *##% + * Copyright (C) 2009 Code Lutin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package fr.ifremer.isisfish.mexico.xml; + +import java.io.Serializable; + +import fr.ifremer.isisfish.simulator.sensitivity.Domain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; + +/** + * XML domain visitor. + * + * @author chatellier + * @version $Revision: 1.0 $ + * + * Last update : $Date: 5 mars 2009 $ + * By : $Author: chatellier $ + */ +public class DiscreteDomainXMLVisitor extends DomainXMLVisitor { + + /** XML text buffer. */ + protected StringBuffer xmlBuffer; + + /** + * Constructor. + * + * Init xml buffer. + */ + public DiscreteDomainXMLVisitor() { + xmlBuffer = new StringBuffer(); + } + + /** + * Get xml buffer content. + * + * @return content as string + */ + public String getXML() { + String xml = xmlBuffer.toString(); + return xml; + } + + /** + * {@inheritDoc} + */ + @Override + public void start(Domain<? extends Serializable> domain) { + xmlBuffer.append("<domain>"); + xmlBuffer.append("<fixed"); + + DiscreteDomain<?> dDomain = (DiscreteDomain<?>)domain; + xmlBuffer.append(" cardinality=\"" + dDomain.getValues().size() + "\""); + + xmlBuffer.append(">"); + xmlBuffer.append("<enumeration>"); + } + + /** + * {@inheritDoc} + */ + @Override + public <E extends Serializable> void visit(Domain<E> domain, + Serializable label, Serializable value) { + xmlBuffer.append("<value>" + value + "</value>"); + } + + /** + * {@inheritDoc} + */ + @Override + public void end(Domain<? extends Serializable> domain) { + xmlBuffer.append("</enumeration>"); + xmlBuffer.append("<fixed>"); + xmlBuffer.append("</domain>"); + } +} Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DomainXMLVisitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DomainXMLVisitor.java 2009-03-11 15:21:43 UTC (rev 1940) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DomainXMLVisitor.java 2009-03-11 15:23:06 UTC (rev 1941) @@ -63,12 +63,16 @@ */ @Override public void start(Domain<? extends Serializable> domain) { - xmlBuffer.append("<domain "); + xmlBuffer.append("<domain>"); + xmlBuffer.append("<fixed"); + if (domain instanceof ContinuousDomain) { - xmlBuffer.append("type=\"continous\""); + ContinuousDomain<?> cDomain = (ContinuousDomain<?>)domain; + xmlBuffer.append(" cardinality=\"" + cDomain.getCardinality() + "\""); } - if (domain instanceof DiscreteDomain) { - xmlBuffer.append("type=\"discrete\""); + else if (domain instanceof DiscreteDomain) { + DiscreteDomain<?> dDomain = (DiscreteDomain<?>)domain; + xmlBuffer.append(" cardinality=\"" + dDomain.getValues().size() + "\""); } xmlBuffer.append(">"); } @@ -78,10 +82,8 @@ */ @Override public <E extends Serializable> void visit(Domain<E> domain, - Serializable label, E value) { - xmlBuffer.append("<value label=\"" + label + "\">"); - xmlBuffer.append(value); - xmlBuffer.append("</value>"); + Serializable label, Serializable value) { + } /** @@ -89,6 +91,7 @@ */ @Override public void end(Domain<? extends Serializable> domain) { + xmlBuffer.append("</fixed>"); xmlBuffer.append("</domain>"); } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java 2009-03-11 15:21:43 UTC (rev 1940) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java 2009-03-11 15:23:06 UTC (rev 1941) @@ -22,6 +22,8 @@ import fr.ifremer.isisfish.simulator.sensitivity.Domain; import fr.ifremer.isisfish.simulator.sensitivity.Factor; +import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.visitor.FactorVisitor; /** @@ -64,11 +66,14 @@ public void start(Factor<? extends Serializable> factor) { xmlBuffer.append("<factor"); xmlBuffer.append(" name=\"" + factor.getName() + "\""); - xmlBuffer.append(" path=\"" + factor.getPath() + "\""); - if (factor.getValue() != null) { - xmlBuffer.append(" value=\"" + factor.getValue() + "\""); + if (factor.getDomain() instanceof ContinuousDomain) { + xmlBuffer.append(" property=\"continuous\""); } + else if (factor.getDomain() instanceof DiscreteDomain) { + xmlBuffer.append(" property=\"discrete\""); + } xmlBuffer.append(">"); + xmlBuffer.append("<target>" + factor.getPath() + "</target>"); } /* @@ -76,7 +81,13 @@ */ @Override public void visit(Factor<? extends Serializable> factor, Domain<? extends Serializable> domain) { - DomainXMLVisitor visitor = new DomainXMLVisitor(); + DomainXMLVisitor visitor = null; + if (factor.getDomain() instanceof ContinuousDomain) { + visitor = new ContinousDomainXMLVisitor(); + } + else if (factor.getDomain() instanceof DiscreteDomain) { + visitor = new DiscreteDomainXMLVisitor(); + } domain.accept(visitor); xmlBuffer.append(visitor.getXML()); }

1 0

r1940 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util
by chatellier＠users.labs.libre-entreprise.org 11 Mar '09

11 Mar '09

Author: chatellier Date: 2009-03-11 15:21:43 +0000 (Wed, 11 Mar 2009) New Revision: 1940 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java Log: Fix tests. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java 2009-03-11 14:20:09 UTC (rev 1939) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java 2009-03-11 15:21:43 UTC (rev 1940) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2006 + * Copyright (C) 2006 - 2009 * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or @@ -17,18 +17,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -/* * - * EvaluatorHelper.java - * - * Created: 3 juil. 2006 23:44:48 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ - package fr.ifremer.isisfish.util; import static org.codelutin.i18n.I18n._; @@ -52,16 +40,20 @@ /** * Permet d'evaluer les equations ecritent en Java * + * Created: 3 juil. 2006 23:44:48 + * * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ */ public class EvaluatorHelper { - - /** - * Logger for this class - */ - private static final Log log = LogFactory.getLog(EvaluatorHelper.class); - static private String normalizeClassName(String name) { + /** Logger for this class. */ + private static Log log = LogFactory.getLog(EvaluatorHelper.class); + + protected static String normalizeClassName(String name) { StringBuffer result = new StringBuffer(name); for (int i=0; i<result.length(); i++) { char c = result.charAt(i); @@ -71,16 +63,16 @@ } return result.toString(); } - + /** - * Verifie si une equation est syntaxiquement correct + * Verifie si une equation est syntaxiquement correcte. * * @param javaInterface * @param script - * @param out + * @param out output writer (can be null for non output) * @return 0 si ok */ - static public int check(Class javaInterface, String script, PrintWriter out) { + public static int check(Class javaInterface, String script, PrintWriter out) { try { File src = File.createTempFile("check", "equation"); src.deleteOnExit(); @@ -109,8 +101,9 @@ return -10000; } } - + /** + * Evalue une equation. * * @param packageName le nom de package de la classe * @param className le nom de la classe @@ -120,26 +113,26 @@ * @param args les arguments a utiliser pour l'appel de la methode * @return la valeur retourné par la methode */ - static public Object evaluate(String packageName, String className, + public static Object evaluate(String packageName, String className, Class javaInterface, String script, Map<String, Object> args) { className = normalizeClassName(className); - + Object result = null; Class clazz = null; // recherche la methode de l'interface Method [] methods = javaInterface.getDeclaredMethods(); Method interfaceMethod = methods[0]; - + String classname = packageName + "." + className; File fileRootSrc = IsisFish.config.getCompileDirectory(); File fileCheckSum = new File(fileRootSrc, packageName + File.separator + className + ".hashCode"); File fileSrc = new File(fileRootSrc, packageName + File.separator + className + ".java"); File fileDest = new File(fileRootSrc, packageName + File.separator + className + ".class"); - + boolean checkSumEquals = false; - + // if equation's Java file exists, check the checksum if (fileSrc.exists() && fileCheckSum.exists()) { String oldCheckSum = ""; @@ -151,7 +144,7 @@ String newCheckSum = Integer.toString(script.hashCode()); checkSumEquals = newCheckSum.equals(oldCheckSum); } - + // if Java file's checkSum is not equals to script's checkSum // generate new Java file if (!checkSumEquals) { @@ -168,7 +161,7 @@ throw new IsisFishRuntimeException(_("isisfish.error.save.checkSum.compilation", fileSrc), zzz); } } - + // if Java file is newer than class file, compile java file if (FileUtil.isNewer(fileSrc, fileDest)) { try { @@ -180,7 +173,7 @@ throw new IsisFishRuntimeException(_("isisfish.error.compile.script", fileSrc), zzz); } } - + // try to load class try { ClassLoader cl = IsisFish.config.getScriptClassLoader(); @@ -188,13 +181,13 @@ } catch (Exception zzz) { throw new IsisFishRuntimeException(_("isisfish.error.load.class", classname), zzz); } - + result = invoke(clazz, interfaceMethod, args); - + return result; } - - static protected String generateContent (String packageName, String className, Method interfaceMethod, String script) { + + protected static String generateContent (String packageName, String className, Method interfaceMethod, String script) { String content = ""; if (packageName != null && !"".equals(packageName)) { content += "package " + packageName + ";"; @@ -210,7 +203,7 @@ content += "public " + interfaceMethod.getReturnType().getName() + " " + interfaceMethod.getName() + "("; - + Args args = interfaceMethod.getAnnotation(Args.class); String [] names = args.value(); @@ -225,7 +218,7 @@ stringTypes[i] = types[i].getName(); } } - + for (int i=0; i<names.length; i++) { content += stringTypes[i] + " " + names[i]; if (i+1<names.length) { @@ -239,7 +232,7 @@ return content; } - static protected Object invoke(Class clazz, Method interfaceMethod, Map<String, Object> args) { + protected static Object invoke(Class clazz, Method interfaceMethod, Map<String, Object> args) { try { Method method = clazz.getDeclaredMethod(interfaceMethod.getName(), interfaceMethod.getParameterTypes());

1 0

r1939 - isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util
by chatellier＠users.labs.libre-entreprise.org 11 Mar '09

11 Mar '09

Author: chatellier Date: 2009-03-11 14:20:09 +0000 (Wed, 11 Mar 2009) New Revision: 1939 Added: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/EvaluateHelperTest.java Log: Add test on EvaluateHelper Added: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/EvaluateHelperTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/EvaluateHelperTest.java (rev 0) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/EvaluateHelperTest.java 2009-03-11 14:20:09 UTC (rev 1939) @@ -0,0 +1,115 @@ +/* *##% + * Copyright (C) 2009 Code Lutin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package fr.ifremer.isisfish.util; + +import java.util.HashMap; +import java.util.Map; + +import junit.framework.Assert; + +import org.junit.BeforeClass; +import org.junit.Test; + +import fr.ifremer.TestUtils; +import fr.ifremer.isisfish.equation.EmigrationEquation; +import fr.ifremer.isisfish.equation.PopulationGrowth; +import fr.ifremer.isisfish.equation.PopulationGrowthReverse; + +/** + * Test class for {@link EvaluatorHelper}. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class EvaluateHelperTest { + + @BeforeClass + public static void init() throws Exception { + TestUtils.init(); + } + + /** + * Test #normalizeClassName(). + */ + @Test + public void testNormalizeClassName() { + Assert.assertEquals("Test", EvaluatorHelper.normalizeClassName("Test")); + Assert.assertEquals("Te_t", EvaluatorHelper.normalizeClassName("Te/t")); + Assert.assertEquals("org_test_Test", EvaluatorHelper + .normalizeClassName("org.test.Test")); + } + + /** + * Test #check(). + */ + @Test + public void testCheck() { + String equationContent = "return 12.0;"; + + int result = EvaluatorHelper.check(EmigrationEquation.class, + equationContent, null); + Assert.assertEquals(0, result); + } + + /** + * Test #evaluate(). + */ + @Test + public void testEvaluate() { + String equationContent = "return age * 2.0;"; + + Map<String, Object> args = new HashMap<String, Object>(); + args.put("context", null); + args.put("age", 2.0); + args.put("group", null); + Object result = EvaluatorHelper.evaluate("org.codelutin.equation", + "TestEvaluate", PopulationGrowth.class, equationContent, args); + + Assert.assertNotNull(result); + Assert.assertEquals("4.0", result.toString()); + } + + /** + * Test #evaluate() but twice to check that previous + * class don't stay in class loader. + */ + @Test + public void testDoubleContentEvaluate() { + + Map<String, Object> args = new HashMap<String, Object>(); + args.put("context", null); + args.put("length", 2.0); + args.put("group", null); + + String equationContent = "return length * 2.0;"; + Object result = EvaluatorHelper.evaluate("org.codelutin.equation", + "TestDoubleContentEvaluate", PopulationGrowthReverse.class, equationContent, args); + Assert.assertNotNull(result); + Assert.assertEquals("4.0", result.toString()); + + equationContent = "return length * 3.0;"; + result = EvaluatorHelper.evaluate("org.codelutin.equation", + "TestDoubleContentEvaluate", PopulationGrowthReverse.class, equationContent, args); + Assert.assertNotNull(result); + Assert.assertEquals("6.0", result.toString()); + } +} Property changes on: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/EvaluateHelperTest.java ___________________________________________________________________ Name: svn:keywords + Revision Date Author

1 0

r1938 - isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util
by chatellier＠users.labs.libre-entreprise.org 11 Mar '09

11 Mar '09

Author: chatellier Date: 2009-03-11 14:19:34 +0000 (Wed, 11 Mar 2009) New Revision: 1938 Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java Log: Move test to junit 4 (improve test) Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java 2009-03-11 11:29:21 UTC (rev 1937) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java 2009-03-11 14:19:34 UTC (rev 1938) @@ -1,35 +1,41 @@ -/* - * *##% Copyright (C) 2006 - 2009 Code Lutin, Cédric Pineau, Benjamin Poussin - * - * This program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more - * details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place - Suite 330, Boston, MA 02111-1307, USA. ##% - */ +/* *##% + * Copyright (C) 2009 CodeLutin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ package fr.ifremer.isisfish.util; -import junit.framework.TestCase; -import org.codelutin.util.FileUtil; - import java.io.File; +import java.io.IOException; import java.net.URL; import java.net.URLClassLoader; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.codelutin.util.FileUtil; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; + +import fr.ifremer.TestUtils; + /** - * ClassUtilTest. + * CompileHelperTest. * * Created: 12 janv. 2006 16:20:33 * @@ -40,12 +46,68 @@ * Last update: $Date$ * by : $Author$ */ -public class CompileHelperTest extends TestCase { +public class CompileHelperTest { - public void testCompile() throws Exception { + /** Class logger */ + private static Log log = LogFactory.getLog(CompileHelperTest.class); + + /** + * Called once before all class tests. + * @throws Exception + */ + @BeforeClass + public static void init() throws Exception { + TestUtils.init(); + } + + /** + * Return a Java code content in Java 6. + * + * @param name Class name + * + * @return java code + */ + protected String getFirstClassContent(String name) { + StringBuffer content = new StringBuffer(); + content.append("public class " + name + " {"); + content.append(" /** Java 6 code */"); + content.append(" public boolean isEmpty(String s) {"); + content.append(" return s.isEmpty();"); + content.append(" }"); + content.append("}"); + return content.toString(); + } + + /** + * Return a Java code content in Java 6 that extends a class. + * + * @param name + * @param extendsName + * @return java code + */ + protected String getSecondClassContent(String name, String extendsName) { + StringBuffer content = new StringBuffer(); + content.append("public class " + name + " extends " + extendsName + " {"); + content.append(" @Override"); + content.append(" public boolean isEmpty(String s) {"); + content.append(" return false;"); + content.append(" }"); + content.append("}"); + return content.toString(); + } + + /** + * Test une compilation de classe et une + * instantiation de la classe compilée. + * + * @throws IOException + * @throws ClassNotFoundException + */ + @Test + public void testCompile() throws IOException, ClassNotFoundException { File f = File.createTempFile("testCompile", ".java"); String filename = FileUtil.basename(f, ".java"); - String code = "public class " + filename + " {}"; + String code = getFirstClassContent(filename); FileUtil.writeString(f, code); List<File> classpath = new ArrayList<File>(); @@ -56,49 +118,64 @@ // essai de chargement de la classe URL[] cp = new URL[] { f.getParentFile().toURI().toURL() }; - //URL[] cp = new URL[] { f.getParentFile().toURL() }; ClassLoader cl = new URLClassLoader(cp); - Class c = cl.loadClass(filename); - System.out.println("class name: " + c.getName()); - assertEquals(filename, c.getName()); + Class<?> c = cl.loadClass(filename); + log.info("class name: " + c.getName()); + Assert.assertEquals(filename, c.getName()); + + // delete + File fclass = new File(f.getAbsolutePath().replaceAll("java$", "class")); + fclass.delete(); + f.delete(); } - public void testCompileDepend() throws Exception { + /** + * Test de compiler deux classes dont l'un etend l'autre. + * Puis instancie les deux. + * @throws IOException + * @throws ClassNotFoundException + */ + @Test + public void testCompileDepend() throws IOException, ClassNotFoundException { + File fA = File.createTempFile("testCompileA", ".java"); String filenameA = FileUtil.basename(fA, ".java"); - String codeA = "public class " + filenameA + " {}"; + String codeA = getFirstClassContent(filenameA); FileUtil.writeString(fA, codeA); File fB = File.createTempFile("testCompileB", ".java"); String filenameB = FileUtil.basename(fB, ".java"); - String codeB = "public class " + filenameB + " extends " + filenameA - + " {}"; + String codeB = getSecondClassContent(filenameB, filenameA); FileUtil.writeString(fB, codeB); File dest = new File(fB.getParentFile(), "testCompile"); List<File> classpath = new ArrayList<File>(); classpath.add(fB.getParentFile()); - CompileHelper.compile(classpath, Collections.singletonList(fB), dest, - null); + CompileHelper.compile(classpath, Collections.singletonList(fB), + dest, null); - { - // essai de chargement de la classe - URL[] cp = new URL[] { dest.toURI().toURL() }; - //URL[] cp = new URL[] { dest.toURL() }; - ClassLoader cl = new URLClassLoader(cp); - Class c = cl.loadClass(filenameB); - System.out.println("class name: " + c.getName()); - assertEquals(filenameB, c.getName()); - } - { - // essai de chargement de la classe - URL[] cp = new URL[] { dest.toURI().toURL() }; - //URL[] cp = new URL[] { dest.toURL() }; - ClassLoader cl = new URLClassLoader(cp); - Class c = cl.loadClass(filenameA); - System.out.println("class name: " + c.getName()); - assertEquals(filenameA, c.getName()); - } + // essai de chargement de la classe + URL[] cp = new URL[] { dest.toURI().toURL() }; + ClassLoader cl = new URLClassLoader(cp); + Class<?> c = cl.loadClass(filenameB); + log.info("class name: " + c.getName()); + Assert.assertEquals(filenameB, c.getName()); + + // essai de chargement de la classe + cp = new URL[] { dest.toURI().toURL() }; + //URL[] cp = new URL[] { dest.toURL() }; + cl = new URLClassLoader(cp); + c = cl.loadClass(filenameA); + log.info("class name: " + c.getName()); + Assert.assertEquals(filenameA, c.getName()); + + // delete + File fclassA = new File(fA.getAbsolutePath().replaceAll("java$", "class")); + fclassA.delete(); + File fclassB = new File(fB.getAbsolutePath().replaceAll("java$", "class")); + fclassB.delete(); + fA.delete(); + fB.delete(); } }

1 0

r1937 - in isis-fish/trunk/src: main/java/fr/ifremer/isisfish/datastore main/java/fr/ifremer/isisfish/simulator/launcher test/java/fr/ifremer test/java/fr/ifremer/isisfish/ui/sensitivity
by chatellier＠users.labs.libre-entreprise.org 11 Mar '09

11 Mar '09

Author: chatellier Date: 2009-03-11 11:29:21 +0000 (Wed, 11 Mar 2009) New Revision: 1937 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java isis-fish/trunk/src/test/java/fr/ifremer/TestUtils.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java Log: Call analyseResult after all simulation ends. Still miss simulation scenario. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2009-03-11 11:26:00 UTC (rev 1936) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2009-03-11 11:29:21 UTC (rev 1937) @@ -1,6 +1,6 @@ /* *##% - * Copyright (C) 2005 - * Ifremer, Code Lutin, Cï¿œdric Pineau, Benjamin Poussin + * Copyright (C) 2005 - 2009 + * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,18 +17,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -/* * - * SimulationStorage.java - * - * Created: 17 aoï¿œt 2005 03:48:50 CEST - * - * @author Benjamin POUSSIN <poussin at codelutin.com> - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ - package fr.ifremer.isisfish.datastore; import static org.codelutin.i18n.I18n._; @@ -61,53 +49,61 @@ import fr.ifremer.isisfish.vcs.VCSException; /** - * Class permettant la gestion de la persistance d'une simulation + * Class permettant la gestion de la persistance d'une simulation. * - * @author poussin + * Created: 17 août 2005 03:48:50 CEST * + * @author Benjamin POUSSIN <poussin at codelutin.com> + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ */ public class SimulationStorage extends DataStorage { // SimulationStorage - static final public String SIMULATION_PATH = "simulations"; - static final public String INFORMATION_FILENAME = "information"; - static final public String PARAMETERS_FILENAME = "parameters.properties"; - static final public String RESULT_XML_FILENAME = "isis-mexico-output.xml"; - static final public String RESULT_EXPORT_DIRECTORY = "resultExports"; + public static final String SIMULATION_PATH = "simulations"; + public static final String INFORMATION_FILENAME = "information"; + public static final String CONTROL_FILENAME = "control"; + public static final String PARAMETERS_FILENAME = "parameters.properties"; + public static final String RESULT_XML_FILENAME = "isis-mexico-output.xml"; + public static final String RESULT_EXPORT_DIRECTORY = "resultExports"; - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(SimulationStorage.class); + private static Log log = LogFactory.getLog(SimulationStorage.class); /** cache des simulation storage */ @SuppressWarnings("unchecked") - static protected Map<String, SimulationStorage> simulations = - (Map<String, SimulationStorage>) new ReferenceMap(); + protected static Map<String, SimulationStorage> simulations = (Map<String, SimulationStorage>) new ReferenceMap(); /** some free information, that user can add during simulation */ protected SimulationInformation information = null; protected SimulationParameter parameter = null; - transient protected ResultStorage resultStorage = null; + protected transient ResultStorage resultStorage = null; /** represent the category used for logging in simulation */ public static String LOG_CATEGORY = "fr.ifremer.isisfish.simulator"; /** flag to says if simulation is actually using a simulation logger */ protected boolean useLog; + + protected transient File simulationControlFile = null; + /** * Pour la lecture d'une simulation existante * @param directory repertoire de base du storage (inclu le nom de la sim) * @param name le nom de la simulation * @param parameter les paramètres de la simulation */ - protected SimulationStorage(File directory, String name, SimulationParameter parameter){ + protected SimulationStorage(File directory, String name, + SimulationParameter parameter) { super(directory, name); setParameter(parameter); } - + /** * Retourne le repertoire de base de stockage des simulations * @return */ - static public File getSimulationDirectory() { + public static File getSimulationDirectory() { File result = IsisFish.config.getDatabaseDirectory(); result = new File(result, SIMULATION_PATH); if (!result.exists()) { @@ -136,7 +132,7 @@ * @param root le repertoire de stockage de la simulation * @return */ - static public File getResultExportDirectory(File root) { + public static File getResultExportDirectory(File root) { File result = new File(root, RESULT_EXPORT_DIRECTORY); if (!result.exists()) { result.mkdirs(); @@ -149,32 +145,32 @@ * @param root le repertoire de stockage de la simulation * @return */ - static public File getSimulationParametersFile(File root) { + public static File getSimulationParametersFile(File root) { File result = new File(root, PARAMETERS_FILENAME); return result; } - + /** * Retourne le fichier de stockage des inforations de la simulation * @param root le repertoire de stockage de la simulation * @return */ - static public File getSimulationInformationFile(File root) { + public static File getSimulationInformationFile(File root) { File result = new File(root, INFORMATION_FILENAME); return result; } - + /** * Retourne le fichier de stockage des resultats sous format XML mexico * de la simulation * @param root le repertoire de stockage de la simulation * @return */ - static public File getSimulationResultXmlFile(File root) { + public static File getSimulationResultXmlFile(File root) { File result = new File(root, RESULT_XML_FILENAME); return result; } - + /** * Retourne le fichier de stockage des parametres de la simulation courante * @return @@ -184,7 +180,6 @@ return result; } - protected transient File simulationControlFile = null; /** * Retourne le fichier de stockage du fichier de control de la simulation. * Ce fichier conserve l'etat de la simulation, cela permet a un processus @@ -193,11 +188,11 @@ */ protected File getSimulationControlFile() { if (simulationControlFile == null) { - simulationControlFile = new File(getDirectory(), "control"); + simulationControlFile = new File(getDirectory(), CONTROL_FILENAME); } return simulationControlFile; } - + /** * Retourne le fichier de stockage du fichier de control de la simulation. * Ce fichier conserve l'etat de la simulation, cela permet a un processus @@ -205,7 +200,7 @@ * @return */ protected static File getSimulationControlFile(String id) { - File result = new File(getSimulationDirectory(id), "control"); + File result = new File(getSimulationDirectory(id), CONTROL_FILENAME); return result; } @@ -226,7 +221,7 @@ // car simplement utilise pour indique l'etat de simulation log.warn("Can't save control", eee); } - } + } /** * Reli le fichier contenant les infos de SimulationControl, en excluant @@ -236,11 +231,12 @@ * @param control le control a mettre a jour en fonction de ce qui est lu * @param exclude les champs a exclure */ - public static void readControl(String id, SimulationControl control, String... exclude) { + public static void readControl(String id, SimulationControl control, + String... exclude) { File file = getSimulationControlFile(id); readControl(file, control, exclude); } - + /** * Reli le fichier contenant les infos de SimulationControl, en excluant * certain champs. @@ -249,7 +245,8 @@ * @param control le control a mettre a jour en fonction de ce qui est lu * @param exclude les champs a exclure */ - public static void readControl(File controlFile, SimulationControl control, String... exclude) { + public static void readControl(File controlFile, SimulationControl control, + String... exclude) { try { Properties prop = new Properties(); if (controlFile.exists()) { @@ -263,10 +260,10 @@ prop.remove(e); } control.updateFromProperties(prop); - } - else { - if(log.isDebugEnabled()) { - log.debug("Control file '" + controlFile.getAbsolutePath() + "'doesn't exists"); + } else { + if (log.isDebugEnabled()) { + log.debug("Control file '" + controlFile.getAbsolutePath() + + "'doesn't exists"); } } } catch (Exception e) { @@ -289,7 +286,8 @@ prop.store(out, "Parameters"); out.close(); } catch (IOException eee) { - throw new IsisFishRuntimeException(_("isisfish.error.save.simulation.parameters", file ), eee); + throw new IsisFishRuntimeException(_( + "isisfish.error.save.simulation.parameters", file), eee); } } } @@ -300,15 +298,16 @@ * @return Parameter property. */ public SimulationParameter getParameter() { - if(parameter == null){ + if (parameter == null) { Properties prop = new Properties(); File file = getSimulationParametersFile(); - + // log - if(log.isDebugEnabled()) { - log.debug("Loading properties from : " + file.getAbsolutePath()); + if (log.isDebugEnabled()) { + log.debug("Loading properties from : " + + file.getAbsolutePath()); } - + try { FileInputStream in = new FileInputStream(file); prop.load(in); @@ -316,7 +315,8 @@ parameter = new SimulationParameter(); parameter.fromProperties(getDirectory(), prop); } catch (IOException eee) { - throw new IsisFishRuntimeException(_("isisfish.error.read.simulation.parameters", file), eee); + throw new IsisFishRuntimeException(_( + "isisfish.error.read.simulation.parameters", file), eee); } } return this.parameter; @@ -345,7 +345,8 @@ parameter = new SimulationParameter(); parameter.fromProperties(getDirectory(), prop); } catch (IOException eee) { - throw new IsisFishRuntimeException(_("isisfish.error.read.simulation.parameters", file), eee); + throw new IsisFishRuntimeException(_( + "isisfish.error.read.simulation.parameters", file), eee); } return this.parameter; } @@ -378,7 +379,7 @@ } return resultStorage; } - + /** * Indique si la simulation demandée existe ou non * @param name le nom de la simulation à tester @@ -396,7 +397,7 @@ * @param name le nom de la simulation à tester * @return true si la simulation existe déjà */ - static public boolean localyExists(String name) { + public static boolean localyExists(String name) { return getSimulationNames().contains(name); } @@ -405,7 +406,7 @@ * @param name name of the required simulation * @return la simulation souhaitée ou null si la simulation n'existe pas */ - static public SimulationStorage getSimulation(String name) { + public static SimulationStorage getSimulation(String name) { SimulationStorage result = simulations.get(name); if (result == null) { // recherche du repertoire de la simulation en fonction de la config @@ -431,22 +432,26 @@ * @throws IllegalArgumentException si le nom existe déjà en tant que * simulation */ - static public SimulationStorage create(String name, SimulationParameter parameter) throws StorageException { + public static SimulationStorage create(String name, + SimulationParameter parameter) throws StorageException { if (localyExists(name)) { - throw new IllegalArgumentException("Can't create simulation this simulation name exists: " + name); + throw new IllegalArgumentException( + "Can't create simulation this simulation name exists: " + + name); } File directory = getSimulationDirectory(name); - SimulationStorage result = new SimulationStorage(directory, name, parameter); + SimulationStorage result = new SimulationStorage(directory, name, + parameter); // 20060819: poussin // don't create schema, schema is created during data import from region -// try { -// TopiaContext context = result.getStorage().beginTransaction(); -// context.createSchema(); -// context.commitTransaction(); -// } catch (TopiaException eee) { -// throw new StorageException("Can't create new Region", eee); -// } + // try { + // TopiaContext context = result.getStorage().beginTransaction(); + // context.createSchema(); + // context.commitTransaction(); + // } catch (TopiaException eee) { + // throw new StorageException("Can't create new Region", eee); + // } simulations.put(name, result); return result; @@ -456,7 +461,7 @@ * Retourne la liste des noms de toutes les régions disponible en local * @return la liste des noms de toutes les régions disponible en local */ - static public List<String> getSimulationNames() { + public static List<String> getSimulationNames() { File dir = getSimulationDirectory(); return getStorageNames(dir); } @@ -466,7 +471,7 @@ * ne sont pas encore sur le serveur CVS * @return liste de noms de simulations */ - static public List<String> getNewSimulationNames() { + public static List<String> getNewSimulationNames() { List<String> result = getSimulationNames(); result.removeAll(getRemoteSimulationNames()); return result; @@ -479,7 +484,7 @@ * serveur CVS. Si le serveur n'est pas disponible la liste retournée * est vide. */ - static public List<String> getRemoteSimulationNames() { + public static List<String> getRemoteSimulationNames() { File dir = getSimulationDirectory(); return getRemoteStorageNames(dir); } @@ -489,7 +494,7 @@ * serveur CVS qui ne sont pas encore en local * @return liste de noms de simulations */ - static public List<String> getNewRemoteSimulationNames() { + public static List<String> getNewRemoteSimulationNames() { List<String> result = getRemoteSimulationNames(); result.removeAll(getSimulationNames()); return result; @@ -501,12 +506,12 @@ * @return * @throws StorageException */ - static public FisheryRegion getFisheryRegion(TopiaContext context) - throws StorageException { + public static FisheryRegion getFisheryRegion(TopiaContext context) + throws StorageException { FisheryRegion result; try { FisheryRegionDAO regionDAO = IsisFishDAOHelper - .getFisheryRegionDAO(context); + .getFisheryRegionDAO(context); List<FisheryRegion> regions = regionDAO.findAll(); if (regions.size() != 1) { throw new StorageException("Invalide region database" @@ -539,7 +544,8 @@ tx.commitTransaction(); return result; } catch (TopiaException eee) { - throw new StorageException(_("isisfish.error.get.fisheryRegion"), eee); + throw new StorageException(_("isisfish.error.get.fisheryRegion"), + eee); } } @@ -550,8 +556,10 @@ * @throws VCSException si problème avec le VCS * @throws TopiaException si problème lors de l'opération sur la base embarquée */ - static public void checkout(String name) throws VCSException, TopiaException { - checkout(IsisFish.config.getDatabaseDirectory(), SIMULATION_PATH + "/" + name); + public static void checkout(String name) throws VCSException, + TopiaException { + checkout(IsisFish.config.getDatabaseDirectory(), SIMULATION_PATH + "/" + + name); SimulationStorage sim = getSimulation(name); File file = sim.getDataBackupFile(); TopiaContext tx = sim.getStorage().beginTransaction(); @@ -560,7 +568,7 @@ tx.closeContext(); } - /* (non-Javadoc) + /* * @see fr.ifremer.isisfish.datastore.DataStorage#rename(java.lang.String) */ @Override @@ -571,19 +579,20 @@ } /** - * import zipped simulation + * Import zipped simulation. * * @param file zipped region file * @return region storage or null * @throws IOException si problème IO lors de la lecture du zip * @throws TopiaException si problème lors de la création du contexte */ - public static SimulationStorage importZip(File file) throws IOException, TopiaException { + public static SimulationStorage importZip(File file) throws IOException, + TopiaException { return importAndRenameZip(file, null); } /** - * import zipped simulation + * Import zipped simulation. * * @param file zipped region file * @param newName new name for the imported simulation @@ -591,15 +600,17 @@ * @throws IOException si problème IO lors de la lecture du zip * @throws TopiaException si problème lors de la création du contexte */ - public static SimulationStorage importAndRenameZip(File file, String newName) throws IOException, TopiaException { - SimulationStorage result = importAndRenameZip(getSimulationDirectory(), file, newName); + public static SimulationStorage importAndRenameZip(File file, String newName) + throws IOException, TopiaException { + SimulationStorage result = importAndRenameZip(getSimulationDirectory(), + file, newName); // put result in cache simulations.put(result.getName(), result); return result; } /** - * import zipped simulation in specific directory, result is not put in cache + * Import zipped simulation in specific directory, result is not put in cache. * * @param directory where we want new simulation storage * @param file zipped region file @@ -608,13 +619,15 @@ * @throws IOException si problème IO lors de la lecture du zip * @throws TopiaException si problème lors de la création du contexte */ - public static SimulationStorage importAndRenameZip(File directory, File file, String newName) throws IOException, TopiaException { + public static SimulationStorage importAndRenameZip(File directory, + File file, String newName) throws IOException, TopiaException { if (!directory.exists()) { directory.mkdirs(); } - if(!directory.isDirectory()) { - throw new IllegalArgumentException(_("directory %s must be a directory", - directory.getAbsolutePath())); + if (!directory.isDirectory()) { + throw new IllegalArgumentException(_( + "directory %s must be a directory", directory + .getAbsolutePath())); } String renameFrom = null; String renameTo = null; @@ -622,11 +635,16 @@ renameFrom = "^.*?/(.*)$"; renameTo = newName + "/$1"; } - log.info(_("Import simulation file %s in directory %s and rename from %s to %s", - file, directory, renameFrom, renameTo)); - String lastEntry = ZipUtil.uncompressAndRename(file, directory, renameFrom, renameTo); + if (log.isInfoEnabled()) { + log.info(_("Import simulation file %s in directory %s and rename from %s to %s", + file, directory, renameFrom, renameTo)); + } + String lastEntry = ZipUtil.uncompressAndRename(file, directory, + renameFrom, renameTo); String name = lastEntry.substring(0, lastEntry.indexOf("/")); - log.info(_("Last entry was %s extract name %s", lastEntry, name)); + if (log.isInfoEnabled()) { + log.info(_("Last entry was %s extract name %s", lastEntry, name)); + } File simDir = new File(directory, name); SimulationStorage result = new SimulationStorage(simDir, name, null); @@ -641,7 +659,7 @@ return result; } - + /** * Extract the region of a given simulation in a * @param regionName the name of the region to export @@ -649,15 +667,16 @@ */ public void extractRegion(String regionName) throws StorageException { - File tmpDir=null; + File tmpDir = null; try { TopiaContext tx = getStorage().beginTransaction(); String oldRegionName = getFisheryRegion(tx).getName(); - + // create a pseudo oldRegionName region - tmpDir = FileUtil.createTempDirectory("extractRegionFromSimulation", ""); + tmpDir = FileUtil.createTempDirectory( + "extractRegionFromSimulation", ""); List<File> forZip = new ArrayList<File>(2); File file1; forZip.add(file1 = new File(tmpDir, oldRegionName)); @@ -675,7 +694,7 @@ // import region with regionName as new name RegionStorage.importAndRenameZip(zipRegion, regionName); - + tx.commitTransaction(); tx.closeContext(); } catch (IOException e) { @@ -697,20 +716,16 @@ * @param scriptLogLevel required min level fro scripts logger * @param libLogLevel required min level for libraries logger */ - public void addSimulationLogger(String simulLogLevel, String scriptLogLevel, String libLogLevel,String threadName ) { + public void addSimulationLogger(String simulLogLevel, + String scriptLogLevel, String libLogLevel, String threadName) { try { - SimulationLoggerUtil.addSimulationAppender( - getSimulationLogFile(), - getAppenderId(), - simulLogLevel, - scriptLogLevel, - libLogLevel, - threadName - ); - useLog=true; + SimulationLoggerUtil.addSimulationAppender(getSimulationLogFile(), + getAppenderId(), simulLogLevel, scriptLogLevel, + libLogLevel, threadName); + useLog = true; } catch (Exception eee) { - useLog=false; + useLog = false; log.warn(_("Can't create simulation logger", eee)); // we do not throw any exception, this is a shame but not required } @@ -719,16 +734,13 @@ /** * this method remove logger for the simulation */ - public void removeSimulationLogger() { + public void removeSimulationLogger() { try { - String appenderId = getAppenderId(); - - SimulationLoggerUtil.removeSimulationAppender(appenderId); - + SimulationLoggerUtil.removeSimulationAppender(appenderId); } finally { - useLog=false; + useLog = false; } } @@ -750,4 +762,3 @@ return root + File.separator + "simulation.log"; } } // SimulationStorage - Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2009-03-11 11:26:00 UTC (rev 1936) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2009-03-11 11:29:21 UTC (rev 1937) @@ -67,10 +67,10 @@ * Fait une simulation dans la meme jvm. * * @author poussin - * @version $Revision: 1.0 $ + * @version $Revision$ * - * Last update : $Date: 5 mars 2009 $ - * By : $Author: chatellier $ + * Last update : $Date$ + * By : $Author$ */ public class InProcessSimulatorLauncher implements SimulatorLauncher { Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java ___________________________________________________________________ Name: svn:keywords + Revision Author Date Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-03-11 11:26:00 UTC (rev 1936) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-03-11 11:29:21 UTC (rev 1937) @@ -25,9 +25,11 @@ import java.io.FileOutputStream; import java.io.IOException; import java.rmi.RemoteException; +import java.util.ArrayList; import java.util.Collection; import java.util.Date; import java.util.Iterator; +import java.util.List; import java.util.Map; import java.util.Properties; import java.util.SortedMap; @@ -46,6 +48,9 @@ import fr.ifremer.isisfish.simulator.SimulationControl; import fr.ifremer.isisfish.simulator.SimulationParameter; import fr.ifremer.isisfish.simulator.launcher.SimulationJob.PostAction; +import fr.ifremer.isisfish.simulator.sensitivity.SensitivityCalculator; +import fr.ifremer.isisfish.simulator.sensitivity.SensitivityException; +import fr.ifremer.isisfish.simulator.sensitivity.SensitivityScenarios; /** * Moniteur singleton pour pouvoir sauvegarder @@ -60,10 +65,10 @@ * * @since 3.2.0.4 * @author chatellier - * @version $Revision: 1.0 $ + * @version $Revision$ * - * Last update : $Date: 28 janv. 2009 $ - * By : $Author: chatellier $ + * Last update : $Date$ + * By : $Author$ */ public class SimulationMonitor extends Thread { @@ -458,6 +463,9 @@ // post manage this storage exportResult(job, simulation); + + // sensitivity calculator analyze result call + analyzeSensitivityResult(job, simulation); } } catch (RemoteException e) { if (log.isErrorEnabled()) { @@ -470,7 +478,6 @@ simulationStop(job); service.fireStopEvent(job); } - } /** @@ -558,6 +565,68 @@ } /** + * For each finished simulation, check that all sensitivity + * simulation are available (in case of sensitivity simulation only). + * + * @param job job + * @param simulation simulation + */ + protected void analyzeSensitivityResult(SimulationJob job, + SimulationStorage simulation) { + + SimulationParameter params = simulation.getParameter(); + + int numberOfSimulation = params.getNumberOfSensitivitySimulation(); + SensitivityCalculator sensitivityCalculator = params.getSensitivityCalculator(); + if (numberOfSimulation > 0 && params.getSensitivityCalculator() != null) { + // this is a sensitivity simulation + String simulationId = job.getId(); + String simulationCommonPrefix = simulationId.substring(0, simulationId.lastIndexOf("_")); + + // simulation start at 0 + List<SimulationStorage> simulationStorageForAnalyze = new ArrayList<SimulationStorage>(); + for (int simulationIndex = 0; simulationIndex < numberOfSimulation ; ++simulationIndex) { + String currentId = simulationCommonPrefix + "_" + simulationIndex; + if (SimulationStorage.localyExists(currentId)) { + SimulationControl currentSimulationControl = new SimulationControl(currentId); + SimulationStorage.readControl(currentId, currentSimulationControl); + + // condiftion for simulation "end" + if (currentSimulationControl.getProgress() > 0 + && currentSimulationControl.getProgress() >= currentSimulationControl.getProgressMax()) { + SimulationStorage storage = SimulationStorage.getSimulation(currentId); + simulationStorageForAnalyze.add(storage); + } + else { + // no need to continue + // if only miss one, break + break; + } + } + } + + // si on a toutes les simulation est qu'elles sont finie + // on construit la liste des simulation storage + // et on l'envoie au script d'analyse de sensibilite + if (simulationStorageForAnalyze.size() == numberOfSimulation) { + if (log.isDebugEnabled()) { + log.debug("Call analyzeResult on sensitivity script " + sensitivityCalculator.getClass().getSimpleName()); + } + try { + // FIXME sensitivityScenarios are not available here :( + SensitivityScenarios sensitivityScenarios = new SensitivityScenarios(); + sensitivityCalculator.analyzeResult(sensitivityScenarios, simulationStorageForAnalyze); + } + catch(SensitivityException e) { + if (log.isErrorEnabled()) { + log.error("Can't call analyse result", e); + } + } + } + } + } + + /** * Convertit une collection de string, en une chaine * séparée par des ",". * Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java ___________________________________________________________________ Name: svn:keywords + Revision Date Author Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-03-11 11:26:00 UTC (rev 1936) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-03-11 11:29:21 UTC (rev 1937) @@ -53,12 +53,10 @@ import org.codelutin.util.ListenerSet; import org.codelutin.util.ObjectUtil; import org.codelutin.util.ZipUtil; -import org.h2.jdbc.JdbcSQLException; import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.datastore.AnalysePlanStorage; -import fr.ifremer.isisfish.datastore.DataStorage; import fr.ifremer.isisfish.datastore.ExportStorage; import fr.ifremer.isisfish.datastore.RegionStorage; import fr.ifremer.isisfish.datastore.RuleStorage; Modified: isis-fish/trunk/src/test/java/fr/ifremer/TestUtils.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/TestUtils.java 2009-03-11 11:26:00 UTC (rev 1936) +++ isis-fish/trunk/src/test/java/fr/ifremer/TestUtils.java 2009-03-11 11:29:21 UTC (rev 1937) @@ -1,3 +1,21 @@ +/* *##% + * Copyright (C) 2009 Code Lutin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + package fr.ifremer; import java.io.File; @@ -16,6 +34,10 @@ * Une classe pour avoir des choses utiles pour tous les tests d'isis * * @author chemit + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ */ public abstract class TestUtils { @@ -32,7 +54,7 @@ base = new File("").getAbsolutePath(); } basedir = new File(base); - System.out.println("basedir for test " + basedir); + //System.out.println("basedir for test " + basedir); } return basedir; } @@ -40,7 +62,7 @@ public static File getTargetdir() { if (targetdir == null) { targetdir = new File(getBasedir(), "target"); - System.out.println("targetdir for test " + targetdir); + //System.out.println("targetdir for test " + targetdir); } return targetdir; } Property changes on: isis-fish/trunk/src/test/java/fr/ifremer/TestUtils.java ___________________________________________________________________ Name: svn:keywords + Revision Date Author Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java 2009-03-11 11:26:00 UTC (rev 1936) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java 2009-03-11 11:29:21 UTC (rev 1937) @@ -153,5 +153,3 @@ } } } - -

1 0

r1936 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain
by chatellier＠users.labs.libre-entreprise.org 11 Mar '09

11 Mar '09

Author: chatellier Date: 2009-03-11 11:26:00 +0000 (Wed, 11 Mar 2009) New Revision: 1936 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java Log: Update domains (visitors...) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2009-03-11 11:13:55 UTC (rev 1935) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2009-03-11 11:26:00 UTC (rev 1936) @@ -29,14 +29,14 @@ * Domaine continu. * * Composé d'un borne min et max. + * + * @param <E> type des valeurs gérées par le domaine * - * @param <E> - * type des valeurs gérées par le domaine - * * @author chatellier * @version $Revision: 1.0 $ * - * Last update : $Date: 24 févr. 2009 $ By : $Author: chatellier $ + * Last update : $Date: 24 févr. 2009 $ + * By : $Author: chatellier $ */ public class ContinuousDomain<E extends Serializable> implements Domain<E> { @@ -62,33 +62,16 @@ /** * Constructor with bounds. * - * @param minBound - * min bound - * @param maxBound - * max bound + * @param minBound min bound + * @param maxBound max bound */ public ContinuousDomain(E minBound, E maxBound) { this(); this.minBound = minBound; this.maxBound = maxBound; } - + /** - * Constructor with bounds and cardinality. - * - * @param minBound - * min bound - * @param maxBound - * max bound - */ - public ContinuousDomain(E minBound, E maxBound, int cardinality) { - this(); - this.minBound = minBound; - this.maxBound = maxBound; - this.cardinality = cardinality; - } - - /** * @return the minBound */ public E getMinBound() { @@ -96,8 +79,7 @@ } /** - * @param minBound - * the minBound to set + * @param minBound the minBound to set */ public void setMinBound(E minBound) { this.minBound = minBound; @@ -111,8 +93,7 @@ } /** - * @param maxBound - * the maxBound to set + * @param maxBound the maxBound to set */ public void setMaxBound(E maxBound) { this.maxBound = maxBound; @@ -125,7 +106,7 @@ */ public E getValueForIdentifier(Serializable identifier) { // FIXME test cast - return (E) identifier; + return (E)identifier; } /** @@ -135,24 +116,9 @@ */ public void accept(DomainVisitor visitor) { visitor.start(this); - visitor.visit(this, "min", minBound); - visitor.visit(this, "max", maxBound); visitor.end(this); } - /* - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - - ToStringBuilder builder = new ToStringBuilder(this); - builder.append(minBound); - builder.append(minBound); - - return builder.toString(); - } - /** * Get cardinality * Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java 2009-03-11 11:13:55 UTC (rev 1935) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java 2009-03-11 11:26:00 UTC (rev 1936) @@ -23,8 +23,6 @@ import java.util.SortedMap; import java.util.TreeMap; -import org.apache.commons.lang.builder.ToStringBuilder; - import fr.ifremer.isisfish.simulator.sensitivity.Domain; import fr.ifremer.isisfish.simulator.sensitivity.visitor.DomainVisitor; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java 2009-03-11 11:13:55 UTC (rev 1935) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java 2009-03-11 11:26:00 UTC (rev 1936) @@ -20,6 +20,8 @@ import java.io.Serializable; +import fr.ifremer.isisfish.simulator.sensitivity.visitor.DomainVisitor; + /** * Domaine continu portant sur variable pouvant prendre diférente * valeur par rapport à une valeur initiale.

1 0

r1935 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui: sensitivity simulator
by sletellier＠users.labs.libre-entreprise.org 11 Mar '09

11 Mar '09

Author: sletellier Date: 2009-03-11 11:13:55 +0000 (Wed, 11 Mar 2009) New Revision: 1935 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java Log: Factor modification is working Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java 2009-03-11 11:01:09 UTC (rev 1934) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java 2009-03-11 11:13:55 UTC (rev 1935) @@ -29,16 +29,16 @@ * @author letellier */ public class FactorAction { - public static void saveContinue(JComponent cOrigine, String name, String path, JComponent min, JComponent max, String increment, SimulAction action){ + public static void saveContinue(JComponent cOrigine, String name, String path, JComponent min, JComponent max, String increment, SimulAction action, boolean exist){ Serializable oMin = (Serializable)EditorHelper.getValue(min); Serializable oMax = (Serializable)EditorHelper.getValue(max); - action.addContinueFactors(name, path, oMin, oMax, Integer.parseInt(increment), cOrigine); + action.addContinueFactors(name, path, oMin, oMax, Integer.parseInt(increment), cOrigine, exist); } - public static void saveDiscret(JComponent cOrigine, String name, String path, List<JComponent> components, SimulAction action){ + public static void saveDiscret(JComponent cOrigine, String name, String path, List<JComponent> components, SimulAction action, boolean exist){ List<Serializable> values = new ArrayList<Serializable>(); for(JComponent c: components){ values.add((Serializable)EditorHelper.getValue(c)); } - action.addDiscreteFactors(name, path, values, cOrigine); + action.addDiscreteFactors(name, path, values, cOrigine, exist); } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx 2009-03-11 11:01:09 UTC (rev 1934) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx 2009-03-11 11:13:55 UTC (rev 1935) @@ -168,9 +168,9 @@ } protected void save(){ if (continueRadion.isSelected()){ - getFactorAction().saveContinue(cOrigine, factorName.getText(), path, continueMin, continueMax, increment.getText(), getSimulAction()); + getFactorAction().saveContinue(cOrigine, factorName.getText(), path, continueMin, continueMax, increment.getText(), getSimulAction(), isExistingValue()); } else { - getFactorAction().saveDiscret(cOrigine, factorName.getText(), path, discretComponents, getSimulAction()); + getFactorAction().saveDiscret(cOrigine, factorName.getText(), path, discretComponents, getSimulAction(), isExistingValue()); } getContextValue(InputSaveVerifier.class).getSensPanel().setFactorModel(); this.dispose(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2009-03-11 11:01:09 UTC (rev 1934) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2009-03-11 11:13:55 UTC (rev 1935) @@ -104,7 +104,7 @@ if (Factor.class.isInstance(o)){ Factor f = (Factor)o; FactorWizard wizard = new FactorWizard(this); - wizard.initExisting(getSimulAction().getFactorComponant(f.getPath()), f); + wizard.initExisting(getSimulAction().getFactorComponent(f.getPath()), f); wizard.pack(); wizard.setVisible(true); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-03-11 11:01:09 UTC (rev 1934) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-03-11 11:13:55 UTC (rev 1935) @@ -104,7 +104,7 @@ protected String simulName = null; protected SensitivityStorage sensitivityStorage = null; protected Map<String, Factor<? extends Serializable>> factors = new HashMap<String, Factor<? extends Serializable>>(); - protected Map<String, JComponent> factorComponant = new HashMap<String, JComponent>(); + protected Map<String, JComponent> factorComponent = new HashMap<String, JComponent>(); /* ************ * Init @@ -622,12 +622,12 @@ } public void addFactor(String path, Factor f, JComponent c){ factors.put(path, f); - factorComponant.put(path, c); + factorComponent.put(path, c); } public Factor<? extends Serializable> getFactor(String name){ return factors.get(name); } - public void addContinueFactors(String name, String path, Serializable min, Serializable max, int inc, JComponent c){ + public void addContinueFactors(String name, String path, Serializable min, Serializable max, int inc, JComponent c, boolean exist){ Factor f = new Factor(name); ContinuousDomain<Serializable> domain = new ContinuousDomain<Serializable>(); domain.setMinBound(min); @@ -635,9 +635,11 @@ domain.setCardinality(inc); f.setDomain(domain); f.setPath(path); + if (exist) + removeFactor(path); addFactor(path, f, c); } - public void addDiscreteFactors(String name, String path, List<Serializable> values, JComponent c){ + public void addDiscreteFactors(String name, String path, List<Serializable> values, JComponent c, boolean exist){ Factor f = new Factor(name); DiscreteDomain<Serializable> domain = new DiscreteDomain<Serializable>(); int i = 0; @@ -647,14 +649,16 @@ } f.setDomain(domain); f.setPath(path); + if (exist) + removeFactor(path); addFactor(path, f, c); } - public JComponent getFactorComponant(String path){ - return factorComponant.get(path); + public JComponent getFactorComponent(String path){ + return factorComponent.get(path); } public void removeFactor(String path){ factors.remove(path); - factorComponant.remove(path); + factorComponent.remove(path); } /*

1 0