October 2011 - Isis-fish-commits - mailman.cloud.codelutin.com

r3504 - trunk
by echatellier＠users.forge.codelutin.com 28 Oct '11

28 Oct '11

Author: echatellier Date: 2011-10-28 14:32:46 +0200 (Fri, 28 Oct 2011) New Revision: 3504 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3504 Log: Update hibernate Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-10-28 12:31:01 UTC (rev 3503) +++ trunk/pom.xml 2011-10-28 12:32:46 UTC (rev 3504) @@ -524,7 +524,7 @@ <jaxxVersion>2.4.2</jaxxVersion> <eugeneVersion>2.4.1</eugeneVersion> <topiaVersion>2.6.3</topiaVersion> - <hibernateVersion>3.6.7.Final</hibernateVersion> + <hibernateVersion>3.6.8.Final</hibernateVersion> <nuitonUtilsVersion>2.3</nuitonUtilsVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <nuitonWidgetsVersion>1.1.1</nuitonWidgetsVersion>

1 0

r3503 - trunk/src/main/java/fr/ifremer/isisfish/ui/script
by echatellier＠users.forge.codelutin.com 28 Oct '11

28 Oct '11

Author: echatellier Date: 2011-10-28 14:31:01 +0200 (Fri, 28 Oct 2011) New Revision: 3503 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3503 Log: Create new scripts in community repository Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptTypesComboModel.java Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2011-10-28 12:30:42 UTC (rev 3502) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2011-10-28 12:31:01 UTC (rev 3503) @@ -286,31 +286,31 @@ //TODO do test on category CodeSourceStorage script = null; switch (scriptType) { - case Formule: + case CommunityFormule: script = FormuleStorage.createFormule(category, realFilename, Language.JAVA); break; - case SimulationPlan: + case CommunitySimulationPlan: script = SimulationPlanStorage.getSimulationPlan(fileName); break; - case Export: - script = ExportStorage.getExport(fileName); + case CommunityExport: + script = ExportStorage.getCommunityExport(fileName); break; - case Rule: - script = RuleStorage.getRule(fileName); + case CommunityRule: + script = RuleStorage.getCommunityRule(fileName); break; - case Script: - script = ScriptStorage.getScript(fileName); + case CommunityScript: + script = ScriptStorage.getCommunityScript(fileName); break; - case Simulator: - script = SimulatorStorage.getSimulator(fileName); + case CommunitySimulator: + script = SimulatorStorage.getCommunitySimulator(fileName); break; - case Sensitivity: - script = SensitivityAnalysisStorage.getSensitivityAnalysis(fileName); + case CommunitySensitivity: + script = SensitivityAnalysisStorage.getCommunitySensitivityAnalysis(fileName); break; - case SensitivityExport: + case CommunitySensitivityExport: script = SensitivityExportStorage - .getSensitivityExport(fileName); + .getCommunitySensitivityExport(fileName); break; default: if (log.isErrorEnabled()) { @@ -320,8 +320,7 @@ if (script.exists()) { // Message d'erreur si le fichier existe en local. - String message = _("isisfish.error.file.already.exists", - fileName); + String message = _("isisfish.error.file.already.exists", fileName); Exception e = new RuntimeException(message); returnError(_("isisfish.error.script.create", fileName, e .getMessage()), e); @@ -459,7 +458,7 @@ case CommunityRule: script = RuleStorage.getCommunityRule(file.getName()); break; - case CommunityAnalysePlan: + case CommunitySimulationPlan: script = SimulationPlanStorage.getCommunitySimulationPlan(file.getName()); break; case CommunityExport: @@ -1127,7 +1126,7 @@ CommunitySensitivityExport( SensitivityExportStorage.getCommunitySensitivityExportDirectory(), SensitivityExportStorage.SENSITIVITY_EXPORT_TEMPLATE), - CommunityAnalysePlan( + CommunitySimulationPlan( SimulationPlanStorage.getCommunitySimulationPlanDirectory(), SimulationPlanStorage.SIMULATION_PLAN_TEMPLATE), CommunitySimulator( Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptTypesComboModel.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptTypesComboModel.java 2011-10-28 12:30:42 UTC (rev 3502) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptTypesComboModel.java 2011-10-28 12:31:01 UTC (rev 3503) @@ -56,7 +56,7 @@ ScriptMapping[] values = ScriptMapping.values(); mappings = new ArrayList<ScriptMapping>(values.length); for (ScriptMapping mapping : values) { - if (mapping.isOfficialVCS()) { + if (!mapping.isOfficialVCS()) { mappings.add(mapping); } }

