Author: echatellier Date: 2014-03-19 17:59:03 +0100 (Wed, 19 Mar 2014) New Revision: 3899 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3899 Log: Make newInstance generic Added: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/Objective.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/Optimisation.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/OptimisationContext.java Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/JavaSourceStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultDatabaseStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultMappedStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageInMemory.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityAnalysisStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationPlanStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportNameListRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleNamesListRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisComboRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanComboRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooserHandler.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/SimulatorStorageTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityAnalysisTest.java Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java 2014-03-19 16:05:54 UTC (rev 3898) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java 2014-03-19 16:59:03 UTC (rev 3899) @@ -36,7 +36,6 @@ import org.apache.commons.logging.LogFactory; import fr.ifremer.isisfish.IsisFish; -import fr.ifremer.isisfish.IsisFishException; import fr.ifremer.isisfish.export.Export; import fr.ifremer.isisfish.util.Doc; import fr.ifremer.isisfish.util.Docable; @@ -101,17 +100,6 @@ } /** - * Retourne une nouvelle instance de la regle. Compile le fichier si besoin - * - * @return une nouvelle instance de la classe d'export - * @throws IsisFishException - */ - public Export getNewExportInstance() throws IsisFishException { - Object result = getNewInstance(); - return (Export) result; - } - - /** * Retourne le storage pour l'export demandée * * @param name le nom de l'export souhaitée @@ -175,7 +163,7 @@ public String getDescription() { String result = null; try { - Export export = getNewExportInstance(); + Export export = getNewInstance(); if (export != null) { result = export.getDescription(); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/JavaSourceStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/JavaSourceStorage.java 2014-03-19 16:05:54 UTC (rev 3898) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/JavaSourceStorage.java 2014-03-19 16:59:03 UTC (rev 3899) @@ -148,13 +148,10 @@ * @return la class * @throws IsisFishException */ - public Class<?> getCodeClass() throws IsisFishException { + public <E> Class<E> getCodeClass() throws IsisFishException { String fqn = getFQN(); - // Class result = CompileHelper.loadClass(fqn); - // if (result == null) { compile(false, null); - Class<?> result = CompileHelper.loadClass(fqn); - // } + Class<E> result = (Class<E>)CompileHelper.loadClass(fqn); if (result == null) { throw new IsisFishException(_("isisfish.error.load.class", fqn)); } @@ -167,9 +164,9 @@ * @return une nouvelle instance de la class * @throws IsisFishException if can't make new instance */ - public Object getNewInstance() throws IsisFishException { - Class<?> clazz = getCodeClass(); - Object result; + public <E> E getNewInstance() throws IsisFishException { + Class<E> clazz = getCodeClass(); + E result; try { result = clazz.newInstance(); } catch (InstantiationException eee) { Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultDatabaseStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultDatabaseStorage.java 2014-03-19 16:05:54 UTC (rev 3898) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultDatabaseStorage.java 2014-03-19 16:59:03 UTC (rev 3899) @@ -256,7 +256,7 @@ for (String exportName : exportNames) { ExportStorage storage = ExportStorage.getExport(exportName); try { - Export export = storage.getNewExportInstance(); + Export export = storage.getNewInstance(); for (String resultName : export.getNecessaryResult()) { enabledResult.add(resultName); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultMappedStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultMappedStorage.java 2014-03-19 16:05:54 UTC (rev 3898) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultMappedStorage.java 2014-03-19 16:59:03 UTC (rev 3899) @@ -610,7 +610,7 @@ for (String exportName : exportNames) { ExportStorage storage = ExportStorage.getExport(exportName); try { - Export export = storage.getNewExportInstance(); + Export export = storage.getNewInstance(); for (String resultName : export.getNecessaryResult()) { enabledResult.add(resultName); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageInMemory.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageInMemory.java 2014-03-19 16:05:54 UTC (rev 3898) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageInMemory.java 2014-03-19 16:59:03 UTC (rev 3899) @@ -141,7 +141,7 @@ for (String exportName : exportNames) { ExportStorage storage = ExportStorage.getExport(exportName); try { - Export export = storage.getNewExportInstance(); + Export export = storage.getNewInstance(); for (String resultName : export.getNecessaryResult()) { enabledResult.add(resultName); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java 2014-03-19 16:05:54 UTC (rev 3898) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java 2014-03-19 16:59:03 UTC (rev 3899) @@ -155,16 +155,6 @@ return storage; } - /** - * Retourne une nouvelle instance de la regle. Compile le fichier si besoin - * - * @return a new rule instance - * @throws IsisFishException if any exception while instanciation - */ - public Rule getNewRuleInstance() throws IsisFishException { - Object result = getNewInstance(); - return (Rule) result; - } static public void checkout() throws VCSException { checkout(IsisFish.config.getDatabaseDirectory(), RULE_PATH); @@ -218,7 +208,7 @@ public String getDescription() { String result = null; try { - Rule rule = getNewRuleInstance(); + Rule rule = getNewInstance(); result = rule == null ? null : rule.getDescription(); } catch (Exception e) { log.warn(_("isisfish.error.not.found.description",this)); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java 2014-03-19 16:05:54 UTC (rev 3898) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java 2014-03-19 16:59:03 UTC (rev 3899) @@ -89,16 +89,6 @@ result.mkdirs(); return result; } - - /** - * Retourne une nouvelle instance de la regle. Compile le fichier si besoin - * - * @return une nouvelle instance - * @throws IsisFishException - */ - public Object getNewScriptInstance() throws IsisFishException { - return getNewInstance(); - } /** * Retourne le storage pour la regle demandée Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityAnalysisStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityAnalysisStorage.java 2014-03-19 16:05:54 UTC (rev 3898) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityAnalysisStorage.java 2014-03-19 16:59:03 UTC (rev 3899) @@ -36,7 +36,6 @@ import org.apache.commons.logging.LogFactory; import fr.ifremer.isisfish.IsisFish; -import fr.ifremer.isisfish.IsisFishException; import fr.ifremer.isisfish.simulator.sensitivity.SensitivityAnalysis; import fr.ifremer.isisfish.util.Doc; import fr.ifremer.isisfish.util.Docable; @@ -152,17 +151,6 @@ } /** - * Retourne une nouvelle instance du calculateur. Compile le fichier si besoin - * - * @return retourne une nouvelle instance du calculateur - * @throws IsisFishException s'il y a un problème d'instanciation - */ - public SensitivityAnalysis getNewSensitivityAnalysisInstance() throws IsisFishException { - Object result = getNewInstance(); - return (SensitivityAnalysis) result; - } - - /** * Effectue un chekout VCS sur le répertoire des calculateurs. * * @see VersionStorage#checkout(File, String) @@ -226,7 +214,7 @@ public String getDescription() { String result = null; try { - SensitivityAnalysis sensitivityAnalysis = getNewSensitivityAnalysisInstance(); + SensitivityAnalysis sensitivityAnalysis = getNewInstance(); result = sensitivityAnalysis == null ? null : sensitivityAnalysis.getDescription(); } catch (Exception e) { log.warn(_("isisfish.error.not.found.description", this)); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java 2014-03-19 16:05:54 UTC (rev 3898) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java 2014-03-19 16:59:03 UTC (rev 3899) @@ -93,17 +93,6 @@ } /** - * Retourne une nouvelle instance de l'export. Compile le fichier si besoin. - * - * @return une nouvelle instance de la classe d'export - * @throws IsisFishException - */ - public SensitivityExport getNewSensitivityExportInstance() throws IsisFishException { - Object result = getNewInstance(); - return (SensitivityExport) result; - } - - /** * Retourne le storage pour l'export demandé. * * @param name le nom de la export souhaitée Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationPlanStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationPlanStorage.java 2014-03-19 16:05:54 UTC (rev 3898) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationPlanStorage.java 2014-03-19 16:59:03 UTC (rev 3899) @@ -151,17 +151,6 @@ return storage; } - /** - * Retourne une nouvelle instance du plan. Compile le fichier si besoin - * - * @return retourne une nouvelle instance du plan - * @throws IsisFishException s'il y a un probleme d'instanciation - */ - public SimulationPlan getNewSimulationPlanInstance() throws IsisFishException { - Object result = getNewInstance(); - return (SimulationPlan) result; - } - static public void checkout() throws VCSException { checkout(IsisFish.config.getDatabaseDirectory(), SIMULATION_PLAN_PATH); } @@ -215,7 +204,7 @@ public String getDescription() { String result = null; try { - SimulationPlan simulationPlan = getNewSimulationPlanInstance(); + SimulationPlan simulationPlan = getNewInstance(); result = simulationPlan == null ? null : simulationPlan.getDescription(); } catch (Exception e) { log.warn(_("isisfish.error.not.found.description", this)); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java 2014-03-19 16:05:54 UTC (rev 3898) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java 2014-03-19 16:59:03 UTC (rev 3899) @@ -87,17 +87,6 @@ result.mkdirs(); return result; } - - /** - * Retourne une nouvelle instance du simulateur. Compile le fichier si besoin. - * - * @return new simulator instance - * @throws IsisFishException - */ - public Simulator getNewSimulatorInstance() throws IsisFishException { - Simulator result = (Simulator)getNewInstance(); - return result; - } /** * Retourne le storage pour le simulateur demandée. Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2014-03-19 16:05:54 UTC (rev 3898) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2014-03-19 16:59:03 UTC (rev 3899) @@ -451,7 +451,7 @@ for (Element ruleElement : ruleElements) { String name = ruleElement.attributeValue("name"); try { - Rule rule = RuleStorage.getRule(name).getNewRuleInstance(); + Rule rule = RuleStorage.getRule(name).getNewInstance(); // get properties Properties props = new Properties(); Added: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/Objective.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/Objective.java (rev 0) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/Objective.java 2014-03-19 16:59:03 UTC (rev 3899) @@ -0,0 +1,48 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2014 Ifremer, Code Lutin, Chatellier Eric + * %% + * 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 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 Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ +package fr.ifremer.isisfish.simulator; + +import java.util.List; + +import org.nuiton.math.matrix.MatrixND; + +/** + * Interface des fonctions d'objectifs. + * + * @author Eric Chatellier + * @since 4.3.0.0 + */ +public interface Objective { + + /** + * Effectue une evaluation entre les exports et les observations. + * + * @param context optimisation context + * @param exports exports + * @param observation observation + * @return double value + */ + double eval(OptimisationContext context, List<MatrixND> exports, List<MatrixND> observations); +} Property changes on: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/Objective.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/Optimisation.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/Optimisation.java (rev 0) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/Optimisation.java 2014-03-19 16:59:03 UTC (rev 3899) @@ -0,0 +1,49 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2014 Ifremer, Code Lutin, Chatellier Eric + * %% + * 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 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 Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ +package fr.ifremer.isisfish.simulator; + +import java.util.List; + +import fr.ifremer.isisfish.datastore.SimulationStorage; +import fr.ifremer.isisfish.entities.FisheryRegion; + +/** + * Script d'optimisation. + * + * @author Eric Chatellier + * @since 4.3.0.0 + */ +public interface Optimisation { + + /** + * Génère une nouvelle série de simulation suivant le context d'optimisation. + * + * @param context context + * @param region region + * @return simulations serie + */ + List<SimulationStorage> getNextGeneration(OptimisationContext context, FisheryRegion region); + +} Property changes on: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/Optimisation.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/OptimisationContext.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/OptimisationContext.java (rev 0) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/OptimisationContext.java 2014-03-19 16:59:03 UTC (rev 3899) @@ -0,0 +1,63 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2014 Ifremer, Code Lutin, Chatellier Eric + * %% + * 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 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 Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ +package fr.ifremer.isisfish.simulator; + +import java.util.List; + +import fr.ifremer.isisfish.datastore.SimulationStorage; +import fr.ifremer.isisfish.entities.FisheryRegion; + +/** + * Context utilisé pour gérer les différentes simulation lancées par un script d'optimisation. + * + * @author Eric Chatellier + * @since 4.3.0.0 + */ +public class OptimisationContext { + + public FisheryRegion copyRegion(FisheryRegion region) { + return null; + } + + public void createSimulation(FisheryRegion region) { + + } + + public int getCurrentGenerationNumber() { + return 0; + } + + public List<SimulationStorage> getLastGeneration() { + return null; + } + + public List<SimulationStorage> getGeneration(int n) { + return null; + } + + public int getGenerationNumber() { + return 0; + } +} Property changes on: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/OptimisationContext.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java 2014-03-19 16:05:54 UTC (rev 3898) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java 2014-03-19 16:59:03 UTC (rev 3899) @@ -123,7 +123,7 @@ for (String exportName : exportNames) { ExportStorage storage = ExportStorage.getExport(exportName); try { - Export export = storage.getNewExportInstance(); + Export export = storage.getNewInstance(); for (String resultName : export.getNecessaryResult()) { enabledResult.add(resultName); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java 2014-03-19 16:05:54 UTC (rev 3898) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java 2014-03-19 16:59:03 UTC (rev 3899) @@ -78,7 +78,7 @@ for (String exportName : parameters.getExportNames()) { try { ExportStorage storage = ExportStorage.getExport(exportName); - Export export = storage.getNewExportInstance(); + Export export = storage.getNewInstance(); allExports.add(export); } catch (IsisFishException e) { if (log.isErrorEnabled()) { Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java 2014-03-19 16:05:54 UTC (rev 3898) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java 2014-03-19 16:59:03 UTC (rev 3899) @@ -498,7 +498,7 @@ try { SimulationPlanStorage planStorage = SimulationPlanStorage.getSimulationPlan(name); if (planStorage != null) { // since 4.0.0.3 can return null - SimulationPlan plan = planStorage.getNewSimulationPlanInstance(); + SimulationPlan plan = planStorage.getNewInstance(); StorageHelper.populateStorageParams(planIndex++, getRegion().getStorage(), plan, propertiesParameters, "plan"); simulationPlans.add(plan); @@ -596,7 +596,7 @@ for (String name : ruleList) { if (name != null && !"".equals(name)) { try { - Rule rule = RuleStorage.getRule(name).getNewRuleInstance(); + Rule rule = RuleStorage.getRule(name).getNewInstance(); RuleHelper.populateRule(ruleIndex++, tx, rule, propertiesParameters); rules.add(rule); } catch (IsisFishException eee) { @@ -762,7 +762,7 @@ if (!StringUtils.isEmpty(analysisName)) { try { SensitivityAnalysisStorage sensitivityStorage = SensitivityAnalysisStorage.getSensitivityAnalysis(analysisName); - sensitivityAnalysis = sensitivityStorage.getNewSensitivityAnalysisInstance(); + sensitivityAnalysis = sensitivityStorage.getNewInstance(); // 0 = only single sensitivity StorageHelper.populateStorageParams(0, getRegion().getStorage(), sensitivityAnalysis, propertiesParameters, "sensitivity"); @@ -819,7 +819,7 @@ if (!StringUtils.isEmpty(name)) { SensitivityExport sensitivityExport = SensitivityExportStorage .getSensitivityExport(name) - .getNewSensitivityExportInstance(); + .getNewInstance(); ExportHelper.populateSensitivityExport( sensitivityExportIndex++, tx, sensitivityExport, Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2014-03-19 16:05:54 UTC (rev 3898) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2014-03-19 16:59:03 UTC (rev 3899) @@ -368,7 +368,7 @@ String simulatorName = parameters.getSimulatorName(); SimulatorStorage simulator = SimulatorStorage .getSimulator(simulatorName); - Simulator simulatorObject = simulator.getNewSimulatorInstance(); + Simulator simulatorObject = simulator.getNewInstance(); // on se met listener sur tc pour connaitre tous les nouveaux objets ObjectCreationListener objectCreationListener = new ObjectCreationListener(); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportNameListRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportNameListRenderer.java 2014-03-19 16:05:54 UTC (rev 3898) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportNameListRenderer.java 2014-03-19 16:59:03 UTC (rev 3899) @@ -84,7 +84,7 @@ Export export = exportCache.get(exportName); if (export == null) { ExportStorage storage = ExportStorage.getExport(exportName); - export = storage.getNewExportInstance(); + export = storage.getNewInstance(); exportCache.put(exportName, export); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleNamesListRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleNamesListRenderer.java 2014-03-19 16:05:54 UTC (rev 3898) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleNamesListRenderer.java 2014-03-19 16:59:03 UTC (rev 3899) @@ -83,7 +83,7 @@ Rule rule = ruleCache.get(ruleName); if (rule == null) { RuleStorage storage = RuleStorage.getRule(ruleName); - rule = storage.getNewRuleInstance(); + rule = storage.getNewInstance(); ruleCache.put(ruleName, rule); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisComboRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisComboRenderer.java 2014-03-19 16:05:54 UTC (rev 3898) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisComboRenderer.java 2014-03-19 16:59:03 UTC (rev 3899) @@ -85,7 +85,7 @@ if (plan == null) { SensitivityAnalysisStorage storage = SensitivityAnalysisStorage .getSensitivityAnalysis(sensitivityName); - plan = storage.getNewSensitivityAnalysisInstance(); + plan = storage.getNewInstance(); sensitivityAnalysisCache.put(sensitivityName, plan); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListRenderer.java 2014-03-19 16:05:54 UTC (rev 3898) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListRenderer.java 2014-03-19 16:59:03 UTC (rev 3899) @@ -84,7 +84,7 @@ SensitivityExport export = sensitivityExportCache.get(exportName); if (export == null) { SensitivityExportStorage storage = SensitivityExportStorage.getSensitivityExport(exportName); - export = storage.getNewSensitivityExportInstance(); + export = storage.getNewInstance(); sensitivityExportCache.put(exportName, export); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanComboRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanComboRenderer.java 2014-03-19 16:05:54 UTC (rev 3898) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanComboRenderer.java 2014-03-19 16:59:03 UTC (rev 3899) @@ -85,7 +85,7 @@ if (plan == null) { SimulationPlanStorage storage = SimulationPlanStorage .getSimulationPlan(simulationPlanName); - plan = storage.getNewSimulationPlanInstance(); + plan = storage.getNewInstance(); simulationPlanCache.put(simulationPlanName, plan); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java 2014-03-19 16:05:54 UTC (rev 3898) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java 2014-03-19 16:59:03 UTC (rev 3899) @@ -250,7 +250,7 @@ try { out = new BufferedWriter(new FileWriter(file)); ExportStorage storage = ExportStorage.getExport(exportName); - Export export = storage.getNewExportInstance(); + Export export = storage.getNewInstance(); export.export(simulationStorage, out); } finally { Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooserHandler.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooserHandler.java 2014-03-19 16:05:54 UTC (rev 3898) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooserHandler.java 2014-03-19 16:59:03 UTC (rev 3899) @@ -57,7 +57,7 @@ String availableRuleName = (String)availableRuleValue; try { RuleStorage ruleStorage = RuleStorage.getRule(availableRuleName); - Rule ruleTmp = ruleStorage.getNewRuleInstance(); + Rule ruleTmp = ruleStorage.getNewInstance(); // add it after autoconfiguration (if enabled) ruleTmp = (Rule)ScriptParameterDialog.displayConfigurationFrame(ruleChooser, ruleTmp); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2014-03-19 16:05:54 UTC (rev 3898) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2014-03-19 16:59:03 UTC (rev 3899) @@ -637,7 +637,7 @@ public void addSimulationPlan(SensUI sensUI, String name) { try { - SimulationPlan sp = SimulationPlanStorage.getSimulationPlan(name).getNewSimulationPlanInstance(); + SimulationPlan sp = SimulationPlanStorage.getSimulationPlan(name).getNewInstance(); // add it after autoconfiguration (if enabled) sp = (SimulationPlan)ScriptParameterDialog.displayConfigurationFrame(sensUI, sp); @@ -710,7 +710,7 @@ public void addSensitivityExport(SensitivityChooserUI sensitivityChooserUI, String name) { try { SensitivityExportStorage storage = SensitivityExportStorage.getSensitivityExport(name); - SensitivityExport sensitivityExport = storage.getNewSensitivityExportInstance(); + SensitivityExport sensitivityExport = storage.getNewInstance(); // add it after autoconfiguration (if enabled) sensitivityExport = (SensitivityExport)ScriptParameterDialog.displayConfigurationFrame(sensitivityChooserUI, sensitivityExport); @@ -803,8 +803,7 @@ SensitivityAnalysis sensitivityAnalysis = null; try { sensitivityStorage = SensitivityAnalysisStorage.getSensitivityAnalysis(name); - sensitivityAnalysis = sensitivityStorage - .getNewSensitivityAnalysisInstance(); + sensitivityAnalysis = sensitivityStorage.getNewInstance(); } catch (IsisFishException e) { if (log.isErrorEnabled()) { log.error("Can't set sensitivity analysis", e); Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/SimulatorStorageTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/SimulatorStorageTest.java 2014-03-19 16:05:54 UTC (rev 3898) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/SimulatorStorageTest.java 2014-03-19 16:59:03 UTC (rev 3899) @@ -125,7 +125,7 @@ } SimulatorStorage simulatorStorage = SimulatorStorage.getSimulator("DefaultSimulator"); - Simulator simulator = simulatorStorage.getNewSimulatorInstance(); + Simulator simulator = simulatorStorage.getNewInstance(); Assert.assertNotNull(simulator); Assert.assertTrue(f.exists()); } Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2014-03-19 16:05:54 UTC (rev 3898) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2014-03-19 16:59:03 UTC (rev 3899) @@ -122,13 +122,13 @@ matrix1.setValue(new int[] { 2, 1 }, -1); // rule 1, species = c'est une des especes de la base BaseMotosICA - Rule ruleTacPoids = RuleStorage.getRule("TACpoids").getNewRuleInstance(); + Rule ruleTacPoids = RuleStorage.getRule("TACpoids").getNewInstance(); Properties props = new Properties(); props.setProperty("rule.0.parameter.species", "fr.ifremer.isisfish.entities.Species#1169028645830#0.022262364425031378"); RuleHelper.populateRule(0, regionContext, ruleTacPoids, props); // rule 2, species = c'est une des especes de la base BaseMotosICA - Rule ruleTailleMin = RuleStorage.getRule("TailleMin").getNewRuleInstance(); + Rule ruleTailleMin = RuleStorage.getRule("TailleMin").getNewInstance(); props = new Properties(); props.setProperty("rule.0.parameter.species", "fr.ifremer.isisfish.entities.Species#1169028645830#0.022262364425031378"); props.setProperty("rule.0.parameter.propSurvie", "42"); Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2014-03-19 16:05:54 UTC (rev 3898) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2014-03-19 16:59:03 UTC (rev 3899) @@ -380,11 +380,11 @@ factorPop.setValue(mat); // factor rule, species = c'est une des especes de la base BaseMotosICA - Rule ruleTacPoids = RuleStorage.getRule("TACpoids").getNewRuleInstance(); + Rule ruleTacPoids = RuleStorage.getRule("TACpoids").getNewInstance(); Properties props = new Properties(); props.setProperty("rule.0.parameter.species", "fr.ifremer.isisfish.entities.Species#1169028645830#0.022262364425031378"); RuleHelper.populateRule(0, regionContext, ruleTacPoids, props); - Rule ruleTailleMin = RuleStorage.getRule("TailleMin").getNewRuleInstance(); + Rule ruleTailleMin = RuleStorage.getRule("TailleMin").getNewInstance(); props = new Properties(); props.setProperty("rule.0.parameter.species", "fr.ifremer.isisfish.entities.Species#1169028645830#0.022262364425031378"); props.setProperty("rule.0.parameter.propSurvie", "42"); Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityAnalysisTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityAnalysisTest.java 2014-03-19 16:05:54 UTC (rev 3898) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityAnalysisTest.java 2014-03-19 16:59:03 UTC (rev 3899) @@ -210,7 +210,7 @@ */ @Test public void testMorris() throws IsisFishException, SensitivityException { - SensitivityAnalysis script = SensitivityAnalysisStorage.getSensitivityAnalysis("Morris").getNewSensitivityAnalysisInstance(); + SensitivityAnalysis script = SensitivityAnalysisStorage.getSensitivityAnalysis("Morris").getNewInstance(); Assert.assertNotNull("Morris script not found in test data", script); // uniform min/max @@ -268,7 +268,7 @@ @Test @Ignore public void testDOptimal() throws IsisFishException, SensitivityException { - SensitivityAnalysis script = SensitivityAnalysisStorage.getSensitivityAnalysis("DOptimal").getNewSensitivityAnalysisInstance(); + SensitivityAnalysis script = SensitivityAnalysisStorage.getSensitivityAnalysis("DOptimal").getNewInstance(); Assert.assertNotNull("DOptimal script not found in test data", script); DesignPlan designPlan = getDesignPlan(getContinuousDoubleUniformMMFactor(), getContinuousDoubleUniformMMFactor()); @@ -294,7 +294,7 @@ */ @Test public void testFast() throws IsisFishException, SensitivityException { - SensitivityAnalysis script = SensitivityAnalysisStorage.getSensitivityAnalysis("Fast").getNewSensitivityAnalysisInstance(); + SensitivityAnalysis script = SensitivityAnalysisStorage.getSensitivityAnalysis("Fast").getNewInstance(); Assert.assertNotNull("Fast script not found in test data", script); // uniform min/max @@ -334,7 +334,7 @@ */ @Test public void testOptimumLHS() throws IsisFishException, SensitivityException { - SensitivityAnalysis script = SensitivityAnalysisStorage.getSensitivityAnalysis("OptimumLHS").getNewSensitivityAnalysisInstance(); + SensitivityAnalysis script = SensitivityAnalysisStorage.getSensitivityAnalysis("OptimumLHS").getNewInstance(); Assert.assertNotNull("OptimumLHS script not found in test data", script); // uniform min/max @@ -373,7 +373,7 @@ */ @Test public void testRandomLHS() throws IsisFishException, SensitivityException { - SensitivityAnalysis script = SensitivityAnalysisStorage.getSensitivityAnalysis("RandomLHS").getNewSensitivityAnalysisInstance(); + SensitivityAnalysis script = SensitivityAnalysisStorage.getSensitivityAnalysis("RandomLHS").getNewInstance(); Assert.assertNotNull("RandomLHS script not found in test data", script); // uniform min/max @@ -415,7 +415,7 @@ @Test @Ignore public void testRegularExpandGrid() throws IsisFishException, SensitivityException { - SensitivityAnalysis script = SensitivityAnalysisStorage.getSensitivityAnalysis("RegularExpandGrid").getNewSensitivityAnalysisInstance(); + SensitivityAnalysis script = SensitivityAnalysisStorage.getSensitivityAnalysis("RegularExpandGrid").getNewInstance(); Assert.assertNotNull("RegularExpandGrid script not found in test data", script); DesignPlan designPlan = getDesignPlan(getContinuousDoubleUniformMMFactor(), getContinuousDoubleUniformMMFactor()); @@ -441,7 +441,7 @@ */ @Test public void testRegularFractions() throws IsisFishException, SensitivityException { - SensitivityAnalysis script = SensitivityAnalysisStorage.getSensitivityAnalysis("RegularFractions").getNewSensitivityAnalysisInstance(); + SensitivityAnalysis script = SensitivityAnalysisStorage.getSensitivityAnalysis("RegularFractions").getNewInstance(); // this script need pathToFunction parameter to find R script in current directory SensitivityAnalysisStorage.setParameterValue(script,"pathToFunction", IsisFish.config.getDatabaseDirectory().getAbsolutePath() + File.separator + "sensitivityanalysis"); @@ -462,7 +462,7 @@ */ @Test public void testSobol() throws IsisFishException, SensitivityException { - SensitivityAnalysis script = SensitivityAnalysisStorage.getSensitivityAnalysis("Sobol").getNewSensitivityAnalysisInstance(); + SensitivityAnalysis script = SensitivityAnalysisStorage.getSensitivityAnalysis("Sobol").getNewInstance(); Assert.assertNotNull("Sobol script not found in test data", script); // sobol avec uniform MM