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

r3853 - branches/4.0.1/src/test/java/fr/ifremer/isisfish/vcs
by echatellier＠users.forge.codelutin.com 27 Nov '13

27 Nov '13

Author: echatellier Date: 2013-11-27 10:33:13 +0100 (Wed, 27 Nov 2013) New Revision: 3853 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3853 Log: Run test into /tmp (no other solution for now) Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java 2013-11-26 23:17:38 UTC (rev 3852) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java 2013-11-27 09:33:13 UTC (rev 3853) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2012 Ifremer, Code Lutin, Chatellier Eric + * Copyright (C) 2008 - 2013 Ifremer, Code Lutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -74,7 +74,12 @@ /** Class logger */ private static Log log = LogFactory.getLog(VCSSVNTest.class); - public static final File TMPDIR = getTestDirectory(); + /** + * Run test out of target directory for SVN to not find parent .svn with not supported svn format. + * + * FIXME echatellier 20131127 : try to relocate into target and chroot svnkit tests + */ + public static final File TMPDIR = new File("/tmp"); public static final String FILECONTENTTAG = "Version 3.1.0"; public static final String FILECONTENTTRUNK = "Version 3.2.0";

1 0

r3852 - in branches/4.0.1: . src/test/resources/fr/ifremer/isisfish/simulator
by echatellier＠users.forge.codelutin.com 26 Nov '13

26 Nov '13

Author: echatellier Date: 2013-11-27 00:17:38 +0100 (Wed, 27 Nov 2013) New Revision: 3852 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3852 Log: Anon test data Modified: branches/4.0.1/ branches/4.0.1/src/test/resources/fr/ifremer/isisfish/simulator/parameters_basic.properties branches/4.0.1/src/test/resources/fr/ifremer/isisfish/simulator/parameters_plan.properties Property changes on: branches/4.0.1 ___________________________________________________________________ Modified: svn:ignore - maven.log target velocity.log .classpath .project isis-fish.ipr isis-fish.iws isis-fish.iml .settings bin nbproject Inputs_Langoustine + maven.log target velocity.log .classpath .project isis-fish.ipr isis-fish.iws isis-fish.iml .settings bin nbproject Inputs_Langoustine .idea Modified: branches/4.0.1/src/test/resources/fr/ifremer/isisfish/simulator/parameters_basic.properties =================================================================== --- branches/4.0.1/src/test/resources/fr/ifremer/isisfish/simulator/parameters_basic.properties 2013-11-26 23:16:03 UTC (rev 3851) +++ branches/4.0.1/src/test/resources/fr/ifremer/isisfish/simulator/parameters_basic.properties 2013-11-26 23:17:38 UTC (rev 3852) @@ -38,7 +38,7 @@ rules=GraviteVPUE1,Cantonnement, useOptimization=true useStatistic=false -exportDirectory=/home/chatellier/isis-export +exportDirectory=/home/user/isis-export useSimulationPlan=false isisFishVersion=3.2.0.6 rule.1.parameter.endMonth=10 Modified: branches/4.0.1/src/test/resources/fr/ifremer/isisfish/simulator/parameters_plan.properties =================================================================== --- branches/4.0.1/src/test/resources/fr/ifremer/isisfish/simulator/parameters_plan.properties 2013-11-26 23:16:03 UTC (rev 3851) +++ branches/4.0.1/src/test/resources/fr/ifremer/isisfish/simulator/parameters_plan.properties 2013-11-26 23:17:38 UTC (rev 3852) @@ -38,7 +38,7 @@ rules=GraviteVPUE1,Cantonnement, useOptimization=true useStatistic=false -exportDirectory=/home/chatellier/isis-export +exportDirectory=/home/user/isis-export useSimulationPlan=true isisFishVersion=3.2.0.6 rule.1.parameter.endMonth=11

1 0

r3851 - branches/4.0.1/src/test/java/fr/ifremer/isisfish
by echatellier＠users.forge.codelutin.com 26 Nov '13

26 Nov '13

Author: echatellier Date: 2013-11-27 00:16:03 +0100 (Wed, 27 Nov 2013) New Revision: 3851 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3851 Log: Stupid maven Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java 2013-11-26 23:15:43 UTC (rev 3850) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java 2013-11-26 23:16:03 UTC (rev 3851) @@ -101,7 +101,7 @@ // to not ask for user for migration during test AutoMigrationIsisH2Config.setTestMigrationCallBack(); - FileUtils.copyDirectory(new File("src/test/resources/test-database"), + FileUtils.copyDirectory(new File("src/test/resources/test-database").getAbsoluteFile(), IsisFish.config.getDatabaseDirectory(), HiddenFileFilter.VISIBLE); }