1 0

r3502 - trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity
by echatellier＠users.forge.codelutin.com 28 Oct '11

28 Oct '11

Author: echatellier Date: 2011-10-28 14:30:42 +0200 (Fri, 28 Oct 2011) New Revision: 3502 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3502 Log: Fix UI layout Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx 2011-10-28 12:19:03 UTC (rev 3501) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx 2011-10-28 12:30:42 UTC (rev 3502) @@ -216,13 +216,13 @@ <cell fill='both' weightx='1' weighty='1'> <Table> <row> - <cell fill="horizontal" weightx='1' columns="2"> + <cell fill="horizontal" columns="2"> <Table> <row> <cell> <JLabel text="isisfish.sensitivity.equation.variablename" enabled='{isSelectedDomain()}' /> </cell> - <cell fill="horizontal"> + <cell fill="horizontal" weightx='1'> <JTextField id="variableNameField" enabled='{isSelectedDomain()}'/> </cell> </row> @@ -230,13 +230,13 @@ </cell> </row> <row> - <cell fill="horizontal"> + <cell fill="horizontal" weightx='1'> <JRadioButton id="minMaxButton" text="isisfish.sensitivity.continuousminmaxtype" onActionPerformed="setPercentageTypeDomain(!minMaxButton.isSelected())" selected="{!isPercentageTypeDomain()}" enabled='{isSelectedDomain()}'/> </cell> - <cell fill="horizontal"> + <cell fill="horizontal" weightx='1'> <JRadioButton id="percentageTypeButton" text="isisfish.sensitivity.continuouspercentagetype" onActionPerformed="setPercentageTypeDomain(percentageTypeButton.isSelected())" selected="{isPercentageTypeDomain()}" @@ -244,7 +244,7 @@ </cell> </row> <row> - <cell fill="both" weightx='1' weighty='1' columns="2"> + <cell fill="both" weighty='1' columns="2"> <JPanel layout="{new CardLayout()}" id="hidablePanel"> <Table border='{BorderFactory.createTitledBorder("")}' constraints='"minMaxType"'> <row>

1 0

r3501 - trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity
by echatellier＠users.forge.codelutin.com 28 Oct '11

28 Oct '11

Author: echatellier Date: 2011-10-28 14:19:03 +0200 (Fri, 28 Oct 2011) New Revision: 3501 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3501 Log: Enable quation component for continuous factors Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx 2011-10-28 12:18:29 UTC (rev 3500) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx 2011-10-28 12:19:03 UTC (rev 3501) @@ -216,7 +216,7 @@ <cell fill='both' weightx='1' weighty='1'> <Table> <row> - <cell fill="horizontal" weightx='1'> + <cell fill="horizontal" weightx='1' columns="2"> <Table> <row> <cell> @@ -319,7 +319,7 @@ autoSaveModification="false" formule='{getFormule()}' text='{getText()}' bean='{getBean()}' clazz='{getClazz()}' beanProperty='{getBeanProperty()}' formuleCategory='{getFormuleCategory()}' selectedEquation='{getSelectedEquation()}' - visible='{isContinuePossible()}' /> + visible='{isContinuePossible()}' active="true" /> </cell> </row> </Table>

1 0

r3500 - trunk/src/main/java/fr/ifremer/isisfish/ui/input
by echatellier＠users.forge.codelutin.com 28 Oct '11

28 Oct '11

