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

r3848 - branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain
by echatellier＠users.forge.codelutin.com Nov. 26, 2013

Nov. 26, 2013

Author: echatellier Date: 2013-11-26 23:40:14 +0100 (Tue, 26 Nov 2013) New Revision: 3848 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3848 Log: Fix max bound Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2013-11-26 22:33:31 UTC (rev 3847) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2013-11-26 22:40:14 UTC (rev 3848) @@ -200,7 +200,7 @@ } else { args.add(min); } - Object max = distributionParameters.get(Distribution.QUNIFMM.getDistibutionParams()[0].getName()); + Object max = distributionParameters.get(Distribution.QUNIFMM.getDistibutionParams()[1].getName()); if (max instanceof MatrixND) { args.add(1); // max } else {

1 0

r3847 - in branches/4.0.1/src/test/resources/test-database/regions: BaseMotosICA/data DemoRegion/data Golfe de Gascogne/data Golfe de Gascogne/data/data.lobs.db
by echatellier＠users.forge.codelutin.com Nov. 26, 2013

Nov. 26, 2013

Author: echatellier Date: 2013-11-26 23:33:31 +0100 (Tue, 26 Nov 2013) New Revision: 3847 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3847 Log: Move test database to h2 page store format (1.2+) Added: branches/4.0.1/src/test/resources/test-database/regions/BaseMotosICA/data/data.h2.db branches/4.0.1/src/test/resources/test-database/regions/DemoRegion/data/data.h2.db branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.lobs.db/1.t42.lob.db branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.lobs.db/2.t42.lob.db branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.lobs.db/3.t42.lob.db branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.lobs.db/4.t42.lob.db branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.lobs.db/5.t42.lob.db branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.lobs.db/6.t42.lob.db branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.lobs.db/7.t42.lob.db branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.lobs.db/8.t42.lob.db branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.lobs.db/9.t42.lob.db Removed: branches/4.0.1/src/test/resources/test-database/regions/BaseMotosICA/data/data.1.log.db branches/4.0.1/src/test/resources/test-database/regions/BaseMotosICA/data/data.data.db branches/4.0.1/src/test/resources/test-database/regions/BaseMotosICA/data/data.index.db branches/4.0.1/src/test/resources/test-database/regions/DemoRegion/data/data.2.log.db branches/4.0.1/src/test/resources/test-database/regions/DemoRegion/data/data.data.db branches/4.0.1/src/test/resources/test-database/regions/DemoRegion/data/data.index.db branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.lobs.db/46.t43.lob.db branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.lobs.db/47.t43.lob.db branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.lobs.db/48.t43.lob.db branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.lobs.db/49.t43.lob.db branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.lobs.db/50.t43.lob.db branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.lobs.db/51.t43.lob.db branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.lobs.db/52.t43.lob.db branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.lobs.db/53.t43.lob.db branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.lobs.db/54.t43.lob.db Modified: branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.h2.db Deleted: branches/4.0.1/src/test/resources/test-database/regions/BaseMotosICA/data/data.1.log.db =================================================================== (Binary files differ) Deleted: branches/4.0.1/src/test/resources/test-database/regions/BaseMotosICA/data/data.data.db =================================================================== (Binary files differ) Added: branches/4.0.1/src/test/resources/test-database/regions/BaseMotosICA/data/data.h2.db =================================================================== (Binary files differ) Property changes on: branches/4.0.1/src/test/resources/test-database/regions/BaseMotosICA/data/data.h2.db ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: branches/4.0.1/src/test/resources/test-database/regions/BaseMotosICA/data/data.index.db =================================================================== (Binary files differ) Deleted: branches/4.0.1/src/test/resources/test-database/regions/DemoRegion/data/data.2.log.db =================================================================== (Binary files differ) Deleted: branches/4.0.1/src/test/resources/test-database/regions/DemoRegion/data/data.data.db =================================================================== (Binary files differ) Added: branches/4.0.1/src/test/resources/test-database/regions/DemoRegion/data/data.h2.db =================================================================== (Binary files differ) Property changes on: branches/4.0.1/src/test/resources/test-database/regions/DemoRegion/data/data.h2.db ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: branches/4.0.1/src/test/resources/test-database/regions/DemoRegion/data/data.index.db =================================================================== (Binary files differ) Modified: branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.h2.db =================================================================== (Binary files differ) Added: branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.lobs.db/1.t42.lob.db =================================================================== (Binary files differ) Property changes on: branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.lobs.db/1.t42.lob.db ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.lobs.db/2.t42.lob.db =================================================================== (Binary files differ) Property changes on: branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.lobs.db/2.t42.lob.db ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.lobs.db/3.t42.lob.db =================================================================== (Binary files differ) Property changes on: branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.lobs.db/3.t42.lob.db ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.lobs.db/4.t42.lob.db =================================================================== (Binary files differ) Property changes on: branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.lobs.db/4.t42.lob.db ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.lobs.db/46.t43.lob.db =================================================================== (Binary files differ) Deleted: branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.lobs.db/47.t43.lob.db =================================================================== (Binary files differ) Deleted: branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.lobs.db/48.t43.lob.db =================================================================== (Binary files differ) Deleted: branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.lobs.db/49.t43.lob.db =================================================================== (Binary files differ) Added: branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.lobs.db/5.t42.lob.db =================================================================== (Binary files differ) Property changes on: branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.lobs.db/5.t42.lob.db ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.lobs.db/50.t43.lob.db =================================================================== (Binary files differ) Deleted: branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.lobs.db/51.t43.lob.db =================================================================== (Binary files differ) Deleted: branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.lobs.db/52.t43.lob.db =================================================================== (Binary files differ) Deleted: branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.lobs.db/53.t43.lob.db =================================================================== (Binary files differ) Deleted: branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.lobs.db/54.t43.lob.db =================================================================== (Binary files differ) Added: branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.lobs.db/6.t42.lob.db =================================================================== (Binary files differ) Property changes on: branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.lobs.db/6.t42.lob.db ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.lobs.db/7.t42.lob.db =================================================================== (Binary files differ) Property changes on: branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.lobs.db/7.t42.lob.db ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.lobs.db/8.t42.lob.db =================================================================== (Binary files differ) Property changes on: branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.lobs.db/8.t42.lob.db ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.lobs.db/9.t42.lob.db =================================================================== (Binary files differ) Property changes on: branches/4.0.1/src/test/resources/test-database/regions/Golfe de Gascogne/data/data.lobs.db/9.t42.lob.db ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r3846 - in branches/4.0.1/src/main: java/fr/ifremer/isisfish/ui/calibration resources/i18n
by echatellier＠users.forge.codelutin.com Nov. 26, 2013

Nov. 26, 2013

Author: echatellier Date: 2013-11-26 23:07:07 +0100 (Tue, 26 Nov 2013) New Revision: 3846 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3846 Log: Ajout de donn?\195?\169es d'exemple Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/calibration/CalibrationHandler.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/calibration/CalibrationMethodUI.jaxx branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/calibration/CalibrationHandler.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/calibration/CalibrationHandler.java 2013-11-26 21:38:18 UTC (rev 3845) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/calibration/CalibrationHandler.java 2013-11-26 22:07:07 UTC (rev 3846) @@ -22,8 +22,30 @@ */ package fr.ifremer.isisfish.ui.calibration; +import javax.swing.DefaultComboBoxModel; +import javax.swing.DefaultListModel; + import fr.ifremer.isisfish.ui.input.InputHandler; public class CalibrationHandler extends InputHandler { + public void init(CalibrationMethodUI view) { + DefaultComboBoxModel<String> methodModel = new DefaultComboBoxModel<>(); + methodModel.addElement("Simplex"); + methodModel.addElement("ABC"); + methodModel.addElement("Génétique"); + view.getFieldCalibrationMethodSelect().setModel(methodModel); + + DefaultListModel<String> objectiveModel = new DefaultListModel<>(); + objectiveModel.addElement("Moindres carrés indice abondance"); + objectiveModel.addElement("Moindres carrés debarquements par flottille"); + view.getAvailableCalibrationObjectives().setModel(objectiveModel); + + DefaultComboBoxModel<String> criteriaModel = new DefaultComboBoxModel<>(); + criteriaModel.addElement("Min"); + criteriaModel.addElement("Max"); + criteriaModel.addElement("Seuil à dépasser"); + criteriaModel.addElement("Epsilon"); + view.getFieldCalibrationCriteriaSelect().setModel(criteriaModel); + } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/calibration/CalibrationMethodUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/calibration/CalibrationMethodUI.jaxx 2013-11-26 21:38:18 UTC (rev 3845) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/calibration/CalibrationMethodUI.jaxx 2013-11-26 22:07:07 UTC (rev 3846) @@ -28,92 +28,93 @@ javax.swing.ComboBoxModel javax.swing.table.DefaultTableModel </import> - + <script><![CDATA[ - - - ]]></script> - <row> - <cell fill="horizontal"> - <JLabel text="isisfish.calibration.select"/> - </cell> - <cell fill="horizontal" weightx="1.0"> - <JComboBox id="fieldCalibrationMethodSelect" /> - </cell> - </row> - <row> - <cell columns="2" fill="both" weightx="1.0" weighty="1.0"> - <JScrollPane> - <JTable id="simulCalibrationMethodParam" rowHeight='24'/> - </JScrollPane> - </cell> - </row> - <row> - <cell columns="2" fill="both" weightx="1.0" weighty="1.0"> - <JPanel id="factorCardinalityPanel" layout="{new CardLayout()}"> - <JLabel text="isisfish.calibration.methodfactorsupported" horizontalAlignment="center" - border="{BorderFactory.createEtchedBorder()}" font-style="italic" constraints='"factorCardinalitySupported"'/> - <JScrollPane id="factorCardinalityScrollPane" constraints='"factorCardinalityNotSupported"'> - <JTable id="factorCardinality" rowHeight='24' /> - </JScrollPane> - </JPanel> - </cell> - </row> - <row> - <cell fill="both" columns='3' weightx="1.0"> - <JLabel text="isisfish.calibration.objectives"/> - </cell> - </row> - <row> - <cell columns='2' fill="both" weightx="1.0" weighty="1.0"> - <Table> - <row> - <cell fill="both" weightx="0.5" weighty="1.0"> - <JScrollPane> - <JList id="availableCalibrationObjectives" selectionMode="{javax.swing.ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" /> - </JScrollPane> - </cell> - <cell fill="both" weighty="1.0"> - <Table> - <row> - <cell fill="both"> - <JButton id="addObjectiveButton" text="isisfish.common.add" enabled="false" /> - </cell> - </row> - <row> - <cell fill="both"> - <JButton id="removeObjectiveButton" text="isisfish.common.remove" enabled="false" /> - </cell> - </row> - <row> - <cell fill="both"> - <JButton id="clearObjectiveButton" text="isisfish.common.clear" enabled="false" /> - </cell> - </row> - </Table> - </cell> + protected void $afterCompleteSetup() { + getContextValue(CalibrationHandler.class).init(this); + } + ]]></script> + <row> + <cell fill="horizontal"> + <JLabel text="isisfish.calibration.select"/> + </cell> + <cell fill="horizontal" weightx="1.0"> + <JComboBox id="fieldCalibrationMethodSelect" /> + </cell> + </row> + <row> + <cell columns="2" fill="both" weightx="1.0" weighty="1.0"> + <JScrollPane> + <JTable id="simulCalibrationMethodParam" rowHeight='24' /> + </JScrollPane> + </cell> + </row> + <row> + <cell columns="2" fill="both" weightx="1.0" weighty="1.0"> + <JPanel id="factorCardinalityPanel" layout="{new CardLayout()}"> + <JLabel text="isisfish.calibration.methodfactorsupported" horizontalAlignment="center" + border="{BorderFactory.createEtchedBorder()}" font-style="italic" constraints='"factorCardinalitySupported"'/> + <JScrollPane id="factorCardinalityScrollPane" constraints='"factorCardinalityNotSupported"'> + <JTable id="factorCardinality" rowHeight='24' /> + </JScrollPane> + </JPanel> + </cell> + </row> + <row> + <cell fill="both" columns='3' weightx="1.0"> + <JLabel text="isisfish.calibration.objectives"/> + </cell> + </row> + <row> + <cell columns='2' fill="both" weightx="1.0" weighty="1.0"> + <Table> + <row> <cell fill="both" weightx="0.5" weighty="1.0"> - <JScrollPane> - <JList id="selectedCalibrationObjectives" selectionMode="{javax.swing.ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" /> - </JScrollPane> - </cell> - </row> - </Table> - </cell> - </row> - <row> - <cell fill="both" columns='2' weightx="1.0" weighty="1.0"> - <JScrollPane> - <JTable id="objectiveParamsTable" rowHeight='24' /> - </JScrollPane> - </cell> - </row> - <row> - <cell fill="horizontal"> - <JLabel text="isisfish.calibration.optimization"/> - </cell> - <cell fill="horizontal" weightx="1.0"> - <JComboBox id="fieldCalibrationScriptSelect" /> - </cell> - </row> + <JScrollPane> + <JList id="availableCalibrationObjectives" selectionMode="{javax.swing.ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" /> + </JScrollPane> + </cell> + <cell fill="both" weighty="1.0"> + <Table> + <row> + <cell fill="both"> + <JButton id="addObjectiveButton" text="isisfish.common.add" enabled="false" /> + </cell> + </row> + <row> + <cell fill="both"> + <JButton id="removeObjectiveButton" text="isisfish.common.remove" enabled="false" /> + </cell> + </row> + <row> + <cell fill="both"> + <JButton id="clearObjectiveButton" text="isisfish.common.clear" enabled="false" /> + </cell> + </row> + </Table> + </cell> + <cell fill="both" weightx="0.5" weighty="1.0"> + <JScrollPane> + <JList id="selectedCalibrationObjectives" selectionMode="{javax.swing.ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" /> + </JScrollPane> + </cell> + </row> + </Table> + </cell> + </row> + <row> + <cell fill="both" columns='2' weightx="1.0" weighty="1.0"> + <JScrollPane> + <JTable id="objectiveParamsTable" rowHeight='24' /> + </JScrollPane> + </cell> + </row> + <row> + <cell fill="horizontal"> + <JLabel text="isisfish.calibration.optimization"/> + </cell> + <cell fill="horizontal" weightx="1.0"> + <JComboBox id="fieldCalibrationCriteriaSelect" /> + </cell> + </row> </Table> Modified: branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2013-11-26 21:38:18 UTC (rev 3845) +++ branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2013-11-26 22:07:07 UTC (rev 3846) @@ -99,7 +99,7 @@ isisfish.advancedParams.simulatorUse=Simulateur à utiliser isisfish.calibration.methodfactorsupported=La méthode de calibration choisie gère les cardinalités des facteurs isisfish.calibration.objectives=Fonctions d'objectif -isisfish.calibration.optimization=Script d'optimisation +isisfish.calibration.optimization=Critère d'optimisation isisfish.calibration.select=Méthode de calibration isisfish.calibration.title=Calibration isisfish.cell.comments=Commentaires

1 0

r3845 - branches/4.0.1
by echatellier＠users.forge.codelutin.com Nov. 26, 2013

Nov. 26, 2013

Author: echatellier Date: 2013-11-26 22:38:18 +0100 (Tue, 26 Nov 2013) New Revision: 3845 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3845 Log: Remove outdated todo Removed: branches/4.0.1/TODO.txt Deleted: branches/4.0.1/TODO.txt =================================================================== --- branches/4.0.1/TODO.txt 2013-11-23 21:50:19 UTC (rev 3844) +++ branches/4.0.1/TODO.txt 2013-11-26 21:38:18 UTC (rev 3845) @@ -1,8 +0,0 @@ -TODO au 18/09/2009 -================== - - - tester que les paramêtres d'une simulation sont corrects - (ex:année < 0) - - valeur par defaut dans les champs de saisie - - JavaWebStart - - Voir une version antérieure d'un script \ No newline at end of file

1 0

r3844 - in branches/4.0.1/src: main/java/fr/ifremer/isisfish/simulator/sensitivity main/java/fr/ifremer/isisfish/simulator/sensitivity/domain test/java/fr/ifremer/isisfish/simulator/sensitivity
by echatellier＠users.forge.codelutin.com Nov. 23, 2013

Nov. 23, 2013

Author: echatellier Date: 2013-11-23 22:50:19 +0100 (Sat, 23 Nov 2013) New Revision: 3844 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3844 Log: Manage distribution for continuous domains Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Distribution.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.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/simulator/sensitivity/Distribution.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Distribution.java 2013-11-23 21:48:39 UTC (rev 3843) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Distribution.java 2013-11-23 21:50:19 UTC (rev 3844) @@ -24,6 +24,16 @@ package fr.ifremer.isisfish.simulator.sensitivity; import static org.nuiton.i18n.I18n._; +import jdistlib.Binomial; +import jdistlib.Cauchy; +import jdistlib.ChiSquare; +import jdistlib.Exponential; +import jdistlib.F; +import jdistlib.Gamma; +import jdistlib.Geometric; +import jdistlib.HyperGeometric; +import jdistlib.Normal; +import jdistlib.Uniform; /** * Distribution used in sensitivity analysis (for continuous domain). @@ -39,59 +49,73 @@ QUNIFPC(_("QUnif %"), "runif", + Uniform.class, new DistributionParam("reference", _("Reference value"), true), - new DistributionParam("coefficient", _("Coefficient"))), + new DistributionParam("coefficient", _("Coefficient"), false)), QUNIFMM(_("QUnif Min/Max"), "runif", + Uniform.class, new DistributionParam("min", _("Minimum value"), true), new DistributionParam("max", _("Maximum value"), true)), DBINOM(_("Dbimom"), "rbinom", + Binomial.class, new DistributionParam("size", _("number of trials (zero or more)")), new DistributionParam("prob", _("probability of success on each trial"))), DCAUCHY(_("dcauchy"), "rcauchy", + Cauchy.class, new DistributionParam("location", _("location and scale parameters. (location = 0, scale = 1)")), new DistributionParam("scale", _("location and scale parameters. (location = 0, scale = 1)"))), DCHISQ(_("dchisq"), "rchisq", + ChiSquare.class, new DistributionParam("df", _("degrees of freedom (non-negative, but can be non-integer)")), new DistributionParam("ncp", _("non-centrality parameter (non-negative)."))), DEXP(_("dexp"), "rexp", + Exponential.class, new DistributionParam("rate", _("vector of rates"))), DF(_("df"), "rf", + F.class, new DistributionParam("df1", _("degrees of freedom. 'Inf' is allowed")), new DistributionParam("df2", _("degrees of freedom. 'Inf' is allowed")), new DistributionParam("ncp", _("non-centrality parameter. If omitted the central F is assumed"))), DGAMMA(_("dgamma"), "rgamma", + Gamma.class, new DistributionParam("shape", _("shape and scale parameters. Must be positive, 'scale' strictly")), new DistributionParam("rate", _("an alternative way to specify the scale.")), new DistributionParam("scale", _("shape and scale parameters. Must be positive, 'scale' strictly"))), DGEOM(_("dgeom"), "rgeom", + Geometric.class, new DistributionParam("prob", _("probability of success in each trial. '0 < prob <= 1'"))), DHYPER(_("dhyper"), "rhyper", + HyperGeometric.class, new DistributionParam("m", _("the number of white balls in the urn.")), new DistributionParam("n", _("the number of black balls in the urn.")), new DistributionParam("k", _("the number of balls drawn from the urn."))), DLNORM(_("dlnorm"), "rlnorm", - new DistributionParam("meanlog", _("mean and standard deviation of the distribution on the log scale with default values of '0' and '1' respectively.")), - new DistributionParam("sdlog", _("mean and standard deviation of the distribution on the log scale with default values of '0' and '1' respectively."))); + Normal.class, + new DistributionParam("meanlog", _("mean and standard deviation of the distribution on the log scale with default values of '0' and '1' respectively."), false), + new DistributionParam("sdlog", _("mean and standard deviation of the distribution on the log scale with default values of '0' and '1' respectively."), false)); protected String description; protected String instruction; + protected Class distClass; + protected DistributionParam[] params; - private Distribution(String description, String instruction, DistributionParam... params) { + private Distribution(String description, String instruction, Class distClass, DistributionParam... params) { this.description = description; this.instruction = instruction; + this.distClass = distClass; this.params = params; } @@ -103,6 +127,10 @@ return instruction; } + public Class getDistClass() { + return distClass; + } + public DistributionParam[] getDistibutionParams() { return params; } @@ -120,7 +148,7 @@ this.description = description; this.originalValue = originalValue; } - + public DistributionParam(String name, String description) { this(name, description, false); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2013-11-23 21:48:39 UTC (rev 3843) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2013-11-23 21:50:19 UTC (rev 3844) @@ -25,19 +25,24 @@ package fr.ifremer.isisfish.simulator.sensitivity.domain; +import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.SortedMap; +import org.apache.commons.beanutils.MethodUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.math.matrix.MatrixND; + import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.simulator.sensitivity.Distribution; import fr.ifremer.isisfish.simulator.sensitivity.Distribution.DistributionParam; import fr.ifremer.isisfish.simulator.sensitivity.Domain; import fr.ifremer.isisfish.simulator.sensitivity.visitor.DomainVisitor; -import jdistlib.Uniform; -import jdistlib.rng.QMersenneTwister; -import jdistlib.rng.QRandomEngine; /** * All the continuous domains are based on distribution definition. @@ -50,6 +55,8 @@ */ public class ContinuousDomain implements Domain { + private static Log log = LogFactory.getLog(ContinuousDomain.class); + /** serialVersionUID. */ private static final long serialVersionUID = -2037768174807839046L; @@ -168,8 +175,58 @@ @Override public Object getValueForIdentifier(Object identifier) { - Double result = Uniform.quantile((Double)identifier,0,1, true,false); + // first quantite args is always identifier value + List<Object> args = new ArrayList<Object>(); + args.add(identifier); + // build distribution param args list + Class distClass = distribution.getDistClass(); + if (distribution == Distribution.QUNIFPC) { + // special management : % to min/max + Object reference = distributionParameters.get(Distribution.QUNIFPC.getDistibutionParams()[0].getName()); + if (reference instanceof MatrixND) { + args.add(0); // min + args.add(1); // max + } else { + double ref = (Double)reference; + double coef = (Double)distributionParameters.get(Distribution.QUNIFPC.getDistibutionParams()[1].getName()); + args.add(ref * (1 - coef)); // min + args.add(ref * (1 + coef)); // max + } + } else if (distribution == Distribution.QUNIFMM) { + Object min = distributionParameters.get(Distribution.QUNIFMM.getDistibutionParams()[0].getName()); + if (min instanceof MatrixND) { + args.add(0); // min + } else { + args.add(min); + } + Object max = distributionParameters.get(Distribution.QUNIFMM.getDistibutionParams()[0].getName()); + if (max instanceof MatrixND) { + args.add(1); // max + } else { + args.add(max); + } + } else { + for (DistributionParam param : distribution.getDistibutionParams()) { + String name = param.getName(); + Object value = distributionParameters.get(name); + args.add(value); + } + } + + // add default value for lower.tail = TRUE, log.p = FALSE + args.add(true); + args.add(false); + + // invoke quantile method + Object result = null; + try { + result = MethodUtils.invokeStaticMethod(distClass, "quantile", args.toArray()); + } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ex) { + if (log.isErrorEnabled()) { + log.error("Can't invoke quantile method", ex); + } + } return result; } 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 2013-11-23 21:48:39 UTC (rev 3843) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityAnalysisTest.java 2013-11-23 21:50:19 UTC (rev 3844) @@ -28,7 +28,6 @@ import java.io.IOException; import fr.ifremer.isisfish.IsisFish; -import jdistlib.Uniform; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -82,14 +81,16 @@ protected DesignPlan getDesignPlan(Factor... factors) { DesignPlan result = new DesignPlan(); + int factorIndex = 1; for (Factor factor : factors) { + factor.setName("f" + factorIndex++); result.addFactor(factor); } return result; } - protected FactorGroup getFactorGroup(String name, boolean continuous, Factor... factors) { - FactorGroup result = new FactorGroup(name, continuous); + protected FactorGroup getFactorGroup(boolean continuous, Factor... factors) { + FactorGroup result = new FactorGroup("", continuous); for (Factor factor : factors) { result.addFactor(factor); } @@ -175,6 +176,18 @@ return factor1; } + protected void displayScenarios(SensitivityScenarios scenarii) { + if (log.isDebugEnabled()) { + int scIndex = 1; + for (Scenario scenario : scenarii.getScenarios()) { + log.debug("Scenario " + scIndex++); + for (Factor factor : scenario.getFactors()) { + log.debug("Factor " + factor.getName() + " = " + factor.getValue()); + } + } + } + } + /** * Test tmp files/dir. * @@ -199,13 +212,36 @@ // uniform min/max DesignPlan designPlan = getDesignPlan(getContinuousDoubleUniformMMFactor(), getContinuousDoubleUniformMMFactor()); SensitivityScenarios scenarii = script.compute(designPlan, simulationsDir); - Assert.assertEquals(9, scenarii.getScenarios().size()); + Assert.assertTrue(scenarii.getScenarios().size() >= 3); // random, can be 9, 12 + for (Scenario scenario : scenarii.getScenarios()) { + for (Factor factor : scenario.getFactors()) { + double value = (Double)factor.getValue(); + Assert.assertTrue(value >= 0.0 && value <= 2.0); + } + } // uniform pc designPlan = getDesignPlan(getContinuousDoubleUniformPcFactor(), getContinuousDoubleUniformPcFactor()); scenarii = script.compute(designPlan, simulationsDir); - Assert.assertEquals(9, scenarii.getScenarios().size()); + Assert.assertTrue(scenarii.getScenarios().size() >= 3); // random, can be 9, 12 + for (Scenario scenario : scenarii.getScenarios()) { + for (Factor factor : scenario.getFactors()) { + double value = (Double)factor.getValue(); + Assert.assertTrue(value >= 30.0 && value <= 50.0); + } + } + // matrix uniform + designPlan = getDesignPlan(getContinuousMatrixUniformMMFactor(), getContinuousMatrixUniformMMFactor()); + scenarii = script.compute(designPlan, simulationsDir); + Assert.assertTrue(scenarii.getScenarios().size() >= 3); // random, can be 9, 12 + for (Scenario scenario : scenarii.getScenarios()) { + for (Factor factor : scenario.getFactors()) { + double value = (Double)factor.getValue(); + Assert.assertTrue(value >= 0.0 && value <= 2.0); + } + } + // check fail is discrete designPlan = getDesignPlan(getDiscreteIntFactor(),getContinuousDoubleUniformMMFactor()); try { @@ -230,7 +266,12 @@ DesignPlan designPlan = getDesignPlan(getContinuousDoubleUniformMMFactor(), getContinuousDoubleUniformMMFactor()); SensitivityScenarios scenarii = script.compute(designPlan, simulationsDir); - + for (Scenario scenario : scenarii.getScenarios()) { + for (Factor factor : scenario.getFactors()) { + double value = (Double)factor.getValue(); + Assert.assertTrue(value >= 0.0 && value <= 2.0); + } + } } /** @@ -248,11 +289,18 @@ DesignPlan designPlan = getDesignPlan(getContinuousDoubleUniformMMFactor(), getContinuousDoubleUniformMMFactor()); SensitivityScenarios scenarii = script.compute(designPlan, simulationsDir); Assert.assertEquals(40, scenarii.getScenarios().size()); + for (Scenario scenario : scenarii.getScenarios()) { + for (Factor factor : scenario.getFactors()) { + double value = (Double)factor.getValue(); + Assert.assertTrue(value >= 0.0 && value <= 2.0); + } + } // uniform pc designPlan = getDesignPlan(getContinuousDoubleUniformPcFactor(), getContinuousDoubleUniformPcFactor()); scenarii = script.compute(designPlan, simulationsDir); Assert.assertEquals(40, scenarii.getScenarios().size()); + displayScenarios(scenarii); // check fail is discrete designPlan = getDesignPlan(getDiscreteIntFactor(),getContinuousDoubleUniformMMFactor()); @@ -280,11 +328,18 @@ DesignPlan designPlan = getDesignPlan(getContinuousDoubleUniformMMFactor(), getContinuousDoubleUniformMMFactor()); SensitivityScenarios scenarii = script.compute(designPlan, simulationsDir); Assert.assertEquals(10, scenarii.getScenarios().size()); + for (Scenario scenario : scenarii.getScenarios()) { + for (Factor factor : scenario.getFactors()) { + double value = (Double)factor.getValue(); + Assert.assertTrue(value >= 0.0 && value <= 2.0); + } + } // uniform pc designPlan = getDesignPlan(getContinuousDoubleUniformPcFactor(), getContinuousDoubleUniformPcFactor()); scenarii = script.compute(designPlan, simulationsDir); Assert.assertEquals(10, scenarii.getScenarios().size()); + displayScenarios(scenarii); // check fail is discrete designPlan = getDesignPlan(getDiscreteIntFactor(),getContinuousDoubleUniformMMFactor()); @@ -312,11 +367,18 @@ DesignPlan designPlan = getDesignPlan(getContinuousDoubleUniformMMFactor(), getContinuousDoubleUniformMMFactor()); SensitivityScenarios scenarii = script.compute(designPlan, simulationsDir); Assert.assertEquals(10, scenarii.getScenarios().size()); + for (Scenario scenario : scenarii.getScenarios()) { + for (Factor factor : scenario.getFactors()) { + double value = (Double)factor.getValue(); + Assert.assertTrue(value >= 0.0 && value <= 2.0); + } + } // uniform pc designPlan = getDesignPlan(getContinuousDoubleUniformPcFactor(), getContinuousDoubleUniformPcFactor()); scenarii = script.compute(designPlan, simulationsDir); Assert.assertEquals(10, scenarii.getScenarios().size()); + displayScenarios(scenarii); // check fail is discrete designPlan = getDesignPlan(getDiscreteIntFactor(),getContinuousDoubleUniformMMFactor()); @@ -342,7 +404,13 @@ DesignPlan designPlan = getDesignPlan(getContinuousDoubleUniformMMFactor(), getContinuousDoubleUniformMMFactor()); SensitivityScenarios scenarii = script.compute(designPlan, simulationsDir); - + for (Scenario scenario : scenarii.getScenarios()) { + for (Factor factor : scenario.getFactors()) { + double value = (Double)factor.getValue(); + Assert.assertTrue(value >= 0.0 && value <= 2.0); + } + } + } /** @@ -354,13 +422,15 @@ @Test public void testRegularFractions() throws IsisFishException, SensitivityException { SensitivityAnalysis script = SensitivityAnalysisStorage.getSensitivityAnalysis("RegularFractions").getNewSensitivityAnalysisInstance(); - SensitivityAnalysisStorage.setParameterValue(script,"pathToFunction", IsisFish.config.getDatabaseDirectory().getAbsolutePath() + "/sensitivityanalysis"); + // this script need pathToFunction parameter to find R script in current directory + SensitivityAnalysisStorage.setParameterValue(script,"pathToFunction", + IsisFish.config.getDatabaseDirectory().getAbsolutePath() + File.separator + "sensitivityanalysis"); + Assert.assertNotNull("RegularFractions script not found in test data", script); DesignPlan designPlan = getDesignPlan(getContinuousDoubleUniformMMFactor(), getContinuousDoubleUniformMMFactor()); SensitivityScenarios scenarii = script.compute(designPlan, simulationsDir); - - System.out.println(); + displayScenarios(scenarii); } @@ -379,11 +449,23 @@ DesignPlan designPlan = getDesignPlan(getContinuousDoubleUniformMMFactor(), getContinuousDoubleUniformMMFactor()); SensitivityScenarios scenarii = script.compute(designPlan, simulationsDir); Assert.assertEquals(80, scenarii.getScenarios().size()); + for (Scenario scenario : scenarii.getScenarios()) { + for (Factor factor : scenario.getFactors()) { + double value = (Double)factor.getValue(); + Assert.assertTrue(value >= 0.0 && value <= 2.0); + } + } // sobol avec cauchy/chisq designPlan = getDesignPlan(getContinuousDoubleCauchyFactor(), getContinuousDoubleChisqFactor()); scenarii = script.compute(designPlan, simulationsDir); Assert.assertEquals(80, scenarii.getScenarios().size()); + for (Scenario scenario : scenarii.getScenarios()) { + for (Factor factor : scenario.getFactors()) { + double value = (Double)factor.getValue(); + Assert.assertTrue(value >= 0.0 && value <= 100.0); + } + } // check fail is discrete designPlan = getDesignPlan(getDiscreteIntFactor(),getContinuousDoubleUniformMMFactor());

1 0

r3843 - branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs
by echatellier＠users.forge.codelutin.com Nov. 23, 2013

Nov. 23, 2013

Author: echatellier Date: 2013-11-23 22:48:39 +0100 (Sat, 23 Nov 2013) New Revision: 3843 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3843 Log: Remove empty exception message constr Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VCSException.java Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VCSException.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VCSException.java 2013-11-22 17:52:48 UTC (rev 3842) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VCSException.java 2013-11-23 21:48:39 UTC (rev 3843) @@ -38,10 +38,6 @@ private static final long serialVersionUID = -2665066202505740998L; - public VCSException() { - super(); - } - public VCSException(String message) { super(message); } @@ -49,9 +45,4 @@ public VCSException(String message, Throwable cause) { super(message, cause); } - - public VCSException(Throwable cause) { - super(cause); - } - }

1 0

r3842 - in branches/4.0.1/src: main/java/fr/ifremer/isisfish/simulator/sensitivity main/java/fr/ifremer/isisfish/simulator/sensitivity/domain test/java/fr/ifremer/isisfish/simulator/sensitivity test/resources/test-database/sensitivityanalysis
by jcouteau＠users.forge.codelutin.com Nov. 22, 2013

Nov. 22, 2013

Author: jcouteau Date: 2013-11-22 18:52:48 +0100 (Fri, 22 Nov 2013) New Revision: 3842 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3842 Log: refs #725 : Prise en compte de la distribution dans les AS Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityAnalysisTest.java branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/Fast.java branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/Morris.java branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/OptimumLHS.java branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/RandomLHS.java branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/RegularExpandGrid.java branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/RegularFractions.java branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/Sobol.java Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java 2013-11-22 15:31:45 UTC (rev 3841) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java 2013-11-22 17:52:48 UTC (rev 3842) @@ -31,6 +31,7 @@ import java.io.IOException; import java.util.Collection; import java.util.List; +import java.util.Map; import javax.swing.Box; import javax.swing.JLabel; @@ -39,6 +40,7 @@ import javax.swing.JTextPane; import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.j2r.REngine; @@ -396,6 +398,44 @@ return result; } + protected String getIsisFactorDistribution(List<Factor> factors){ + String isisFactorDistribution = "isis.factor.distribution<-" + + "data.frame(NomFacteur=c(%s)," + + "NomDistribution=c(%s)," + + "ParametreDistribution=c(%s))"; + + // Creating the vectors. + String distribution = ""; + String parameters = ""; + String factorNames = ""; + + for (int i = 0; i < factors.size(); i++) { + Factor factor = factors.get(i); + ContinuousDomain domain = (ContinuousDomain)factor.getDomain(); + if (i != 0) { + distribution += ","; + parameters += ","; + factorNames += ","; + } + + Distribution r_distribution = domain.getDistribution(); + + distribution += "\""+ r_distribution.getInstruction() +"\""; + parameters += "\"["; + + for (Map.Entry<String,Object> param:domain.getDistributionParameters().entrySet()){ + parameters += param.getKey() + "=" + param.getValue() + ";"; + } + + parameters = StringUtils.removeEnd(parameters, ";"); + parameters += "]\""; + + factorNames += "\"" + factor.getName() + "\""; + } + + return String.format(isisFactorDistribution, factorNames, distribution, parameters); + } + /** * * @param value Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2013-11-22 15:31:45 UTC (rev 3841) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2013-11-22 17:52:48 UTC (rev 3842) @@ -35,6 +35,9 @@ import fr.ifremer.isisfish.simulator.sensitivity.Distribution.DistributionParam; import fr.ifremer.isisfish.simulator.sensitivity.Domain; import fr.ifremer.isisfish.simulator.sensitivity.visitor.DomainVisitor; +import jdistlib.Uniform; +import jdistlib.rng.QMersenneTwister; +import jdistlib.rng.QRandomEngine; /** * All the continuous domains are based on distribution definition. @@ -165,17 +168,8 @@ @Override public Object getValueForIdentifier(Object identifier) { - Double result = 0d; + Double result = Uniform.quantile((Double)identifier,0,1, true,false); - /*if (isPercentageType()) { - // since 3.4.0.0, operator is always * - result = ((Double)referenceValue + (((Double)referenceValue * coefficient) - * ((2 * (Double)identifier - 1)))); - } else { - result = ((Double)identifier * ((Double)maxBound - (Double)minBound)) - + (Double)minBound; - }*/ - return result; } 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 2013-11-22 15:31:45 UTC (rev 3841) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityAnalysisTest.java 2013-11-22 17:52:48 UTC (rev 3842) @@ -27,6 +27,8 @@ import java.io.File; import java.io.IOException; +import fr.ifremer.isisfish.IsisFish; +import jdistlib.Uniform; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -97,6 +99,7 @@ protected Factor getContinuousDoubleUniformMMFactor() { // factor 1, min/max on int Factor factor1 = new Factor("test unifmm"); + factor1.setCardinality(2); ContinuousDomain domain1 = new ContinuousDomain(Distribution.QUNIFMM); domain1.addDistributionParam("min", 0.0); domain1.addDistributionParam("max", 2.0); @@ -108,6 +111,7 @@ protected Factor getContinuousDoubleUniformPcFactor() { // factor 1, min/max on int Factor factor2 = new Factor("test unifpc"); + factor2.setCardinality(2); ContinuousDomain domain2 = new ContinuousDomain(Distribution.QUNIFPC); domain2.addDistributionParam("reference", 40.0); domain2.addDistributionParam("coefficient", 0.05); @@ -195,12 +199,22 @@ // uniform min/max DesignPlan designPlan = getDesignPlan(getContinuousDoubleUniformMMFactor(), getContinuousDoubleUniformMMFactor()); SensitivityScenarios scenarii = script.compute(designPlan, simulationsDir); - Assert.assertEquals(3, scenarii.getScenarios().size()); - + Assert.assertEquals(9, scenarii.getScenarios().size()); + // uniform pc designPlan = getDesignPlan(getContinuousDoubleUniformPcFactor(), getContinuousDoubleUniformPcFactor()); scenarii = script.compute(designPlan, simulationsDir); - Assert.assertEquals(3, scenarii.getScenarios().size()); + Assert.assertEquals(9, scenarii.getScenarios().size()); + + // check fail is discrete + designPlan = getDesignPlan(getDiscreteIntFactor(),getContinuousDoubleUniformMMFactor()); + try { + script.compute(designPlan, simulationsDir); + Assert.fail("Exception should have been thrown at this stage"); + } catch (SensitivityException eee){ + //do nothing + } + } /** @@ -230,8 +244,24 @@ SensitivityAnalysis script = SensitivityAnalysisStorage.getSensitivityAnalysis("Fast").getNewSensitivityAnalysisInstance(); Assert.assertNotNull("Fast script not found in test data", script); + // uniform min/max DesignPlan designPlan = getDesignPlan(getContinuousDoubleUniformMMFactor(), getContinuousDoubleUniformMMFactor()); SensitivityScenarios scenarii = script.compute(designPlan, simulationsDir); + Assert.assertEquals(40, scenarii.getScenarios().size()); + + // uniform pc + designPlan = getDesignPlan(getContinuousDoubleUniformPcFactor(), getContinuousDoubleUniformPcFactor()); + scenarii = script.compute(designPlan, simulationsDir); + Assert.assertEquals(40, scenarii.getScenarios().size()); + + // check fail is discrete + designPlan = getDesignPlan(getDiscreteIntFactor(),getContinuousDoubleUniformMMFactor()); + try { + script.compute(designPlan, simulationsDir); + Assert.fail("Exception should have been thrown at this stage"); + } catch (SensitivityException eee){ + //do nothing + } } @@ -246,8 +276,24 @@ SensitivityAnalysis script = SensitivityAnalysisStorage.getSensitivityAnalysis("OptimumLHS").getNewSensitivityAnalysisInstance(); Assert.assertNotNull("OptimumLHS script not found in test data", script); + // uniform min/max DesignPlan designPlan = getDesignPlan(getContinuousDoubleUniformMMFactor(), getContinuousDoubleUniformMMFactor()); SensitivityScenarios scenarii = script.compute(designPlan, simulationsDir); + Assert.assertEquals(10, scenarii.getScenarios().size()); + + // uniform pc + designPlan = getDesignPlan(getContinuousDoubleUniformPcFactor(), getContinuousDoubleUniformPcFactor()); + scenarii = script.compute(designPlan, simulationsDir); + Assert.assertEquals(10, scenarii.getScenarios().size()); + + // check fail is discrete + designPlan = getDesignPlan(getDiscreteIntFactor(),getContinuousDoubleUniformMMFactor()); + try { + script.compute(designPlan, simulationsDir); + Assert.fail("Exception should have been thrown at this stage"); + } catch (SensitivityException eee){ + //do nothing + } } @@ -262,8 +308,24 @@ SensitivityAnalysis script = SensitivityAnalysisStorage.getSensitivityAnalysis("RandomLHS").getNewSensitivityAnalysisInstance(); Assert.assertNotNull("RandomLHS script not found in test data", script); + // uniform min/max DesignPlan designPlan = getDesignPlan(getContinuousDoubleUniformMMFactor(), getContinuousDoubleUniformMMFactor()); SensitivityScenarios scenarii = script.compute(designPlan, simulationsDir); + Assert.assertEquals(10, scenarii.getScenarios().size()); + + // uniform pc + designPlan = getDesignPlan(getContinuousDoubleUniformPcFactor(), getContinuousDoubleUniformPcFactor()); + scenarii = script.compute(designPlan, simulationsDir); + Assert.assertEquals(10, scenarii.getScenarios().size()); + + // check fail is discrete + designPlan = getDesignPlan(getDiscreteIntFactor(),getContinuousDoubleUniformMMFactor()); + try { + script.compute(designPlan, simulationsDir); + Assert.fail("Exception should have been thrown at this stage"); + } catch (SensitivityException eee){ + //do nothing + } } @@ -292,10 +354,13 @@ @Test public void testRegularFractions() throws IsisFishException, SensitivityException { SensitivityAnalysis script = SensitivityAnalysisStorage.getSensitivityAnalysis("RegularFractions").getNewSensitivityAnalysisInstance(); + SensitivityAnalysisStorage.setParameterValue(script,"pathToFunction", IsisFish.config.getDatabaseDirectory().getAbsolutePath() + "/sensitivityanalysis"); Assert.assertNotNull("RegularFractions script not found in test data", script); DesignPlan designPlan = getDesignPlan(getContinuousDoubleUniformMMFactor(), getContinuousDoubleUniformMMFactor()); SensitivityScenarios scenarii = script.compute(designPlan, simulationsDir); + + System.out.println(); } @@ -320,5 +385,14 @@ scenarii = script.compute(designPlan, simulationsDir); Assert.assertEquals(80, scenarii.getScenarios().size()); + // check fail is discrete + designPlan = getDesignPlan(getDiscreteIntFactor(),getContinuousDoubleUniformMMFactor()); + try { + script.compute(designPlan, simulationsDir); + Assert.fail("Exception should have been thrown at this stage"); + } catch (SensitivityException eee){ + //do nothing + } + } } Modified: branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/Fast.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/Fast.java 2013-11-22 15:31:45 UTC (rev 3841) +++ branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/Fast.java 2013-11-22 17:52:48 UTC (rev 3842) @@ -24,8 +24,10 @@ import java.io.File; import java.util.List; +import java.util.Map; import fr.ifremer.isisfish.simulator.sensitivity.*; +import org.apache.commons.lang3.StringUtils; import org.nuiton.j2r.REngine; import org.nuiton.j2r.RException; import org.nuiton.j2r.RProxy; @@ -138,33 +140,8 @@ nbExperiments = (Integer)engine.eval("dim(a$X)[1]"); - String factorDistribution = "isis.factor.distribution<-data.frame(" + - "NomFacteur=c(%s)," + - "NomDistribution=c(%s)," + - "ParametreDistribution=c(%s))"; + engine.voidEval(getIsisFactorDistribution(factors)); - // Creating the vectors. - String distribution = ""; - String parameters = ""; - String factorNames = ""; - - for (int i = 0; i < factorNumber; i++) { - Factor factor = factors.get(i); - ContinuousDomain domain = (ContinuousDomain) factor.getDomain(); - if (i != 0) { - distribution += ","; - parameters += ","; - factorNames += ","; - } - - distribution += "\"qunif\""; -// parameters += "\"[" + domain.getMinBound() + ";" + -// domain.getMaxBound() + "]\""; - factorNames += "\"" + factor.getName() + "\""; - } - engine.voidEval(String.format(factorDistribution, factorNames, - distribution, parameters)); - engine.voidEval("call<-a$call"); @@ -192,18 +169,7 @@ Scenario experimentScenario = new Scenario(); for (int i = 0; i < factorNumber; i++) { Factor factor = plan.getFactors().get(i); - Domain domain = factor.getDomain(); -// if ((domain instanceof MatrixContinuousDomain) -// || (domain instanceof EquationContinuousDomain)) { -// factor.setValueForIdentifier(dataFrame.get(i,j)); -// } else { -// ContinuousDomain continuousDomain = (ContinuousDomain)domain; -// Double min = continuousDomain.getCalculatorMinBound(); -// Double max = continuousDomain.getCalculatorMaxBound(); -// Double dFValue = (Double)dataFrame.get(i,j); -// Double value = min + (max - min) * dFValue; -// factor.setValueForIdentifier(value); -// } + factor.setValueForIdentifier(dataFrame.get(i,j)); experimentScenario.addFactor(factor); } thisExperimentScenarios.add(experimentScenario); Modified: branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/Morris.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/Morris.java 2013-11-22 15:31:45 UTC (rev 3841) +++ branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/Morris.java 2013-11-22 17:52:48 UTC (rev 3842) @@ -108,8 +108,8 @@ gridJump += factor.getCardinality() / 2; - binf+= getMinBound(factor); - bsup+= getMaxBound(factor); + binf += 0; + bsup += 1; } String rInstruction = "a<-morris(model=NULL,factors=c(%s),r=%s," + Modified: branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/OptimumLHS.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/OptimumLHS.java 2013-11-22 15:31:45 UTC (rev 3841) +++ branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/OptimumLHS.java 2013-11-22 17:52:48 UTC (rev 3842) @@ -126,34 +126,7 @@ thisExperiment.setScenarios(thisExperimentScenarios); } - String isisFactorDistribution = "isis.factor.distribution<-" + - "data.frame(" + - "NomFacteur=c(%s)," + - "NomDistribution=c(%s)," + - "ParametreDistribution=c(%s))"; - - String distribution = ""; - String parameters = ""; - String factorNames = ""; - - for (int i = 0; i < factors.size(); i++) { - Factor tempFactor = factors.get(i); - ContinuousDomain domain = (ContinuousDomain) tempFactor.getDomain(); - if (i != 0) { - distribution += ","; - factorNames += ","; - parameters += ","; - } - - factorNames += "\"" + factors.get(i).getName() + "\""; - distribution += "\"qunif\""; - //add [min;max] to parameters -// parameters += "\"[" + domain.getMinBound() + ";" + -// domain.getMaxBound() + "]\""; - } - - engine.voidEval(String.format(isisFactorDistribution, factorNames, - distribution, parameters)); + engine.voidEval(getIsisFactorDistribution(factors)); engine.voidEval("call<-" + "\"x<-optimumLHS(" + "n=" + param_simulationNumber Modified: branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/RandomLHS.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/RandomLHS.java 2013-11-22 15:31:45 UTC (rev 3841) +++ branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/RandomLHS.java 2013-11-22 17:52:48 UTC (rev 3842) @@ -122,35 +122,8 @@ thisExperiment.setScenarios(thisExperimentScenarios); } - String isisFactorDistribution = "isis.factor.distribution<-" + - "data.frame(" + - "NomFacteur=c(%s)," + - "NomDistribution=c(%s)," + - "ParametreDistribution=c(%s))"; + engine.voidEval(getIsisFactorDistribution(factors)); - String distribution = ""; - String parameters = ""; - String factorNames = ""; - - - //Create the strings for the isis.MethodExp instruction - for (int i = 0; i < factors.size(); i++) { - ContinuousDomain domain = (ContinuousDomain)factors.get(i).getDomain(); - if (i != 0) { - distribution += ","; //the distribution - factorNames += ","; //the factor names - parameters += ","; //the parameters - } - - factorNames += "\"" + factors.get(i).getName() + "\""; - distribution += "\"qunif\""; //all distributions are qunif -// double min = domain.getCalculatorMinBound(); -// double max = domain.getCalculatorMaxBound(); -// parameters += "\"[" + min + ";" + max + "]\""; - } - engine.voidEval(String.format(isisFactorDistribution, factorNames, - distribution, parameters)); - engine.voidEval("call<-" + "\"x<-randomLHS(" + param_simulationNumber + "," + factorNumber + ")\""); Modified: branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/RegularExpandGrid.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/RegularExpandGrid.java 2013-11-22 15:31:45 UTC (rev 3841) +++ branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/RegularExpandGrid.java 2013-11-22 17:52:48 UTC (rev 3842) @@ -100,8 +100,8 @@ Domain domain = factor.getDomain(); if (domain instanceof ContinuousDomain) { - ContinuousDomain contDomain = (ContinuousDomain) domain; - int card = factor.getCardinality(); +// ContinuousDomain contDomain = (ContinuousDomain) domain; +// int card = factor.getCardinality(); // Double min = contDomain.getCalculatorMinBound(); // Double max = contDomain.getCalculatorMaxBound(); // Modified: branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/RegularFractions.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/RegularFractions.java 2013-11-22 15:31:45 UTC (rev 3841) +++ branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/RegularFractions.java 2013-11-22 17:52:48 UTC (rev 3842) @@ -91,7 +91,6 @@ //Create a string with all factors names for (int i = 0; i < factorNumber; i++) { - Domain domain = factors.get(i).getDomain(); if (i != 0) { factorNames += ","; } @@ -151,18 +150,7 @@ Scenario experimentScenario = new Scenario(); for (int i = 0; i < factors.size(); i++) { Factor factor = plan.getFactors().get(i); - Domain domain = factor.getDomain(); - Double dFValue = (Double)dataFrame.get(i,j); -// if ((domain instanceof MatrixContinuousDomain) -// || (domain instanceof EquationContinuousDomain)) { -// factor.setValueForIdentifier(dFValue); -// } else { -// ContinuousDomain contDomain = (ContinuousDomain)domain; -// Double max = contDomain.getCalculatorMaxBound(); -// Double min = contDomain.getCalculatorMinBound(); -// Double value = min + (max - min) * dFValue / (param_p - 1); -// factor.setValueForIdentifier(value); -// } + factor.setValueForIdentifier(dataFrame.get(i,j)); experimentScenario.addFactor(factor); } thisExperimentScenarios.add(experimentScenario); @@ -201,7 +189,7 @@ } engine.voidEval(dataframe); - engine.voidEval("isis.factor.distribution<-c(0.0)"); + engine.voidEval(getIsisFactorDistribution(factors)); engine.voidEval("isis.MethodExp<-list(" + "\"isis.factors\"=isis.factors," + Modified: branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/Sobol.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/Sobol.java 2013-11-22 15:31:45 UTC (rev 3841) +++ branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/Sobol.java 2013-11-22 17:52:48 UTC (rev 3842) @@ -106,20 +106,7 @@ String x = "<-data.frame(matrix(c("; for (int i = 0; i < factorNumber; i++) { - Factor factor = factors.get(i); - ContinuousDomain domain = (ContinuousDomain)factor.getDomain(); - - Distribution r_distribution = domain.getDistribution(); - - x += r_distribution.getInstruction() +"("+param_n+","; - - for (Map.Entry<String,Object> param:domain.getDistributionParameters().entrySet()){ - x += param.getKey() + "=" + param.getValue() + ","; - } - - x = StringUtils.removeEnd(x, ","); - - x+= "),"; + x += "runif("+param_n+"),"; } x = StringUtils.removeEnd(x, ","); @@ -152,43 +139,8 @@ nbExperiments = dataFrame.dim()[0]; - String isisFactorDistribution = "isis.factor.distribution<-" + - "data.frame(NomFacteur=c(%s)," + - "NomDistribution=c(%s)," + - "ParametreDistribution=c(%s))"; + engine.voidEval(getIsisFactorDistribution(factors)); - // Creating the vectors. - String distribution = ""; - String parameters = ""; - String factorNames = ""; - - for (int i = 0; i < factorNumber; i++) { - Factor factor = factors.get(i); - ContinuousDomain domain = (ContinuousDomain)factor.getDomain(); - if (i != 0) { - distribution += ","; - parameters += ","; - factorNames += ","; - } - - Distribution r_distribution = domain.getDistribution(); - - distribution += "\""+ r_distribution.getInstruction() +"\""; - parameters += "\"["; - - for (Map.Entry<String,Object> param:domain.getDistributionParameters().entrySet()){ - parameters += param.getKey() + "=" + param.getValue() + ";"; - } - - parameters = StringUtils.removeEnd(parameters, ";"); - parameters += "]\""; - - factorNames += "\"" + factor.getName() + "\""; - } - - engine.voidEval(String.format(isisFactorDistribution, factorNames, - distribution, parameters)); - engine.voidEval("call<-a$call"); engine.voidEval("isis.MethodExp<-list(" +

1 0

r3841 - branches/4.0.1
by echatellier＠users.forge.codelutin.com Nov. 22, 2013

Nov. 22, 2013

Author: echatellier Date: 2013-11-22 16:31:45 +0100 (Fri, 22 Nov 2013) New Revision: 3841 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3841 Log: Add jdistlib Modified: branches/4.0.1/pom.xml Modified: branches/4.0.1/pom.xml =================================================================== --- branches/4.0.1/pom.xml 2013-11-21 21:33:33 UTC (rev 3840) +++ branches/4.0.1/pom.xml 2013-11-22 15:31:45 UTC (rev 3841) @@ -308,6 +308,12 @@ <version>1.7.4</version> </dependency> + <dependency> + <groupId>net.sourceforge</groupId> + <artifactId>jdistlib</artifactId> + <version>0.0.7</version> + </dependency> +  <dependency> <groupId>ssj</groupId>

1 0

r3840 - in branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity: . domain
by echatellier＠users.forge.codelutin.com Nov. 21, 2013

Nov. 21, 2013

Author: echatellier Date: 2013-11-21 22:33:33 +0100 (Thu, 21 Nov 2013) New Revision: 3840 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3840 Log: Uncomment setValueForIdentifier to fix compilation Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java 2013-11-21 21:33:12 UTC (rev 3839) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java 2013-11-21 21:33:33 UTC (rev 3840) @@ -52,13 +52,13 @@ */ public interface Domain extends Serializable, Cloneable { - /* + /** * Return value associated to identifier. * * @param identifier * @return found value or <tt>null</tt> if not found - * - Object getValueForIdentifier(Object identifier);*/ + */ + Object getValueForIdentifier(Object identifier); /** * Accept a new visitor. Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2013-11-21 21:33:12 UTC (rev 3839) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2013-11-21 21:33:33 UTC (rev 3840) @@ -200,15 +200,15 @@ this.value = value; } - /* + /** * Set value for label. * * @param valueIdentifier new value identifier to get - * + */ public void setValueForIdentifier(Object valueIdentifier) { identifier = valueIdentifier; value = domain.getValueForIdentifier(valueIdentifier); - }*/ + } /** * Get path. Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java 2013-11-21 21:33:12 UTC (rev 3839) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java 2013-11-21 21:33:33 UTC (rev 3840) @@ -286,18 +286,18 @@ return "FactorGroup(" + name + ")"; } - /* + /** * Set value for label. * * @param valueIdentifier new value identifier to get - * + */ @Override public void setValueForIdentifier(Object valueIdentifier) { identifier = valueIdentifier; for (Factor factor : factors) { factor.setValueForIdentifier(valueIdentifier); } - }*/ + } /** * Get the factor value for displaying (for example in R). Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2013-11-21 21:33:12 UTC (rev 3839) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2013-11-21 21:33:33 UTC (rev 3840) @@ -162,22 +162,22 @@ distributionParameters.put(name, value); } - /*@Override + @Override public Object getValueForIdentifier(Object identifier) { Double result = 0d; - if (isPercentageType()) { + /*if (isPercentageType()) { // since 3.4.0.0, operator is always * result = ((Double)referenceValue + (((Double)referenceValue * coefficient) * ((2 * (Double)identifier - 1)))); } else { result = ((Double)identifier * ((Double)maxBound - (Double)minBound)) + (Double)minBound; - } + }*/ return result; - }*/ + } /** * Accept a new visitor. Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java 2013-11-21 21:33:12 UTC (rev 3839) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java 2013-11-21 21:33:33 UTC (rev 3840) @@ -98,11 +98,11 @@ return values.size(); } - /* + /** * {@inheritDoc}. * * @throws IllegalArgumentException if identifier is not a valid key - * + */ public Object getValueForIdentifier(Object identifier) throws IllegalArgumentException { @@ -112,7 +112,7 @@ } return values.get(identifier); - }*/ + } /** * Accept a new visitor.

1 0

r3839 - branches/4.0.1/src/test/resources/test-database/sensitivityanalysis
by echatellier＠users.forge.codelutin.com Nov. 21, 2013

Nov. 21, 2013

Author: echatellier Date: 2013-11-21 22:33:12 +0100 (Thu, 21 Nov 2013) New Revision: 3839 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3839 Log: Manage uniform distributions (MM et PC) Modified: branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/Morris.java Modified: branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/Morris.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/Morris.java 2013-11-21 21:15:38 UTC (rev 3838) +++ branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/Morris.java 2013-11-21 21:33:12 UTC (rev 3839) @@ -94,7 +94,6 @@ String bsup = ""; for (int i = 0; i < factorNumber; i++) { Factor factor = factors.get(i); - ContinuousDomain domain = (ContinuousDomain) factor.getDomain(); if (i != 0) { factorNames += ","; levels += ","; @@ -109,10 +108,8 @@ gridJump += factor.getCardinality() / 2; - //binf += domain.getCalculatorMinBound(); - binf+=0; - bsup+=0; - //bsup += domain.getCalculatorMaxBound(); + binf+= getMinBound(factor); + bsup+= getMaxBound(factor); } String rInstruction = "a<-morris(model=NULL,factors=c(%s),r=%s," +

1 0