1 0

r3850 - in branches/4.0.1/src/main/java/fr/ifremer/isisfish: simulator/sensitivity/domain ui/calibration
by echatellier＠users.forge.codelutin.com 26 Nov '13

26 Nov '13

Author: echatellier Date: 2013-11-27 00:15:43 +0100 (Wed, 27 Nov 2013) New Revision: 3850 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3850 Log: Stupid java 6 parser 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/ui/calibration/CalibrationHandler.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:46:47 UTC (rev 3849) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2013-11-26 23:15:43 UTC (rev 3850) @@ -222,7 +222,7 @@ Object result = null; try { result = MethodUtils.invokeStaticMethod(distClass, "quantile", args.toArray()); - } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ex) { + } catch (Exception ex) { if (log.isErrorEnabled()) { log.error("Can't invoke quantile method", ex); } 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 22:46:47 UTC (rev 3849) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/calibration/CalibrationHandler.java 2013-11-26 23:15:43 UTC (rev 3850) @@ -30,18 +30,18 @@ public class CalibrationHandler extends InputHandler { public void init(CalibrationMethodUI view) { - DefaultComboBoxModel<String> methodModel = new DefaultComboBoxModel<>(); + DefaultComboBoxModel<String> methodModel = new DefaultComboBoxModel<String>(); methodModel.addElement("Simplex"); methodModel.addElement("ABC"); methodModel.addElement("Génétique"); view.getFieldCalibrationMethodSelect().setModel(methodModel); - DefaultListModel<String> objectiveModel = new DefaultListModel<>(); + DefaultListModel<String> objectiveModel = new DefaultListModel<String>(); objectiveModel.addElement("Moindres carrés indice abondance"); objectiveModel.addElement("Moindres carrés debarquements par flottille"); view.getAvailableCalibrationObjectives().setModel(objectiveModel); - DefaultComboBoxModel<String> criteriaModel = new DefaultComboBoxModel<>(); + DefaultComboBoxModel<String> criteriaModel = new DefaultComboBoxModel<String>(); criteriaModel.addElement("Min"); criteriaModel.addElement("Max"); criteriaModel.addElement("Seuil à dépasser");

1 0

r3849 - branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity
by echatellier＠users.forge.codelutin.com 26 Nov '13

26 Nov '13

Author: echatellier Date: 2013-11-26 23:46:47 +0100 (Tue, 26 Nov 2013) New Revision: 3849 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3849 Log: Test introspection without creating entity instance Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityUtilsTest.java Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityUtilsTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityUtilsTest.java 2013-11-26 22:40:14 UTC (rev 3848) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityUtilsTest.java 2013-11-26 22:46:47 UTC (rev 3849) @@ -102,22 +102,18 @@ String className = factorName.substring(0, factorName.indexOf(".")); String propertyName = StringUtils.capitalize(factorName.substring(factorName.indexOf(".") + 1)); - // Simple method - // TopiaEntity entity = (TopiaEntity)Class.forName("fr.ifremer.isisfish.entities." + className + "Impl").newInstance(); - // Harder method // but topia context is needed by some getXXX() methods Method mStatic = IsisFishDAOHelper.class.getMethod("get" + className + "DAO", TopiaContext.class); TopiaDAO<TopiaEntity> dao = (TopiaDAO<TopiaEntity>) mStatic.invoke(null, new Object[] { context }); Assert.assertNotNull("No DOA found for factor " + factorName, dao); - TopiaEntity entity = dao.create(); // call proper property if (log.isDebugEnabled()) { log.debug(" and call get" + propertyName + "() on " + className); } - Method m = entity.getClass().getMethod("get" + propertyName); - m.invoke(entity, (Object[]) null); + Method m = dao.getEntityClass().getMethod("get" + propertyName); + Assert.assertNotNull("getter not found for " + factorName, m); } context.closeContext(); }

1 0

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

26 Nov '13

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 26 Nov '13

26 Nov '13

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 26 Nov '13

26 Nov '13

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 26 Nov '13

26 Nov '13

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 23 Nov '13

23 Nov '13

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