Author: echatellier Date: 2011-10-28 14:18:29 +0200 (Fri, 28 Oct 2011) New Revision: 3500 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3500 Log: Disable all field (except comment) Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2011-10-28 12:18:03 UTC (rev 3499) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2011-10-28 12:18:29 UTC (rev 3500) @@ -133,12 +133,6 @@ if (selectedPopulationGroup != null) { getSaveVerifier().addCurrentEntity(selectedPopulationGroup); setNaturalDeathRateMatrix(); - - // init number editor (not working on bindings) - /*fieldPopulationGroupReproductionRate.init(); - fieldPopulationGroupAge.init(); - fieldPopulationGroupMinLength.init(); - fieldPopulationGroupMaxLength.init();*/ } } ]]> @@ -158,11 +152,9 @@ <cell fill='horizontal' anchor='east'> <JLabel text="isisfish.populationGroup.naturalDeathRate" enabled='{getPopulationGroup() != null}'/> </cell> - <cell columns='2' fill='both' weightx='1.0' weighty='0.5'> + <cell columns='2' fill='both' weightx='1.0' weighty='1'> <org.nuiton.math.matrix.gui.MatrixPanelEditor id='fieldPopulationGroupNaturalDeathRate' - enabled='false' decorator='boxed' _sensitivityBean='{Population.class}' _sensitivityMethod='"NaturalDeathRateMatrix"' /> -  + enabled='false' decorator='boxed' /> </cell> </row> <row> @@ -171,8 +163,7 @@ </cell> <cell columns='2' fill='horizontal' weightx='1.0'> <JTextField id="fieldPopulationGroupMeanWeight" text='{String.valueOf(getPopulationGroup().getMeanWeight())}' - editable="false" - enabled='{getPopulationGroup() != null}' decorator='boxed'/> + enabled="false" decorator='boxed'/> </cell> </row> <row> @@ -181,8 +172,7 @@ </cell> <cell columns='2' fill='horizontal' weightx='1.0'> <JTextField id="fieldPopulationGroupMaturityOgive" text='{String.valueOf(getPopulationGroup().getMaturityOgive())}' - editable="false" - enabled='{getPopulationGroup() != null}' decorator='boxed'/> + enabled="false" decorator='boxed'/> </cell> </row> <row> @@ -191,8 +181,7 @@ </cell> <cell columns='2' fill='horizontal' weightx='1.0'> <JTextField id="fieldPopulationGroupReproductionRate" text='{String.valueOf(getPopulationGroup().getReproductionRate())}' - editable="false" - enabled='{getPopulationGroup() != null}' decorator='boxed'/> + enabled="false" decorator='boxed'/> </cell> </row> <row> @@ -201,8 +190,7 @@ </cell> <cell columns='2' fill='horizontal' weightx='1.0'> <JTextField id="fieldPopulationGroupPrice" text='{String.valueOf(getPopulationGroup().getPrice())}' - editable="false" - enabled='{getPopulationGroup() != null}' decorator='boxed'/> + enabled="false" decorator='boxed'/> </cell> </row> <row> @@ -212,9 +200,7 @@ <cell columns='2' fill='horizontal' weightx='1.0'>  <JTextField id="fieldPopulationGroupAge" text='{String.valueOf(getPopulationGroup().getAge())}' - onKeyReleased='getPopulationGroup().setAge(Double.parseDouble(fieldPopulationGroupAge.getText()))' - enabled='{getPopulationGroup().getPopulation().getSpecies().getAgeGroupType()}' - decorator='boxed' _sensitivityBean='{PopulationGroup.class}' _sensitivityMethod='"Age"'/> + enabled='false' decorator='boxed'/> </cell> </row> <row> @@ -225,22 +211,20 @@  <JTextField id="fieldPopulationGroupMinLength" text='{String.valueOf(getPopulationGroup().getMinLength())}' toolTipText="isisfish.populationGroup.minimumLength" - onKeyReleased='getPopulationGroup().setMinLength(Double.parseDouble(fieldPopulationGroupMinLength.getText()))' - enabled='{!getPopulationGroup().getPopulation().getSpecies().getAgeGroupType()}' decorator='boxed' _sensitivityBean='{PopulationGroup.class}' _sensitivityMethod='"MinLength"'/> + enabled='false' decorator='boxed' /> </cell> <cell fill='both' weightx='0.5'>  <JTextField id="fieldPopulationGroupMaxLength" text='{String.valueOf(getPopulationGroup().getMaxLength())}' toolTipText="isisfish.populationGroup.maximumLength" - onKeyReleased='getPopulationGroup().setMaxLength(Double.parseDouble(fieldPopulationGroupMaxLength.getText()))' - enabled='{!getPopulationGroup().getPopulation().getSpecies().getAgeGroupType()}' decorator='boxed' _sensitivityBean='{PopulationGroup.class}' _sensitivityMethod='"MaxLength"'/> + enabled='false' decorator='boxed'/> </cell> </row> <row> <cell fill='horizontal' anchor='east'> <JLabel text="isisfish.populationGroup.comments" enabled='{getPopulationGroup() != null}'/> </cell> - <cell columns='2' fill='both' weightx='1.0' weighty='0.5'> + <cell columns='2' fill='both' weightx='1.0' weighty='3'> <JScrollPane>  <JTextArea id="fieldPopulationGroupComment" text='{jaxx.runtime.SwingUtil.getStringValue(getPopulationGroup().getComment())}'

1 0

r3499 - in trunk/src/main/java/fr/ifremer/isisfish: entities equation ui/input
by echatellier＠users.forge.codelutin.com 28 Oct '11

28 Oct '11

Author: echatellier Date: 2011-10-28 14:18:03 +0200 (Fri, 28 Oct 2011) New Revision: 3499 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3499 Log: Compute capturability with equation (when used) Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationCapturabilityEquation.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2011-10-28 12:17:39 UTC (rev 3498) +++ trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2011-10-28 12:18:03 UTC (rev 3499) @@ -505,45 +505,6 @@ return result; } - // /* (non-Javadoc) - // * @see fr.ifremer.isisfish.entities.PopulationAbstract#addPopulationSeasonInfo(fr.ifremer.isisfish.entities.PopulationSeasonInfo) - // */ - // @Override - // public void addPopulationSeasonInfo(PopulationSeasonInfo populationSeasonInfo) { - // super.addPopulationSeasonInfo(populationSeasonInfo); - // changeCapturability(); - // } - // - // /* (non-Javadoc) - // * @see fr.ifremer.isisfish.entities.PopulationAbstract#addPopulationGroup(fr.ifremer.isisfish.entities.PopulationGroup) - // */ - // @Override - // public void addPopulationGroup(PopulationGroup populationGroup) { - // super.addPopulationGroup(populationGroup); - // changeCapturability(); - // } - - // protected void changeCapturability() { - // MatrixND mat = null; - // if (sizePopulationGroup() == 0 || sizePopulationSeasonInfo() == 0) { - // log.warn("Population doesn't have population group or population season info"); - // } else { - // List [] sems = new List[]{ - // getPopulationGroup(), - // getPopulationSeasonInfo(), - // }; - // mat = MatrixFactory.getInstance().create(_("isisfish.population.capturability"), sems, - // new String[]{_("isisfish.population.group"), _("isisfish.population.season")}); - // - // - // MatrixND oldMat = getCapturability(); - // if (oldMat != null) { - // mat.pasteSemantics(oldMat); - // } - // } - // setCapturability(mat); - // } - @Override public void setCapturability(MatrixND value) { List[] sems = value.getSemantics(); @@ -584,8 +545,9 @@ log.warn("Population doesn't have population group or population season info"); return null; } - List[] sems = new List[] { getPopulationGroup(), - getPopulationSeasonInfo(), }; + List<PopulationGroup> groups = getPopulationGroup(); + List<PopulationSeasonInfo> seasons = getPopulationSeasonInfo(); + List[] sems = new List[] {groups, seasons}; if (mat == null) { log.debug("Capturability is null, create new matrix"); mat = MatrixFactory.getInstance().create( @@ -623,6 +585,23 @@ // perhaps call setCapturability, but if possible wait the user // call setCapturability explicitly with this new matrix } + + // compute equation + if (isCapturabilityEquationUsed()) { + for (int g = 0; g < groups.size(); g++) { + PopulationGroup group = groups.get(g); + for (int s = 0; s < seasons.size(); s++) { + PopulationSeasonInfo season = seasons.get(s); + + Equation eq = getCapturabilityEquation(); + double capturability = eq.evaluate("pop", this, + "group", group, "season", season); + + mat.setValue(g, s, capturability); + } + } + } + return mat; } Modified: trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationCapturabilityEquation.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationCapturabilityEquation.java 2011-10-28 12:17:39 UTC (rev 3498) +++ trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationCapturabilityEquation.java 2011-10-28 12:18:03 UTC (rev 3499) @@ -25,8 +25,6 @@ package fr.ifremer.isisfish.equation; -import java.util.List; - import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.entities.PopulationGroup; import fr.ifremer.isisfish.entities.PopulationSeasonInfo; @@ -52,20 +50,20 @@ * * @param context simulation context * @param pop population pour lequel on souhaite la matrice de reproduction - * @param groups la liste des groups de la population - * @param seasons la liste des saison de la population + * @param group le group de la population + * @param season la saison de la population * * @return la valeur retournée n'est pas utilisée, par exemple 'return 0;' * convient. * @throws Exception */ - @Args({"context", "pop", "groups", "seasons"}) + @Args({"context", "pop", "group", "season"}) @ArgTypes({ "fr.ifremer.isisfish.simulator.SimulationContext", "fr.ifremer.isisfish.entities.Population", - "java.util.List<PopulationGroup>", - "java.util.List<PopulationSeasonInfo>"}) + "fr.ifremer.isisfish.entities.PopulationGroup", + "fr.ifremer.isisfish.entities.PopulationSeasonInfo"}) public double compute(SimulationContext context, Population pop, - List<PopulationGroup> groups, List<PopulationSeasonInfo> seasons) throws Exception; + PopulationGroup group, PopulationSeasonInfo season) throws Exception; } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2011-10-28 12:17:39 UTC (rev 3498) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2011-10-28 12:18:03 UTC (rev 3499) @@ -75,16 +75,19 @@ if (getBean() != null){ if (getBean().getCapturability() != null) { - //fieldPopulationCapturability.removeMatrixPanelListener(listener); fieldPopulationCapturability.setMatrix(getBean().getCapturability().copy()); } } - - // TODO add only once, not at all refresh - //fieldPopulationCapturability.addMatrixListener(listener); }*/ protected void useEquationChanged() { getBean().setCapturabilityEquationUsed(fieldUseCapturabilityEquation.isSelected()); + + // compute matrix again to not diplay values computed by equation + if (!fieldUseCapturabilityEquation.isSelected()) { + if (getBean().getCapturability() != null) { + fieldPopulationCapturability.setMatrix(getBean().getCapturability().copy()); + } + } refreshHidablePanel(); } protected void refreshHidablePanel() {

1 0

r3498 - trunk/src/main/java/fr/ifremer/isisfish/entities
by echatellier＠users.forge.codelutin.com 28 Oct '11

28 Oct '11

Author: echatellier Date: 2011-10-28 14:17:39 +0200 (Fri, 28 Oct 2011) New Revision: 3498 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3498 Log: Fix doc Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java 2011-10-28 10:09:46 UTC (rev 3497) +++ trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java 2011-10-28 12:17:39 UTC (rev 3498) @@ -357,7 +357,6 @@ /** * Create default non spacialized matrix group changement. - * */ public MatrixND computeLengthChangeMatrix() { @@ -414,7 +413,8 @@ } /** - * return change group matrix for the given month + * Return change group matrix for the given month. + * * for species in Length, matrix returned is all time spacialized (needed * for simulation) */ @@ -470,7 +470,7 @@ } } - /* (non-Javadoc) + /* * @see fr.ifremer.isisfish.entities.PopulationSeasonInfo#getMigrationMatrix(fr.ifremer.isisfish.types.Month, org.nuiton.math.matrix.MatrixND) */ public MatrixND getMigrationMatrix(Month month, MatrixND N) { @@ -553,7 +553,7 @@ double ancienne_val = mat.getValue(x, x); mat.setValue(x, x, ancienne_val - coef); if (ancienne_val < 0) { - /*#log.info("Erreur dans la migration, un coef est negatif");#*/ + /*log.info("Erreur dans la migration, un coef est negatif");*/ } mat.setValue(x, y, coef); } @@ -566,7 +566,7 @@ return mat; } - /* (non-Javadoc) + /* * @see fr.ifremer.isisfish.entities.PopulationSeasonInfo#getEmigrationMatrix(fr.ifremer.isisfish.types.Month, org.nuiton.math.matrix.MatrixND) */ public MatrixND getEmigrationMatrix(Month month, MatrixND N) {

1 0

r3497 - trunk
by echatellier＠users.forge.codelutin.com 28 Oct '11

28 Oct '11

Author: echatellier Date: 2011-10-28 12:09:46 +0200 (Fri, 28 Oct 2011) New Revision: 3497 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3497 Log: Update changelog Modified: trunk/changelog.txt Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2011-10-28 09:26:01 UTC (rev 3496) +++ trunk/changelog.txt 2011-10-28 10:09:46 UTC (rev 3497) @@ -1,34 +1,6 @@ -isis-fish (4.0.0.0) test; urgency=low +See http://forge.codelutin.com/projects/isis-fish/roadmap - * Store data in a unique isis-fish directory in user home - * Fix compute number of trip when updating TripType duration - * In SA, only display component related to selected radio button - * Fix some plural string in groups wizard - * [#2659] Modification de la saisie des strategies (matrice unique) - * [#2658] Matrices de capturabilité sous forme d'une équation - * Rename Date to TimeStep - * Rename AnalysePlan to SimulationPlan - * Rename SensitivityCalculator to SensitivityAnalysis - * Sensitivity calculator parameters are not lost anymore - * Add new community repository with commit access for users - * Remove maturity group unique constraints - * Add view to test R configuration - * Disable charset converter (need to be retested) - * Add a new button to check all script in one action in script UI - * Improve UI to enable some fields/tabs only after region loading - * Enable to put population effectives into factors - * Enable to put rules into factor - * Add group screening features - * Modify parameters interface to prepare factorizable values (population/rule) - * Factor, DesignPlan, Scenario and Domain are no longer generics - * Use new Jaxx tree api - * Update i18n to 2.4.1 - * Update to topia 2.6.2 - * Update to Jaxx 2.4 - * Update to rSyntaxTextArea 1.5.0 - * Update to svnkit 1.3.5 - - -- jeu. févr. 4 11:48:12 CET 2010 + -- isis-fish (3.3.0.8) stable; urgency=low

1 0

r3496 - trunk
by echatellier＠users.forge.codelutin.com 28 Oct '11

28 Oct '11

Author: echatellier Date: 2011-10-28 11:26:01 +0200 (Fri, 28 Oct 2011) New Revision: 3496 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3496 Log: Update and format poms. Remove labs links. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-10-27 16:21:38 UTC (rev 3495) +++ trunk/pom.xml 2011-10-28 09:26:01 UTC (rev 3496) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -11,19 +12,19 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.0.0.0-beta1-SNAPSHOT</version> + <version>4.0.0.0-beta-1-SNAPSHOT</version>  <dependencies> -  +  <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> <version>${nuitonUtilsVersion}</version> <scope>compile</scope> </dependency> - + <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> @@ -38,7 +39,7 @@ <version>2.2.3.1</version> <scope>compile</scope> </dependency> - + <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> @@ -73,7 +74,7 @@ <version>2.2-SNAPSHOT</version> <scope>compile</scope> </dependency> - + <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix-gui</artifactId> @@ -89,10 +90,10 @@ </dependency> <dependency> - <groupId>com.fifesoft</groupId> - <artifactId>rsyntaxtextarea</artifactId> - <version>1.5.0</version> - <scope>runtime</scope> + <groupId>com.fifesoft</groupId> + <artifactId>rsyntaxtextarea</artifactId> + <version>1.5.0</version> + <scope>runtime</scope> </dependency> <dependency> @@ -101,7 +102,7 @@ <version>1.4.1</version> <scope>compile</scope> </dependency> - + <dependency> <groupId>javax.activation</groupId> <artifactId>activation</artifactId> @@ -116,7 +117,7 @@ <version>${jaxxVersion}</version> <scope>compile</scope> </dependency> - + <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-validator</artifactId> @@ -151,9 +152,9 @@ </dependency> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> <dependency> <groupId>commons-collections</groupId> @@ -216,10 +217,10 @@ <version>1.6.1</version> <scope>compile</scope> <exclusions> - <exclusion> - <artifactId>xml-apis</artifactId> - <groupId>xml-apis</groupId> - </exclusion> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>xml-apis</groupId> + </exclusion> </exclusions> </dependency> @@ -238,11 +239,8 @@ <scope>compile</scope> </dependency> -  +  <dependency> <groupId>com.jcraft</groupId> @@ -265,14 +263,14 @@ <version>1.1.1</version> <scope>runtime</scope> <exclusions> - <exclusion> - <artifactId>xml-apis</artifactId> - <groupId>xml-apis</groupId> - </exclusion> - <exclusion> - <artifactId>xmlParserAPIs</artifactId> - <groupId>xerces</groupId> - </exclusion> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>xml-apis</groupId> + </exclusion> + <exclusion> + <artifactId>xmlParserAPIs</artifactId> + <groupId>xerces</groupId> + </exclusion> </exclusions> </dependency> @@ -379,9 +377,9 @@ <scope>compile</scope> </dependency> -  @@ -392,7 +390,7 @@ <version>1.6.0.16</version> <scope>compile</scope> </dependency> - +  <dependency> <groupId>junit</groupId> @@ -425,10 +423,10 @@ <mailingLists> <mailingList> <name>isis-fish-commits</name> - <subscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/isis-fish-commits</subscribe> - <unsubscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/isis-fish-commits</unsubscribe> - <post>isis-fish-commits(a)lists.lists.labs.libre-entreprise.org</post> - <archive>http://lists.labs.libre-entreprise.org/pipermail/isis-fish-commits/</archive> + <subscribe>http://list.isis-fish.org/cgi-bin/mailman/listinfo/isis-fish-commits</subscribe> + <unsubscribe>http://list.isis-fish.org/cgi-bin/mailman/listinfo/isis-fish-commits</unsubscribe> + <post>isis-fish-commits(a)list.isis-fish.org</post> + <archive>http://list.isis-fish.org/cgi-bin/mailman/listinfo/isis-fish-commits/</archive> </mailingList> <mailingList> <name>isis-fish-devel</name> @@ -439,10 +437,10 @@ </mailingList> <mailingList> <name>isis-fish-user</name> - <subscribe>http://list.isis-fish.org/cgi-bin/mailman/listinfo/isis-fish-user</subscribe> - <unsubscribe>http://list.isis-fish.org/cgi-bin/mailman/listinfo/isis-fish-user</unsubscribe> - <post>isis-fish-user(a)list.isis-fish.org</post> - <archive>http://list.isis-fish.org/cgi-bin/mailman/listinfo/isis-fish-user/</archive> + <subscribe>http://list.isis-fish.org/cgi-bin/mailman/listinfo/isis-fish-users</subscribe> + <unsubscribe>http://list.isis-fish.org/cgi-bin/mailman/listinfo/isis-fish-users</unsubscribe> + <post>isis-fish-users(a)list.isis-fish.org</post> + <archive>http://list.isis-fish.org/cgi-bin/mailman/listinfo/isis-fish-users/</archive> </mailingList> </mailingLists> @@ -469,7 +467,7 @@ <timezone>+2</timezone> </developer> <developer> - <id>chatellier</id> + <id>echatellier</id> <name>Eric Chatellier</name> <email>chatellier(a)codelutin.com</email> <organization>CodeLutin</organization> @@ -516,7 +514,7 @@ <packaging>jar</packaging> <properties> -  +  <projectId>isis-fish</projectId> <siteLocales>fr,en</siteLocales> <maven.jar.main.class>fr.ifremer.isisfish.IsisFish</maven.jar.main.class> @@ -533,13 +531,12 @@ <aspectwerkzVersion>2.0</aspectwerkzVersion>  + <jnlpCodebase>file://${jnlp.build.directory}</jnlpCodebase>--> </properties> <build> @@ -590,19 +587,19 @@ <java.io.tmpdir>${project.build.directory}/surefire-workdir</java.io.tmpdir> </systemPropertyVariables> </configuration> -  </plugin> @@ -631,22 +628,22 @@ <inputs>zargo</inputs> <fullPackagePath>fr.ifremer.isisfish</fullPackagePath> <defaultPackage>fr.ifremer.isisfish</defaultPackage> -  +  <templates>org.nuiton.topia.generator.TopiaMetaTransformer</templates> </configuration> <goals> <goal>smart-generate</goal> </goals> </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - <version>${topiaVersion}</version> - <scope>runtime</scope> - </dependency> - </dependencies> + </executions> + <dependencies> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${topiaVersion}</version> + <scope>runtime</scope> + </dependency> + </dependencies> </plugin> <plugin> @@ -692,8 +689,8 @@ <execution> <id>copy-dependencies</id> <configuration> - <silent>true</silent> - <outputDirectory>${project.build.directory}/lib</outputDirectory> + <silent>true</silent> + <outputDirectory>${project.build.directory}/lib</outputDirectory> </configuration> <goals> <goal>copy-dependencies</goal> @@ -705,14 +702,14 @@ </build>  -  +   <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</developerConnection> - <url>http://svn.forge.codelutin.com/svn/isis-fish/trunk</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</developerConnection> + <url>http://svn.forge.codelutin.com/svn/isis-fish/trunk</url> </scm> - + <repositories> <repository> <id>nuiton.public</id> @@ -723,90 +720,82 @@ <pluginRepositories> <pluginRepository> <id>nuiton.plugin.public</id> - <url>http://nexu.nuiton.org/nexus/content/groups/public</url> + <url>http://nexus.nuiton.org/nexus/content/groups/public</url> </pluginRepository> </pluginRepositories> - <profiles> + <profiles> -  - <profile> - <id>assembly</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> +  + <profile> + <id>assembly</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> - <build> + <build> + <defaultGoal>package</defaultGoal> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>src/main/assembly/bin.xml</descriptor> + </descriptors> + <attach>false</attach> + </configuration> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> - <defaultGoal>package</defaultGoal> - <plugins> +  + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptors> - <descriptor>src/main/assembly/bin.xml</descriptor> - </descriptors> - <attach>false</attach> - </configuration> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + <properties> +  + <minimumTokens>100</minimumTokens> + <targetJdk>1.6</targetJdk> + </properties> - </profile> + <build> + <defaultGoal>site</defaultGoal> + </build> -  - <profile> - <id>reporting</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - - <properties> - -  - <minimumTokens>100</minimumTokens> - <targetJdk>1.6</targetJdk> - </properties> - - <build> - <defaultGoal>site</defaultGoal> - </build> - - <reporting> - <plugins> - - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <links> - <link>http://download.oracle.com/javase/6/docs/api/</link> - <link>http://maven-site.nuiton.org/nuiton-utils/nuiton-utils/apidocs/</link> - <link>http://maven-site.nuiton.org/nuiton-matrix/nuiton-matrix/apidocs/</link> - <link>http://maven-site.nuiton.org/nuiton-j2r/apidocs/</link> - <link>http://maven-site.nuiton.org/topia/topia-persistence/apidocs/</link> - </links> - </configuration> - </plugin> - - </plugins> - </reporting> - - </profile> - </profiles> - + <reporting> + <plugins> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <links> + <link>http://download.oracle.com/javase/6/docs/api/</link> + <link>http://maven-site.nuiton.org/nuiton-utils/nuiton-utils/apidocs/</link> + <link>http://maven-site.nuiton.org/nuiton-matrix/nuiton-matrix/apidocs/</link> + <link>http://maven-site.nuiton.org/nuiton-j2r/apidocs/</link> + <link>http://maven-site.nuiton.org/topia/topia-persistence/apidocs/</link> + </links> + </configuration> + </plugin> + </plugins> + </reporting> + </profile> + </profiles> </project>

1 0

r3495 - trunk
by echatellier＠users.forge.codelutin.com 27 Oct '11

27 Oct '11

Author: echatellier Date: 2011-10-27 18:21:38 +0200 (Thu, 27 Oct 2011) New Revision: 3495 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3495 Log: Prepare beta release Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-10-27 16:20:11 UTC (rev 3494) +++ trunk/pom.xml 2011-10-27 16:21:38 UTC (rev 3495) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.0.0.0-SNAPSHOT</version> + <version>4.0.0.0-beta1-SNAPSHOT</version>  <dependencies>

1 0