Isis-fish-commits
Threads by month
- ----- 2026 -----
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- 3175 discussions
r3219 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org March 30, 2011
by chatellier＠users.labs.libre-entreprise.org March 30, 2011
March 30, 2011
Author: chatellier
Date: 2011-03-30 16:16:09 +0000 (Wed, 30 Mar 2011)
New Revision: 3219
Log:
Init exception handler only if ui is launched
Modified:
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2011-03-30 14:30:41 UTC (rev 3218)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2011-03-30 16:16:09 UTC (rev 3219)
@@ -128,31 +128,6 @@
public static void main(String... args) throws Exception {
- // catch wall application exception
- Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
- public void uncaughtException(Thread t, Throwable cause) {
- if (cause instanceof LinkageError) {
- if (log.isFatalEnabled()) {
- log.fatal("Linkage error detected", cause);
- }
-
- // a real java.lang.Error sometimes happen when
- // using non recompiled script due to dependency changes
- // this is the better solution found :
- // remove isis build directory
- FileUtil.deleteRecursively(IsisFish.config.getCompileDirectory());
-
- ErrorHelper.showErrorDialog(null, _("isisfish.error.linkageerror.message"), cause);
- }
- else {
- if (log.isErrorEnabled()) {
- log.error("Global application exception", cause);
- }
- ErrorHelper.showErrorDialog(null, cause.getMessage(), cause);
- }
- }
- });
-
// permet de faire fonctionner la compilation en webstart
System.setSecurityManager(null);
@@ -612,6 +587,31 @@
public static void launchUI() {
if (config.isLaunchUI()) {
+ // catch wall application exception
+ Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
+ public void uncaughtException(Thread t, Throwable cause) {
+ if (cause instanceof LinkageError) {
+ if (log.isFatalEnabled()) {
+ log.fatal("Linkage error detected", cause);
+ }
+
+ // a real java.lang.Error sometimes happen when
+ // using non recompiled script due to dependency changes
+ // this is the better solution found :
+ // remove isis build directory
+ FileUtil.deleteRecursively(IsisFish.config.getCompileDirectory());
+
+ ErrorHelper.showErrorDialog(null, _("isisfish.error.linkageerror.message"), cause);
+ }
+ else {
+ if (log.isErrorEnabled()) {
+ log.error("Global application exception", cause);
+ }
+ ErrorHelper.showErrorDialog(null, cause.getMessage(), cause);
+ }
+ }
+ });
+
// migration must be done in UI envirronement and
// must nerver be done in caparmor
// TODO set it here for now, ui is not displayed on caparmor
1
0
March 30, 2011
Author: chatellier
Date: 2011-03-30 14:30:41 +0000 (Wed, 30 Mar 2011)
New Revision: 3218
Log:
Update changelog
Modified:
isis-fish/branches/3.3.1/changelog.txt
Modified: isis-fish/branches/3.3.1/changelog.txt
===================================================================
--- isis-fish/branches/3.3.1/changelog.txt 2011-03-30 14:26:20 UTC (rev 3217)
+++ isis-fish/branches/3.3.1/changelog.txt 2011-03-30 14:30:41 UTC (rev 3218)
@@ -1,5 +1,6 @@
isis-fish (3.3.1.0-rc1) stable; urgency=low
+ * Add view to test R configuration
* Disable charset converter (need to be retested)
* Add a new button to check all script in one action in script UI
* Improve UI to enable some fields/tabs only after region loading
@@ -11,7 +12,7 @@
* Use new Jaxx tree api
* Update i18n to 2.3.1
* Update to topia 2.5.3
- * Update to Jaxx 2.3
+ * Update to Jaxx 2.4
* Update to rSyntaxTextArea 1.5.0
* Update to svnkit 1.3.5
1
0
r3217 - in isis-fish/branches/3.3.1/src/main: java/fr/ifremer/isisfish/ui java/fr/ifremer/isisfish/ui/config resources/i18n
by chatellier＠users.labs.libre-entreprise.org March 30, 2011
by chatellier＠users.labs.libre-entreprise.org March 30, 2011
March 30, 2011
Author: chatellier
Date: 2011-03-30 14:26:20 +0000 (Wed, 30 Mar 2011)
New Revision: 3217
Log:
Add R tester UI.
Added:
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/RConfigHandler.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/RConfigUI.jaxx
Modified:
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigAction.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx
isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties
isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java 2011-03-30 11:32:50 UTC (rev 3216)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java 2011-03-30 14:26:20 UTC (rev 3217)
@@ -52,6 +52,8 @@
import fr.ifremer.isisfish.IsisConfig;
import fr.ifremer.isisfish.IsisFish;
+import fr.ifremer.isisfish.ui.config.RConfigHandler;
+import fr.ifremer.isisfish.ui.config.RConfigUI;
import fr.ifremer.isisfish.ui.config.SSHLauncherConfigUI;
import fr.ifremer.isisfish.ui.input.InputAction;
import fr.ifremer.isisfish.ui.input.InputSaveVerifier;
@@ -251,29 +253,45 @@
}
/**
+ * Display VCS config ui.
*
* @param welcomeUI parent ui
*/
public void configVCS(WelcomeUI welcomeUI) {
- VCSConfigUI vcsConfig = new VCSConfigUI();
+ VCSConfigUI vcsConfig = new VCSConfigUI(welcomeUI, welcomeUI);
vcsConfig.pack();
- org.nuiton.widget.SwingUtil.center(vcsConfig);
+ vcsConfig.setLocationRelativeTo(welcomeUI);
vcsConfig.setVisible(true);
}
/**
+ * Display ssh launcher config ui.
*
* @param welcomeUI parent ui
*/
public void configurationSSHLauncher(WelcomeUI welcomeUI) {
- SSHLauncherConfigUI configUI = new SSHLauncherConfigUI();
+ SSHLauncherConfigUI configUI = new SSHLauncherConfigUI(welcomeUI, welcomeUI);
configUI.pack();
configUI.setSize(600, configUI.getHeight());
- org.nuiton.widget.SwingUtil.center(configUI);
+ configUI.setLocationRelativeTo(welcomeUI);
configUI.setVisible(true);
}
/**
+ * Display R config tester UI.
+ *
+ * @param welcomeUI parent ui
+ */
+ public void configurationR(WelcomeUI welcomeUI) {
+ RConfigUI rconfigUI = new RConfigUI(welcomeUI, welcomeUI);
+ RConfigHandler handler = rconfigUI.getHandler();
+ handler.init(rconfigUI);
+ rconfigUI.pack();
+ rconfigUI.setLocationRelativeTo(welcomeUI);
+ rconfigUI.setVisible(true);
+ }
+
+ /**
* Open url using default system browser.
*
* @param welcomeUI parent ui
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2011-03-30 11:32:50 UTC (rev 3216)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2011-03-30 14:26:20 UTC (rev 3217)
@@ -50,6 +50,7 @@
<JMenuItem text="isisfish.welcome.menu.configuration" onActionPerformed='getHandler().config(this)'/>
<JMenuItem text="isisfish.welcome.menu.configuration.vcs" onActionPerformed='getHandler().configVCS(this)' enabled="false"/>
<JMenuItem text="isisfish.welcome.menu.configuration.sshlauncher" onActionPerformed='getHandler().configurationSSHLauncher(this)'/>
+ <JMenuItem text="isisfish.welcome.menu.configuration.r" onActionPerformed='getHandler().configurationR(this)'/>
</JMenu>
<JMenu text="isisfish.welcome.menu.help">
<JMenuItem text="isisfish.welcome.menu.help.isisfish" onActionPerformed='getHandler().help(this, "ISISFISH")'/>
Added: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/RConfigHandler.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/RConfigHandler.java (rev 0)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/RConfigHandler.java 2011-03-30 14:26:20 UTC (rev 3217)
@@ -0,0 +1,122 @@
+/*
+ * #%L
+ *
+ *
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/gpl-2.0.html>.
+ * #L%
+ */
+
+package fr.ifremer.isisfish.ui.config;
+
+import static org.nuiton.i18n.I18n._;
+
+import java.awt.Color;
+import java.io.File;
+
+import javax.swing.JOptionPane;
+
+import org.apache.commons.lang.StringUtils;
+import org.nuiton.j2r.REngine;
+import org.nuiton.j2r.RException;
+import org.nuiton.j2r.RProxy;
+
+/**
+ * Handler for R Configuration UI.
+ *
+ * @author chatellier
+ * @version $Revision$
+ *
+ * Last update : $Date$
+ * By : $Author$
+ */
+public class RConfigHandler {
+
+ /**
+ * Initialise l'ui.
+ *
+ * @param rconfigUI ui to init
+ */
+ public void init(RConfigUI rconfigUI) {
+ String rHome = System.getenv("R_HOME");
+ rconfigUI.getRHomeField().setText(rHome);
+ if (StringUtils.isBlank(rHome)) {
+ rconfigUI.getRHomeField().setBackground(Color.RED);
+ }
+
+ String rType = System.getProperty("R.type");
+ rconfigUI.getRTypeField().setText(rType);
+ if (!"net".equals(rType) && !"jni".equals(rType)) {
+ rconfigUI.getRTypeField().setBackground(Color.RED);
+ }
+
+ // sur windows c'est potentielement ca
+ // sur linux, c'est pas possible
+ String systemPath = System.getenv("PATH");
+ String rBinPath = rHome + File.separator + "bin";
+ if (systemPath.contains(rBinPath)) {
+ rconfigUI.getSystemPathField().setBackground(Color.GREEN.brighter());
+ rconfigUI.getSystemPathField().setText(_("isisfish.simulator.configuration.r.systempathok", rBinPath));
+ }
+ else {
+ rconfigUI.getSystemPathField().setBackground(Color.RED);
+ rconfigUI.getSystemPathField().setText(_("isisfish.simulator.configuration.r.systempathnok", rBinPath));
+ }
+ rconfigUI.getSystemPathField().setToolTipText(systemPath);
+ }
+
+ /**
+ * Test r configuration.
+ *
+ * @param rconfigUI
+ */
+ public void testRCOnfiguration(RConfigUI rconfigUI) {
+ REngine engine = null;
+ try {
+ engine = new RProxy();
+
+ boolean error = false;
+ try {
+ engine.eval("library('lhs')");
+ }
+ catch (RException ex) {
+ JOptionPane.showMessageDialog(rconfigUI, _("isisfish.simulator.configuration.r.lhsnotinstalled"),
+ _("isisfish.simulator.configuration.r.title"), JOptionPane.ERROR_MESSAGE);
+ error = true;
+ }
+ try {
+ engine.eval("library('sensitivity')");
+ }
+ catch (RException ex) {
+ JOptionPane.showMessageDialog(rconfigUI, _("isisfish.simulator.configuration.r.sensitivitynotinstalled"),
+ _("isisfish.simulator.configuration.r.title"), JOptionPane.ERROR_MESSAGE);
+ error = true;
+ }
+
+ if (!error) {
+ JOptionPane.showMessageDialog(rconfigUI, _("isisfish.simulator.configuration.r.testok"),
+ _("isisfish.simulator.configuration.r.title"), JOptionPane.INFORMATION_MESSAGE);
+ }
+ }
+ catch (RException ex) {
+ JOptionPane.showMessageDialog(rconfigUI, _("isisfish.simulator.configuration.r.cantinit", ex.getMessage()),
+ _("isisfish.simulator.configuration.r.title"), JOptionPane.ERROR_MESSAGE);
+ }
+ }
+}
Property changes on: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/RConfigHandler.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/RConfigUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/RConfigUI.jaxx (rev 0)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/RConfigUI.jaxx 2011-03-30 14:26:20 UTC (rev 3217)
@@ -0,0 +1,68 @@
+<!--
+ #%L
+ IsisFish
+
+ $Id$
+ $HeadURL$
+ %%
+ Copyright (C) 2011 Ifremer, CodeLutin, Chatellier Eric
+ %%
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as
+ published by the Free Software Foundation, either version 2 of the
+ License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public
+ License along with this program. If not, see
+ <http://www.gnu.org/licenses/gpl-2.0.html>.
+ #L%
+ -->
+<JDialog title="isisfish.simulator.configuration.r.title" layout="{new BorderLayout()}">
+ <RConfigHandler id="handler" />
+ <Table constraints="BorderLayout.CENTER">
+ <row>
+ <cell columns="2">
+ <JLabel text="isisfish.simulator.configuration.r.details" />
+ </cell>
+ </row>
+ <row>
+ <cell>
+ <JLabel text="isisfish.simulator.configuration.r.rhome" />
+ </cell>
+ <cell weightx="1.0" fill='horizontal'>
+ <JTextField id="rHomeField" editable="false" />
+ </cell>
+ </row>
+ <row>
+ <cell>
+ <JLabel text="isisfish.simulator.configuration.r.rtype" />
+ </cell>
+ <cell fill='horizontal'>
+ <JTextField id="rTypeField" editable="false" />
+ </cell>
+ </row>
+ <row>
+ <cell>
+ <JLabel text="isisfish.simulator.configuration.r.systempath" />
+ </cell>
+ <cell fill='horizontal'>
+ <JTextField id="systemPathField" editable="false" />
+ </cell>
+ </row>
+ <row>
+ <cell columns="2" anchor='center'>
+ <JPanel>
+ <JButton text="isisfish.simulator.configuration.r.launchtest"
+ onActionPerformed="getHandler().testRCOnfiguration(this)" />
+ <JButton text="isisfish.common.close"
+ onActionPerformed="dispose()" />
+ </JPanel>
+ </cell>
+ </row>
+ </Table>
+</JDialog>
\ No newline at end of file
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigAction.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigAction.java 2011-03-30 11:32:50 UTC (rev 3216)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigAction.java 2011-03-30 14:26:20 UTC (rev 3217)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2010 Ifremer, Code Lutin, Chatellier Eric
+ * Copyright (C) 2009 - 2011 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
@@ -46,7 +46,6 @@
import com.jcraft.jsch.Session;
import fr.ifremer.isisfish.IsisFish;
-import fr.ifremer.isisfish.ui.input.InputAction;
import fr.ifremer.isisfish.util.ssh.InvalidPassphraseException;
import fr.ifremer.isisfish.util.ssh.SSHAgent;
import fr.ifremer.isisfish.util.ssh.SSHException;
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx 2011-03-30 11:32:50 UTC (rev 3216)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx 2011-03-30 14:26:20 UTC (rev 3217)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2009 - 2010 Ifremer, CodeLutin
+ Copyright (C) 2009 - 2011 Ifremer, CodeLutin, 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
Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties
===================================================================
--- isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties 2011-03-30 11:32:50 UTC (rev 3216)
+++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties 2011-03-30 14:26:20 UTC (rev 3217)
@@ -96,6 +96,7 @@
isisfish.common.cancel=Cancel
isisfish.common.check=Check
isisfish.common.clear=Clear
+isisfish.common.close=Close
isisfish.common.confirm=Confirm
isisfish.common.date=Date
isisfish.common.debug=debug
@@ -949,6 +950,18 @@
isisfish.simulation.remote.message.waitingstart=Waiting for simulation start
isisfish.simulation.restarting=Restarting...
isisfish.simulation.title=Simulation launcher
+isisfish.simulator.configuration.r.cantinit=Can't init R \: %s
+isisfish.simulator.configuration.r.details=This window display current system R configuration and can be used to test if R is successfully installed.
+isisfish.simulator.configuration.r.launchtest=Test
+isisfish.simulator.configuration.r.lhsnotinstalled=LHS library not installed \!
+isisfish.simulator.configuration.r.rhome=R_HOME
+isisfish.simulator.configuration.r.rtype=R.type
+isisfish.simulator.configuration.r.sensitivitynotinstalled=Sensitivity library not installed \!
+isisfish.simulator.configuration.r.systempath=PATH
+isisfish.simulator.configuration.r.systempathnok=Path doesn't contains R bin directory (%s)
+isisfish.simulator.configuration.r.systempathok=Path contains R bin directory (%s)
+isisfish.simulator.configuration.r.testok=R successfully tested \!
+isisfish.simulator.configuration.r.title=R Configuration
isisfish.simulator.launcher.inprocess=in current process
isisfish.simulator.launcher.remote=on Caparmor server
isisfish.simulator.launcher.subprocess=in subprocess
@@ -1084,8 +1097,9 @@
isisfish.welcome.menu.api=API
isisfish.welcome.menu.close=Close
isisfish.welcome.menu.configuration=Configuration
+isisfish.welcome.menu.configuration.r=R configuration
isisfish.welcome.menu.configuration.sshlauncher=Caparmor configuration
-isisfish.welcome.menu.configuration.vcs=VCS Configuration
+isisfish.welcome.menu.configuration.vcs=VCS configuration
isisfish.welcome.menu.file=File
isisfish.welcome.menu.frame=Window
isisfish.welcome.menu.help=Help
Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties
===================================================================
--- isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-03-30 11:32:50 UTC (rev 3216)
+++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-03-30 14:26:20 UTC (rev 3217)
@@ -96,6 +96,7 @@
isisfish.common.cancel=Annuler
isisfish.common.check=V\u00E9rifier
isisfish.common.clear=Effacer
+isisfish.common.close=Fermer
isisfish.common.confirm=Confirmation
isisfish.common.date=Date
isisfish.common.debug=Debug
@@ -949,6 +950,18 @@
isisfish.simulation.remote.message.waitingstart=Attente du d\u00E9marrage de la simulation
isisfish.simulation.restarting=Red\u00E9marrage...
isisfish.simulation.title=Lanceur de simulation
+isisfish.simulator.configuration.r.cantinit=Impossible d'initialiser R \: %s
+isisfish.simulator.configuration.r.details=Cet \u00E9cran affiche la configuration syst\u00E8me actuelle de R et permet de tester si un appel simple \u00E0 R fonctionne.
+isisfish.simulator.configuration.r.launchtest=Tester
+isisfish.simulator.configuration.r.lhsnotinstalled=La librairie 'lhs' n'est pas install\u00E9e \!
+isisfish.simulator.configuration.r.rhome=R_HOME
+isisfish.simulator.configuration.r.rtype=R.type
+isisfish.simulator.configuration.r.sensitivitynotinstalled=La librairie 'sensitivity' n'est pas install\u00E9e \!
+isisfish.simulator.configuration.r.systempath=PATH
+isisfish.simulator.configuration.r.systempathnok=Le path ne contient pas le dossier bin de R (%s)
+isisfish.simulator.configuration.r.systempathok=Le path contient le dossier bin de R (%s)
+isisfish.simulator.configuration.r.testok=R test\u00E9 avec succ\u00E8s \!
+isisfish.simulator.configuration.r.title=Configuration de R
isisfish.simulator.launcher.inprocess=dans le m\u00EAme processus
isisfish.simulator.launcher.remote=sur le serveur Caparmor
isisfish.simulator.launcher.subprocess=dans un sous processus
@@ -1084,6 +1097,7 @@
isisfish.welcome.menu.api=API
isisfish.welcome.menu.close=Fermer
isisfish.welcome.menu.configuration=Configuration
+isisfish.welcome.menu.configuration.r=Configuration R
isisfish.welcome.menu.configuration.sshlauncher=Configuration Caparmor
isisfish.welcome.menu.configuration.vcs=Configuration vcs
isisfish.welcome.menu.file=Fichier
1
0
r3216 - isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org March 30, 2011
by chatellier＠users.labs.libre-entreprise.org March 30, 2011
March 30, 2011
Author: chatellier
Date: 2011-03-30 11:32:50 +0000 (Wed, 30 Mar 2011)
New Revision: 3216
Log:
Fix test
Modified:
isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java
Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2011-03-29 16:01:45 UTC (rev 3215)
+++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2011-03-30 11:32:50 UTC (rev 3216)
@@ -418,7 +418,7 @@
String preScriptContent = service.generatePreScript(scenario1);
log.info("Script = " + preScriptContent);
- Assert.assertTrue(preScriptContent.contains("params.setProperty(\"parameters.population.xxx\""));
+ Assert.assertTrue(preScriptContent.contains("params.setProperty(\"population.xxx.number\""));
Assert.assertTrue(preScriptContent.contains("params.setProperty(\"rule.0.parameter.species\",\"fr.ifremer.isisfish.entities.Species#1169028645830#0.022262364425031378\");"));
Assert.assertTrue(preScriptContent.contains("params.setProperty(\"rule.1.parameter.propSurvie\",\"42.0\");"));
Assert.assertTrue(preScriptContent.contains("rules\",\"TACpoids,TailleMin\")"));
1
0
r3215 - in isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish: simulator/launcher ui/models/rule ui/sensitivity ui/simulator ui/widget/editor
by chatellier＠users.labs.libre-entreprise.org March 29, 2011
by chatellier＠users.labs.libre-entreprise.org March 29, 2011
March 29, 2011
Author: chatellier
Date: 2011-03-29 16:01:45 +0000 (Tue, 29 Mar 2011)
New Revision: 3215
Log:
Fix rule factor edition (params).
Fix initial population factors.
Modified:
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersTableCellEditor.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizardUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooser.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterTableCellEditor.java
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-03-29 15:32:40 UTC (rev 3214)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-03-29 16:01:45 UTC (rev 3215)
@@ -53,6 +53,7 @@
import org.apache.commons.lang.time.DurationFormatUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.nuiton.math.matrix.MatrixND;
import org.nuiton.topia.TopiaContext;
import org.nuiton.topia.TopiaException;
import org.nuiton.util.FileUtil;
@@ -535,8 +536,13 @@
// cas special 1 : population de départ
if (factor.getPath().startsWith("parameters.population.")) {
- Object stringValue = beanUtils.convert(factor.getValue());
- buffer.append("params.setProperty(\"").append(factor.getPath()).append("\",\"").append(stringValue).append("\");\n");
+ String paramName = StringUtils.removeStart(factor.getPath(), "parameters.");
+ paramName += ".number";
+ // pas de convert, c'est fait comme ca dans
+ // SimulationParameters.toProperties();
+ MatrixND matrix = (MatrixND)factor.getValue();
+ Object stringValue = String.valueOf(matrix.toList());
+ buffer.append("params.setProperty(\"").append(paramName).append("\",\"").append(stringValue).append("\");\n");
}
// cas special 2 : regles
else if (factor.getPath().equals("parameters.rules")) {
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersTableCellEditor.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersTableCellEditor.java 2011-03-29 15:32:40 UTC (rev 3214)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersTableCellEditor.java 2011-03-29 16:01:45 UTC (rev 3215)
@@ -57,8 +57,6 @@
* @param rule rule
*/
public RuleParametersTableCellEditor(Rule rule) {
- super();
-
this.rule = rule;
ruleParametersTypes = new ArrayList<Class<?>>();
//TODO map may be sorted
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizardUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizardUI.jaxx 2011-03-29 15:32:40 UTC (rev 3214)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizardUI.jaxx 2011-03-29 16:01:45 UTC (rev 3215)
@@ -43,7 +43,7 @@
<SensitivityInputHandler id="handler" />
- <Boolean id='continuePossible' javaBean='true'/>
+ <Boolean id='continuePossible' javaBean='false'/>
<Boolean id='continueSelected' javaBean='false'/>
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx 2011-03-29 15:32:40 UTC (rev 3214)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx 2011-03-29 16:01:45 UTC (rev 3215)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2009 - 2010 Ifremer, CodeLutin
+ Copyright (C) 2009 - 2011 Ifremer, CodeLutin, 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
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2011-03-29 15:32:40 UTC (rev 3214)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2011-03-29 16:01:45 UTC (rev 3215)
@@ -49,6 +49,7 @@
fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorParametersTableModel;
java.awt.CardLayout
javax.swing.ComboBoxModel
+ fr.ifremer.isisfish.datastore.RegionStorage;
</import>
<script><![CDATA[
@@ -212,7 +213,7 @@
exportParamsTable.setModel(model);
exportParamsTable.getColumnModel().getColumn(0).setCellRenderer(new SensitivityExportParametersTableCellRenderer(export));
SensitivityExportParametersTableCellEditor cellEditor = new SensitivityExportParametersTableCellEditor(export);
- cellEditor.setRegion(simulAction.getRegionStorage());
+ cellEditor.setRegionStorage(getContextValue(RegionStorage.class));
exportParamsTable.getColumnModel().getColumn(1).setCellEditor(cellEditor);
}
else {
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2011-03-29 15:32:40 UTC (rev 3214)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2011-03-29 16:01:45 UTC (rev 3215)
@@ -3,7 +3,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2011 Codelutin, Chatellier Eric
+ * Copyright (C) 2011 Ifremer, Codelutin, 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
@@ -29,20 +29,15 @@
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseEvent;
-import java.io.Serializable;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
import java.util.SortedMap;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
import javax.swing.JComponent;
-import javax.swing.JList;
import javax.swing.JMenuItem;
import javax.swing.JOptionPane;
import javax.swing.JPopupMenu;
-import javax.swing.JRadioButton;
import javax.swing.JScrollPane;
import javax.swing.JTextField;
import javax.swing.event.TreeSelectionEvent;
@@ -52,7 +47,6 @@
import javax.swing.tree.TreePath;
import jaxx.runtime.context.JAXXInitialContext;
-import jaxx.runtime.swing.editor.NumberEditor;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
@@ -60,7 +54,6 @@
import org.nuiton.math.matrix.MatrixND;
import org.nuiton.math.matrix.gui.MatrixPanelEditor;
import org.nuiton.topia.TopiaContext;
-import org.nuiton.topia.TopiaException;
import org.nuiton.topia.persistence.TopiaEntity;
import org.nuiton.topia.persistence.TopiaEntityContextable;
@@ -81,14 +74,6 @@
import fr.ifremer.isisfish.ui.input.InputAction;
import fr.ifremer.isisfish.ui.input.InputContentUI;
import fr.ifremer.isisfish.ui.input.InputHandler;
-import fr.ifremer.isisfish.ui.input.InputOneEquationUI;
-import fr.ifremer.isisfish.ui.input.MetierSeasonInfoSpeciesEditorUI;
-import fr.ifremer.isisfish.ui.input.PopulationMigrationEmigrationUI;
-import fr.ifremer.isisfish.ui.input.PopulationMigrationImmigrationUI;
-import fr.ifremer.isisfish.ui.input.PopulationMigrationMigrationUI;
-import fr.ifremer.isisfish.ui.input.PopulationZonesEditorUI;
-import fr.ifremer.isisfish.ui.input.SelectivityEditorUI;
-import fr.ifremer.isisfish.ui.input.SpeciesStructuredUI;
import fr.ifremer.isisfish.ui.input.tree.FisheryDataProvider;
import fr.ifremer.isisfish.ui.input.tree.FisheryTreeHelper;
import fr.ifremer.isisfish.ui.input.tree.FisheryTreeNode;
@@ -135,7 +120,6 @@
// global context value : fisheryRegion, regionStorage, treeHelper
sensitivityTabUI.setContextValue(fisheryRegion);
- //sensitivityTabUI.setContextValue(regionStorage);
sensitivityTabUI.setContextValue(treeHelper);
sensitivityTabUI.setContextValue(model);
sensitivityTabUI.setContextValue(fisheryRegion.getTopiaContext());
@@ -289,42 +273,21 @@
protected void factorSelected(SensitivityTabUI sensitivityTabUI) {
// get selected factor
TreePath selectedPath = sensitivityTabUI.getFactorsTree().getSelectionPath();
- Object[] pathWay = selectedPath.getPath();
- Object selectedObject = pathWay[pathWay.length - 1];
-
- if (selectedObject != null) {
- if (!(selectedObject instanceof FactorGroup)) {
- Factor selectedFactor = (Factor)selectedObject;
- FactorWizardUI factorWizardUI = new FactorWizardUI(sensitivityTabUI);
- SensitivityInputHandler handler = factorWizardUI.getHandler();
- /*JComponent component = sensitivityTabUI.getSimulAction().getFactorComponent(selectedFactor);
- if (component != null) {
- wizard.initExisting(component, selectedFactor);
- wizard.pack();
- wizard.setLocationRelativeTo(sensitivityTabUI);
- wizard.setVisible(true);
+
+ // method appelee au clic, donc pas forcement de selection
+ if (selectedPath != null) {
+ Object[] pathWay = selectedPath.getPath();
+ Object selectedObject = pathWay[pathWay.length - 1];
+ if (selectedObject != null) {
+ if (!(selectedObject instanceof FactorGroup)) {
+ Factor selectedFactor = (Factor)selectedObject;
+ FactorWizardUI factorWizardUI = new FactorWizardUI(sensitivityTabUI);
+ SensitivityInputHandler handler = factorWizardUI.getHandler();
+ handler.initExistingFactor(factorWizardUI, selectedFactor);
+ factorWizardUI.pack();
+ factorWizardUI.setLocationRelativeTo(sensitivityTabUI.getFactorsTree());
+ factorWizardUI.setVisible(true);
}
- else {*/
-
- // cas d'un rechargement de simulation
- // le facteur n'a pas d'instance de composant associé
- // method 2
- //JComponent component2 = EditorHelper.getEditorForFactor(selectedFactor, sensitivityTabUI.getFisheryRegion().getTopiaContext());
- //if (component2 != null) {
- //if (log.isDebugEnabled()) {
- // log.debug("Component found is " + component2);
- //}
- handler.initExistingFactor(factorWizardUI, selectedFactor);
- factorWizardUI.pack();
- factorWizardUI.setLocationRelativeTo(sensitivityTabUI.getFactorsTree());
- factorWizardUI.setVisible(true);
- //}
- /*else {
- if (log.isDebugEnabled()) {
- log.debug("No component found, skip edition of factor " + selectedFactor.getName());
- }
- }*/
- //}
}
}
}
@@ -458,7 +421,7 @@
cache = o;
JComponent c = null;
if (o != null) {
- c = getEditorWithValue(dDomain, o);
+ c = getEditorWithValue(factorWizardUI, dDomain, o);
}
else {
if (log.isWarnEnabled()) {
@@ -636,6 +599,8 @@
* Get copy of component with original entity value as default value.
*
* @param value value
+ * @param bean bean
+ * @param property property
* @return component copy
*/
public ContinuousPanelContainerUI getContinuousPanel(Object value, TopiaEntityContextable bean, String property) {
@@ -760,12 +725,13 @@
/**
* Get editor for value (discrete).
*
+ * @param factorWizardUI context for context value (RegionStorage)
* @param value type to get editor
* @param factorPath for equation
* @param context for equation
* @return component
*/
- protected JComponent getEditorWithValue(Domain domain, Object value) {
+ protected JComponent getEditorWithValue(FactorWizardUI factorWizardUI, Domain domain, Object value) {
JComponent result = null;
@@ -782,7 +748,7 @@
((MatrixPanelEditor)result).setMatrix((MatrixND)value);
}
else if (domain instanceof RuleDomain) {
- result = new RuleChooser();
+ result = new RuleChooser(factorWizardUI);
((RuleChooser)result).setRulesList((List<Rule>)value);
}
else if (value instanceof String) {
@@ -842,7 +808,7 @@
// dans ce cas c'est des regles ou pop de départ
if (factorPath.equals("parameters.rules")) {
- result = new RuleChooser();
+ result = new RuleChooser(factorWizardUI);
}
else if (factorPath.startsWith("parameters.population.")) {
// todo
@@ -890,14 +856,13 @@
protected void saveContinue(String name,
String comment, String path, ContinuousPanelContainerUI panel,
SimulAction action, boolean exist) {
- System.out.println(" panel = " + panel);
DefaultContinuousPanelUI defaultPanel = null;
if (panel instanceof MatrixContinuousPanelUI) {
MatrixContinuousPanelUI matrixPanel = (MatrixContinuousPanelUI) panel;
Double coef = Double.valueOf(matrixPanel.getCoef().getText()) / 100;
- MatrixND matrix = matrixPanel.getMatrix();
- String operateur = (String) matrixPanel.getOperator()
- .getSelectedItem();
+ //MatrixND matrix = matrixPanel.getMatrix();
+ MatrixND matrix = matrixPanel.getComponentPanel().getMatrix();
+ String operateur = (String)matrixPanel.getOperator().getSelectedItem();
action.addContinuousMatrixFactor(name, comment, path, coef, matrix,
operateur, exist);
@@ -970,9 +935,9 @@
protected void saveDiscret(String name,
String comment, String path, List<JComponent> components,
SimulAction action, boolean exist) {
- List<Serializable> values = new ArrayList<Serializable>();
+ List<Object> values = new ArrayList<Object>();
for (JComponent c : components) {
- values.add((Serializable) getComponentValue(c));
+ values.add(getComponentValue(c));
}
action.addDiscreteFactor(name, comment, path, values, exist);
}
@@ -991,7 +956,9 @@
result = ((MatrixPanelEditor) component).getMatrix();
} /*else if (component instanceof InputOneEquationUI) {
result = ((InputOneEquationUI) component).getEditor().getText();*/
-
+ else if (component instanceof RuleChooser) {
+ result = ((RuleChooser)component).getRulesList();
+ }
if (log.isDebugEnabled()) {
log.debug("Value for component : " + component.getClass().getSimpleName() + " is " + result);
}
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2011-03-29 15:32:40 UTC (rev 3214)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2011-03-29 16:01:45 UTC (rev 3215)
@@ -152,7 +152,7 @@
protected void setSensitivityTabRegion() {
if (isSensitivity()) {
try {
- // FIXME this transation in nerver closed
+ // FIXME this transation in never closed
TopiaContext tx = simulAction.getRegionStorage().getStorage().beginTransaction();
FisheryRegion fisheryRegion = RegionStorage.getFisheryRegion(tx);
getParentContainer(SensitivityUI.class).getSensitivityTabUI().setFisheryRegion(fisheryRegion);
@@ -495,7 +495,7 @@
<Table>
<row>
<cell fill="both" weightx="1" weighty="1">
- <RuleChooser id="ruleChooser"
+ <RuleChooser id="ruleChooser" constructorParams='this'
active="{getRegionStorage() != null}" />
</cell>
<cell>
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooser.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooser.jaxx 2011-03-29 15:32:40 UTC (rev 3214)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooser.jaxx 2011-03-29 16:01:45 UTC (rev 3215)
@@ -32,6 +32,8 @@
<Boolean id="active" javaBean="true"/>
<import>
+ java.beans.PropertyChangeEvent;
+ java.beans.PropertyChangeListener;
fr.ifremer.isisfish.IsisFishException;
fr.ifremer.isisfish.datastore.RuleStorage;
fr.ifremer.isisfish.rule.Rule;
@@ -40,8 +42,6 @@
fr.ifremer.isisfish.ui.models.rule.RuleParametersTableCellEditor;
fr.ifremer.isisfish.ui.models.rule.RuleParametersTableCellRenderer;
fr.ifremer.isisfish.ui.util.ErrorHelper;
- java.beans.PropertyChangeEvent;
- java.beans.PropertyChangeListener;
fr.ifremer.isisfish.datastore.RegionStorage;
</import>
@@ -114,7 +114,7 @@
RuleParametersTableModel model = new RuleParametersTableModel(selectedRule);
selectedRuleParameterTable.setModel(model);
RuleParametersTableCellEditor cellEditor = new RuleParametersTableCellEditor(selectedRule);
- cellEditor.setRegion(getContextValue(RegionStorage.class));
+ cellEditor.setRegionStorage(getContextValue(RegionStorage.class));
RuleParametersTableCellRenderer cellRenderer = new RuleParametersTableCellRenderer(selectedRule);
selectedRuleParameterTable.getColumnModel().getColumn(0).setCellRenderer(cellRenderer);
selectedRuleParameterTable.getColumnModel().getColumn(1).setCellEditor(cellEditor);
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx 2011-03-29 15:32:40 UTC (rev 3214)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx 2011-03-29 16:01:45 UTC (rev 3215)
@@ -24,6 +24,7 @@
-->
<Table>
<import>
+ java.awt.Dimension
javax.swing.table.DefaultTableModel;
fr.ifremer.isisfish.datastore.AnalysePlanStorage;
fr.ifremer.isisfish.datastore.StorageChangeEvent;
@@ -36,7 +37,7 @@
fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanParametersTableModel;
fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanParametersTableCellEditor;
fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanParametersTableCellRenderer;
- java.awt.Dimension
+ fr.ifremer.isisfish.datastore.RegionStorage;
</import>
<SimulAction id='simulAction' javaBean='getContextValue(SimulAction.class)' />
@@ -124,7 +125,7 @@
AnalyzePlanParametersTableModel model = new AnalyzePlanParametersTableModel(selectedAnalyzePlan);
simulParamsAnalysePlans.setModel(model);
AnalyzePlanParametersTableCellEditor cellEditor = new AnalyzePlanParametersTableCellEditor(selectedAnalyzePlan);
- cellEditor.setRegion(simulAction.getRegionStorage());
+ cellEditor.setRegionStorage(getContextValue(RegionStorage.class));
simulParamsAnalysePlans.getColumnModel().getColumn(0).setCellRenderer(new AnalyzePlanParametersTableCellRenderer(selectedAnalyzePlan));
simulParamsAnalysePlans.getColumnModel().getColumn(1).setCellEditor(cellEditor);
}
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2011-03-29 15:32:40 UTC (rev 3214)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2011-03-29 16:01:45 UTC (rev 3215)
@@ -264,6 +264,7 @@
*/
public void regionChange(ParamsUI paramsUI, String regionName) {
regionStorage = RegionStorage.getRegion(regionName);
+ paramsUI.getParentContainer(SimulationUI.class).setContextValue(regionStorage);
paramsUI.getParentContainer(SimulationUI.class).setRegionStorage(regionStorage);
param.setRegionName(regionName);
}
@@ -906,17 +907,27 @@
}
public void addDiscreteFactor(String name, String comment, String path,
- List<Serializable> values, boolean exist) {
+ List<Object> values, boolean exist) {
Factor f = new Factor(name);
- DiscreteDomain domain = new DiscreteDomain();
- int i = 0;
- for (Serializable value : values) {
+ DiscreteDomain domain = null;
+ // FIXME echatellier gere le path mieux que ca
+ if ("parameters.rules".equals(path)) {
+ domain = new RuleDomain();
+ }
+ else {
+ domain = new DiscreteDomain();
+ }
+
+ SortedMap<Object, Object> domainValues = new TreeMap<Object, Object>();
+ int label = 0;
+ for (Object value : values) {
// FIXME test when integer
// Don't work with String ;(
- domain.getValues().put(i, value);
+ domainValues.put(label, value);
// and start at 0
- i++;
+ label++;
}
+ domain.setValues(domainValues);
f.setDomain(domain);
f.setComment(comment);
f.setPath(path);
@@ -1250,7 +1261,7 @@
SensitivityInputHandler handler = wizard.getHandler();
handler.initExistingFactor(wizard, selectedFactor);
wizard.pack();
- wizard.setLocationRelativeTo(source);
+ wizard.setLocationRelativeTo(paramsUI);
wizard.setVisible(true);
}
}
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterTableCellEditor.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterTableCellEditor.java 2011-03-29 15:32:40 UTC (rev 3214)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterTableCellEditor.java 2011-03-29 16:01:45 UTC (rev 3215)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2006 - 2010 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin
+ * Copyright (C) 2006 - 2011 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, 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
@@ -56,8 +56,6 @@
import fr.ifremer.isisfish.util.ConverterUtil;
/**
- * ParameterTableCellEditor.
- *
* Un editeur generic de champs qui se base sur le model de données
* a editer.
*
@@ -77,7 +75,7 @@
/** Class logger. */
private static Log log = LogFactory.getLog(ParameterTableCellEditor.class);
- protected RegionStorage region = null;
+ protected RegionStorage regionStorage = null;
protected Component editor = null;
@@ -122,18 +120,24 @@
}
/**
- * @return Returns the topiaContext.
+ * Return region storage.
+ *
+ * @return returns the region storage.
*/
public RegionStorage getRegion() {
- return this.region;
+ return regionStorage;
}
/**
- * @param region
- * The topiaContext to set.
+ * Set region storage.
+ *
+ * @param regionStorage the region storage to set.
*/
- public void setRegion(RegionStorage region) {
- this.region = region;
+ public void setRegionStorage(RegionStorage regionStorage) {
+ this.regionStorage = regionStorage;
+ if (regionStorage == null && log.isWarnEnabled()) {
+ log.warn("setRegionStorage called with null value in parameters table cell editor");
+ }
}
public Component getTableCellEditorComponent(JTable table, Object value,
@@ -149,10 +153,10 @@
case Topia:
// on a un bean comme parametre
try {
- if (region == null) {
+ if (regionStorage == null) {
return null;
}
- TopiaContext context = region.getStorage().beginTransaction();
+ TopiaContext context = regionStorage.getStorage().beginTransaction();
if (context != null) {
List list = context.find("from " + type.getName());
c = new JComboBox(list.toArray());
@@ -184,14 +188,11 @@
}
int month = date.getMonth().getMonthNumber();
int yea = date.getYear();
- editor = new DateComponent(month, yea, region == null ? null : region
- .getStorage());
+ editor = new DateComponent(month, yea);
//editor = new JTextField(String.valueOf(date.getDate()));
break;
case Mounth:
- editor = DateComponent.createMounthCombo(((Month) value)
- .getMonthNumber(), region == null ? null : region
- .getStorage());
+ editor = DateComponent.createMounthCombo(((Month) value).getMonthNumber());
break;
case File:
// break;
@@ -287,8 +288,9 @@
}
if (result instanceof String && !String.class.equals(type)) {
- if (region != null)
- context = region.getStorage();
+ if (regionStorage != null) {
+ context = regionStorage.getStorage();
+ }
ConvertUtilsBean cub = ConverterUtil.getConverter(context);
result = cub.convert((String) result, type);
}
@@ -321,10 +323,10 @@
protected JComboBox year;
- public DateComponent(int mounth, int year, TopiaContext context) {
+ public DateComponent(int mounth, int year) {
super(new GridLayout(0, 2));
- this.mounth = createMounthCombo(mounth, context);
+ this.mounth = createMounthCombo(mounth);
this.year = createYearCombo(200, year);
this.add(this.mounth);
@@ -355,48 +357,19 @@
public int getSelectedValue() {
int selectedYear = getSelectedYear();
int selectedMounth = getSelectedMounth();
- if (log.isInfoEnabled()) {
- log.info("selected mounth " + selectedMounth);
- log.info("selected year " + selectedYear);
+ if (log.isDebugEnabled()) {
+ log.debug("selected mounth " + selectedMounth);
+ log.debug("selected year " + selectedYear);
}
return selectedMounth + selectedYear * 12;
}
- public static JComboBox createMounthCombo(int mounth,
- TopiaContext context) {
+ public static JComboBox createMounthCombo(int mounth) {
JComboBox combo = EnumEditor.newEditor(MonthEnum.class);
combo.setSelectedIndex(mounth);
return combo;
}
- /*public static JComboBox createMounthCombo(int mounth, TopiaContext context) {
- JComboBox combo = createMounthCombo0(context);
- combo.setSelectedIndex(mounth);
- return combo;
- }
-
- private static JComboBox createMounthCombo0(TopiaContext context) {
-
- List<String> listM = new ArrayList<String>();
- // TODO Should use database ? data instead of thoses awfull hardcore
- // code...
- listM.add("janvier");
- listM.add("fevrier");
- listM.add("mars");
- listM.add("avril");
- listM.add("mai");
- listM.add("juin");
- listM.add("juillet");
- listM.add("aout");
- listM.add("septembre");
- listM.add("octobre");
- listM.add("novembre");
- listM.add("decembre");
- JComboBox combo = new JComboBox(listM.toArray());
- listM.clear();
- return combo;
- }*/
-
public static JComboBox createYearCombo(int nb, int selectedYear) {
List<Integer> listI = new ArrayList<Integer>();
for (int i = 0; i < nb; i++)
1
0
r3214 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity
by chatellier＠users.labs.libre-entreprise.org March 29, 2011
by chatellier＠users.labs.libre-entreprise.org March 29, 2011
March 29, 2011
Author: chatellier
Date: 2011-03-29 15:32:40 +0000 (Tue, 29 Mar 2011)
New Revision: 3214
Log:
Modify code (one return...)
Modified:
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2011-03-29 15:29:34 UTC (rev 3213)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2011-03-29 15:32:40 UTC (rev 3214)
@@ -246,27 +246,30 @@
}
protected String getNominalValue(Factor factor) {
+ String result = null;
+
Domain domain = factor.getDomain();
if (domain instanceof MatrixContinuousDomain) {
- return "1.0";
+ result = "1.0";
}
+ else {
+ String path = factor.getPath();
+ String topiaId = path.substring(0, path.lastIndexOf("#"));
+ String propertyName=path.substring(path.lastIndexOf("#") + 1);
- String path = factor.getPath();
- String topiaId = path.substring(0,path.lastIndexOf("#"));
- String propertyName=path.substring(path.lastIndexOf("#") + 1);
-
- Object value = null;
- try {
- TopiaEntity entity = context.findByTopiaId(topiaId);
- value = BeanUtils.getProperty(entity, propertyName);
- } catch (Exception ee) {
- log.error("An error occurred while trying to get nominal value",ee);
+ try {
+ TopiaEntity entity = context.findByTopiaId(topiaId);
+ result = BeanUtils.getProperty(entity, propertyName);
+ } catch (Exception ex) {
+ if (log.isErrorEnabled()) {
+ log.error("An error occurred while trying to get nominal value", ex);
+ }
+ }
}
- if (value == null){
- return null;
+ if (log.isDebugEnabled()) {
+ log.debug("Nominal value :" + result);
}
- log.info("Nominal value :" + value);
- return value.toString();
+ return result;
}
protected String editRInstruction(String rCall){
1
0
r3213 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity
by chatellier＠users.labs.libre-entreprise.org March 29, 2011
by chatellier＠users.labs.libre-entreprise.org March 29, 2011
March 29, 2011
Author: chatellier
Date: 2011-03-29 15:29:34 +0000 (Tue, 29 Mar 2011)
New Revision: 3213
Log:
Modify order to not break in matrix continuous domain
Modified:
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2011-03-29 13:00:54 UTC (rev 3212)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2011-03-29 15:29:34 UTC (rev 3213)
@@ -245,17 +245,16 @@
}
- protected String getNominalValue(Factor factor){
+ protected String getNominalValue(Factor factor) {
+ Domain domain = factor.getDomain();
+ if (domain instanceof MatrixContinuousDomain) {
+ return "1.0";
+ }
+
String path = factor.getPath();
String topiaId = path.substring(0,path.lastIndexOf("#"));
String propertyName=path.substring(path.lastIndexOf("#") + 1);
- Domain domain =factor.getDomain();
-
- if (domain instanceof MatrixContinuousDomain){
- return "1.0";
- }
-
Object value = null;
try {
TopiaEntity entity = context.findByTopiaId(topiaId);
1
0
r3212 - in isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish: actions simulator/launcher ui/simulator
by chatellier＠users.labs.libre-entreprise.org March 29, 2011
by chatellier＠users.labs.libre-entreprise.org March 29, 2011
March 29, 2011
Author: chatellier
Date: 2011-03-29 13:00:54 +0000 (Tue, 29 Mar 2011)
New Revision: 3212
Log:
Misc improvments
Modified:
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java 2011-03-29 10:12:18 UTC (rev 3211)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java 2011-03-29 13:00:54 UTC (rev 3212)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, Benjamin Poussin
+ * Copyright (C) 2002 - 2011 Ifremer, Code Lutin, Benjamin Poussin, 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
@@ -138,7 +138,8 @@
log.info("Command line action : simulateWithSimulationAndScript (" + simulationId + ", " + simulationZip.getAbsolutePath() + ", " + simulationPrescript + ")");
}
- String name = simulationId; // ne pas mettre la date, car le sub process la met deja + " " + new SimpleDateFormat("yyyy-MM-dd-HH-mm").format(new Date());
+ // ne pas mettre la date, car le sub process la met deja + " " + new SimpleDateFormat("yyyy-MM-dd-HH-mm").format(new Date());
+ String name = simulationId;
//SimulationStorage simulation = launcher.simulate(null, control, simulationZip);
//simulation.getStorage().closeContext();
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2011-03-29 10:12:18 UTC (rev 3211)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2011-03-29 13:00:54 UTC (rev 3212)
@@ -36,6 +36,7 @@
import java.util.Arrays;
import java.util.List;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DurationFormatUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -133,8 +134,7 @@
control.setStarted(true);
// replace prescript if specified on method
- if (simulationPrescript != null
- && !simulationPrescript.trim().isEmpty()) {
+ if (StringUtils.isNotBlank(simulationPrescript)) {
param.setUsePreScript(true);
param.setPreScript(simulationPrescript);
}
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2011-03-29 10:12:18 UTC (rev 3211)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2011-03-29 13:00:54 UTC (rev 3212)
@@ -125,24 +125,12 @@
protected String simulName = null;
protected SensitivityStorage sensitivityStorage = null;
- /** List de facteur sous forme d'arbre (factor group). {@code null} name for compatibility with 3.3.0.0 */
+ /**
+ * List de facteur sous forme d'arbre (factor group).
+ * {@code null} name for compatibility with 3.3.0.0.
+ */
protected FactorGroup factorGroup = new FactorGroup(null, true);
- //protected SortedMap<String, Factor> factors = new TreeMap<String, Factor>();
- /*
- * @deprecated this is not a good idea to store factor source component in
- * case, and found a new component instance that can edit a factor (simulation reloading)
- *
- protected Map<String, JComponent> factorComponent = new HashMap<String, JComponent>();*/
-
- //protected DesignPlan designPlan = new DesignPlan();
-
- /*
- ************
- * Init
- ************
- */
-
public SimulAction() {
init();
}
@@ -837,10 +825,6 @@
public FactorGroup getFactorGroup() {
return factorGroup;
}
-
- /*public SortedMap<String, Factor> getFactors() {
- return factors;
- }*/
/**
* Search factor in factor group tree by path.
@@ -904,9 +888,6 @@
log.debug("Add factor (" + f.getName() + ") : " +f.getPath());
}
factorGroup.addFactor(f);
- //factors.put(f.getPath() + f.getName(), f);
- //factorComponent.put(f.getPath() + f.getName(), c);
- //designPlan.setFactors(getFactorGroup().getFactors());
}
public void addContinuousFactor(String name, String comment, String path, Double min,
@@ -977,16 +958,6 @@
addFactor(f);
}
- /*public JComponent getFactorComponent(Factor f) {
- return factorComponent.get(f.getPath() + f.getName());
- }*/
-
- /*public void removeFactor(Factor f) {
- factors.remove(f.getPath() + f.getName());
- factorComponent.remove(f.getPath() + f.getName());
- //designPlan.setFactors(getFactorGroup().getFactors());
- }*/
-
/*
************
* General
1
0
r3211 - in isis-fish/branches/3.3.1/src: main/java/fr/ifremer/isisfish/simulator main/java/fr/ifremer/isisfish/simulator/launcher main/resources/templates test/java/fr/ifremer/isisfish/simulator test/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org March 29, 2011
by chatellier＠users.labs.libre-entreprise.org March 29, 2011
March 29, 2011
Author: chatellier
Date: 2011-03-29 10:12:18 +0000 (Tue, 29 Mar 2011)
New Revision: 3211
Log:
Retrait du script freemarker pour la generation du prescript (stringbuffer c'est la vie).
Gestion des populations de d?\195?\169part et des regles.
Removed:
isis-fish/branches/3.3.1/src/main/resources/templates/prescript/
Modified:
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationPreScript.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java
isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java
isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationPreScript.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationPreScript.java 2011-03-29 10:11:07 UTC (rev 3210)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationPreScript.java 2011-03-29 10:12:18 UTC (rev 3211)
@@ -77,10 +77,10 @@
bsh.eval("import org.nuiton.topia.*;");
bsh.eval("import org.nuiton.topia.persistence.*;");
bsh.eval("import fr.ifremer.isisfish.*;");
- bsh.eval("import java.util.*;");
bsh.eval("import fr.ifremer.isisfish.types.*;");
bsh.eval("import fr.ifremer.isisfish.types.Date;");
bsh.eval("import fr.ifremer.isisfish.entities.*;");
+ bsh.eval("import java.util.*;");
bsh.eval(presimulationScript);
tx.commitTransaction();
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-03-29 10:11:07 UTC (rev 3210)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-03-29 10:12:18 UTC (rev 3211)
@@ -32,8 +32,6 @@
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.StringWriter;
-import java.io.Writer;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -49,6 +47,7 @@
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+import org.apache.commons.beanutils.ConvertUtilsBean;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.mutable.MutableInt;
import org.apache.commons.lang.time.DurationFormatUtils;
@@ -74,23 +73,20 @@
import fr.ifremer.isisfish.export.SensitivityExport;
import fr.ifremer.isisfish.mexico.MexicoHelper;
import fr.ifremer.isisfish.rule.Rule;
+import fr.ifremer.isisfish.rule.RuleHelper;
import fr.ifremer.isisfish.simulator.AnalysePlan;
import fr.ifremer.isisfish.simulator.AnalysePlanContext;
import fr.ifremer.isisfish.simulator.SimulationControl;
import fr.ifremer.isisfish.simulator.SimulationException;
import fr.ifremer.isisfish.simulator.SimulationParameter;
import fr.ifremer.isisfish.simulator.sensitivity.DesignPlan;
+import fr.ifremer.isisfish.simulator.sensitivity.Factor;
import fr.ifremer.isisfish.simulator.sensitivity.Scenario;
import fr.ifremer.isisfish.simulator.sensitivity.SensitivityCalculator;
import fr.ifremer.isisfish.simulator.sensitivity.SensitivityScenarios;
-import fr.ifremer.isisfish.util.ClasspathTemplateLoader;
+import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain;
import fr.ifremer.isisfish.util.CompileHelper;
import fr.ifremer.isisfish.util.ConverterUtil;
-import freemarker.cache.TemplateLoader;
-import freemarker.ext.beans.BeansWrapper;
-import freemarker.template.Configuration;
-import freemarker.template.Template;
-import freemarker.template.TemplateException;
/**
* Cette classe est responsable de conservation de toutes les simulations faites
@@ -126,12 +122,6 @@
protected static SimulationService instance = new SimulationService();
- /** Freemarker configuration used to get prescripts content. */
- protected Configuration freemarkerConfiguration;
-
- /** Freemarker pre script template. */
- protected static final String SENSITIVITY_PRE_SCRIPT = "templates/prescript/factorprescript.ftl";
-
/**
* Retourne l'instance du {@link SimulationService} a utiliser
* @return l'instance a utiliser
@@ -519,55 +509,86 @@
}
/**
- * Get freemarker configuration.
- */
- protected Configuration getFreemarkerConfiguration() {
- Configuration configuration = new Configuration();
-
- // needed to overwrite "Defaults to default system encoding."
- // fix encoding issue on some systems
- configuration.setDefaultEncoding("utf-8");
-
- // specific template loader to get template from jars (classpath)
- TemplateLoader templateLoader = new ClasspathTemplateLoader();
- configuration.setTemplateLoader(templateLoader);
-
- configuration.setObjectWrapper(new BeansWrapper());
-
- return configuration;
- }
-
- /**
* Generate prescript to set factor values before simulation start.
*
- * @param scenario
+ * @param scenario to generate prescript
* @return simulation pre script with correct values
* @throws IOException if pre script can't be made
- * @throws TemplateException if pre script can't be made
*/
- protected String generatePreScript(Scenario scenario) throws IOException,
- TemplateException {
+ protected String generatePreScript(Scenario scenario) throws IOException {
- // init one at first call
- if (freemarkerConfiguration == null) {
- freemarkerConfiguration = getFreemarkerConfiguration();
- }
+ ConvertUtilsBean beanUtils = ConverterUtil.getConverter(null);
- Writer out = new StringWriter();
- Template template = freemarkerConfiguration
- .getTemplate(SENSITIVITY_PRE_SCRIPT);
- Map<String, Object> root = new HashMap<String, Object>();
- root.put("scenario", scenario);
- root.put("beanUtils", ConverterUtil.getConverter(null));
+ // n'utilise plus freemarker, car il y avait plus d'instruction
+ // freemarker compliqué que de code a afficher
+ StringBuffer buffer = new StringBuffer();
+ buffer.append("import org.apache.commons.beanutils.BeanUtils;\n");
+ buffer.append("import org.apache.commons.beanutils.ConvertUtilsBean;\n");
+ buffer.append("import fr.ifremer.isisfish.util.ConverterUtil;\n");
+ buffer.append("import fr.ifremer.isisfish.simulator.SimulationParameter;\n");
+ buffer.append("ConvertUtilsBean beanUtils = ConverterUtil.getConverter(db);\n");
+ buffer.append("SimulationParameter params = context.getSimulationStorage().getParameter();\n");
- template.process(root, out);
- out.flush();
- String scriptContent = out.toString();
+ int factorIndex = 0; // pour les collision de nom value
+ for (Factor factor : scenario.getFactors()) {
+ buffer.append("/* factor : ").append(factor.getName()).append(" */\n");
+ // cas special 1 : population de départ
+ if (factor.getPath().startsWith("parameters.population.")) {
+ Object stringValue = beanUtils.convert(factor.getValue());
+ buffer.append("params.setProperty(\"").append(factor.getPath()).append("\",\"").append(stringValue).append("\");\n");
+ }
+ // cas special 2 : regles
+ else if (factor.getPath().equals("parameters.rules")) {
+ List<Rule> rules = (List<Rule>)factor.getValue();
+ List<String> rulesNames = new ArrayList<String>();
+ int ruleIndex = 0;
+ for (Rule rule : rules) {
+ rulesNames.add(rule.getClass().getSimpleName());
+ Properties rulesProps = RuleHelper.getRuleAsProperties(ruleIndex++, null, rule);
+ for (String rulesProp : rulesProps.stringPropertyNames()) {
+ String value = rulesProps.getProperty(rulesProp);
+ buffer.append("params.setProperty(\"").append(rulesProp).append("\",\"").append(value).append("\");\n");
+ }
+ }
+ buffer.append("params.setProperty(\"rules\",\"").append(StringUtils.join(rulesNames, ",")).append("\");\n");
+ }
+ // cas special 3 : equation
+ else if (factor.getDomain() instanceof EquationContinuousDomain) {
+ EquationContinuousDomain domain = (EquationContinuousDomain)factor.getDomain();
+ buffer.append("context.setValue(\"").append(factor.getName());
+ buffer.append("\",").append(factor.getValue()).append(",\"");
+ buffer.append(domain.getOperator()).append("\");\n");
+ }
+ // cas pas si special
+ else {
+ Object value = factor.getValue();
+ String stringValue = beanUtils.convert(value);
+ String path = factor.getPath();
+ String topiaId = path.substring(0, path.lastIndexOf('#'));
+ String property = path.substring(path.lastIndexOf('#') + 1);
+ // Double value123 = beanUtils.convert("mystringvalue", Double.class);
+ buffer.append(value.getClass().getName()).append(" value");
+ buffer.append(factorIndex).append(" = beanUtils.convert(\"");
+ buffer.append(stringValue).append("\", ").append(value.getClass().getName());
+ buffer.append(".class);\n");
+ // TopiaEntity entity123 = db.findByTopiaId(topiaId);
+ buffer.append("TopiaEntity entity").append(factorIndex);
+ buffer.append(" = db.findByTopiaId(\"").append(topiaId);
+ buffer.append("\");\n");
+ // BeanUtils.setProperty(entity123, "property", value123);
+ buffer.append("BeanUtils.setProperty(entity").append(factorIndex);
+ buffer.append(", \"").append(property).append("\", ");
+ buffer.append("value").append(factorIndex).append(");\n");
+ }
+
+ factorIndex++;
+ }
+
+ String scriptContent = buffer.toString();
if (log.isTraceEnabled()) {
log.trace("Simulation prescript content = " + scriptContent);
}
-
return scriptContent;
}
Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java 2011-03-29 10:11:07 UTC (rev 3210)
+++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java 2011-03-29 10:12:18 UTC (rev 3211)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2010 Ifremer, Code Lutin
+ * Copyright (C) 2009 - 2011 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
@@ -25,58 +25,28 @@
package fr.ifremer.isisfish.simulator;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.io.Writer;
import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
import java.util.Collections;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
-import junit.framework.Assert;
-
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.beanutils.ConvertUtilsBean;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.nuiton.math.matrix.MatrixFactory;
-import org.nuiton.math.matrix.MatrixND;
-import org.nuiton.math.matrix.MatrixNDImpl;
-import org.nuiton.topia.TopiaContext;
-import org.nuiton.topia.TopiaException;
import org.junit.After;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.nuiton.math.matrix.MatrixFactory;
+import org.nuiton.math.matrix.MatrixND;
+import org.nuiton.math.matrix.MatrixNDImpl;
import fr.ifremer.isisfish.AbstractIsisFishTest;
-import fr.ifremer.isisfish.IsisFishDAOHelper;
-import fr.ifremer.isisfish.datastore.SimulationStorage;
-import fr.ifremer.isisfish.datastore.StorageException;
import fr.ifremer.isisfish.entities.Population;
import fr.ifremer.isisfish.entities.PopulationImpl;
-import fr.ifremer.isisfish.entities.PopulationSeasonInfo;
-import fr.ifremer.isisfish.entities.PopulationSeasonInfoDAO;
-import fr.ifremer.isisfish.entities.VesselType;
-import fr.ifremer.isisfish.entities.VesselTypeDAO;
-import fr.ifremer.isisfish.simulator.sensitivity.Factor;
-import fr.ifremer.isisfish.simulator.sensitivity.Scenario;
-import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain;
-import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain;
-import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain;
import fr.ifremer.isisfish.util.ConverterUtil;
-import freemarker.template.Configuration;
-import freemarker.template.Template;
-import freemarker.template.TemplateException;
/**
* Test for simulation prescript.
*
- * Creer un populationSeasonInfoDAO.
- * Affectation de la matrice m1.
- * Le prescript doit la changer en m2.
- *
* @author chatellier
* @version $Revision$
*
@@ -84,263 +54,23 @@
* By : $Author$
*/
public class SimulationPreScriptTest extends AbstractIsisFishTest {
-
- /** log. */
- private static Log log = LogFactory.getLog(SimulationPreScriptTest.class);
-
- protected static Configuration freemarkerConfiguration;
@Before
public void setUp() throws Exception {
// not do it in @BeforeClass
// test will fail !
init();
- freemarkerConfiguration = getFreemarkerConfiguration();
// very important , other test wil fail with that
//System.setProperty("hibernate.hbm2ddl.auto", "create");
}
-
+
@After
public void tearDown() {
// very important , other test wil fail with that
//System.clearProperty("hibernate.hbm2ddl.auto");
}
-
- /**
- * Creer un simulation.
- *
- * @throws IOException
- * @throws TemplateException
- * @throws StorageException
- * @throws TopiaException
- *
- * FIXME fix this test (empty schema error)
- */
- @Test
- public void testFactorPreScriptFactorInt() throws IOException, TemplateException, StorageException, TopiaException {
- String topiaId = null;
-
- // init simulation
- SimulationContext context = SimulationContext.get();
- SimulationParameter params = new SimulationParameterImpl();
- SimulationStorage simulation = SimulationStorage.create("test_1_int", params);
- TopiaContext storageContext = simulation.getStorage();
- storageContext.createSchema();
- TopiaContext childStorageContext = storageContext.beginTransaction();
- VesselTypeDAO vesselTypeDAO = IsisFishDAOHelper.getVesselTypeDAO(childStorageContext);
- VesselType vesselType = vesselTypeDAO.create();
- vesselType.setLength(4);
- vesselType.update();
- topiaId = vesselType.getTopiaId();
- childStorageContext.commitTransaction();
-
- // factor
- Factor factor = new Factor("testint");
- ContinuousDomain domain = new ContinuousDomain();
- domain.setMinBound(0);
- domain.setMaxBound(50);
- factor.setDomain(domain);
- factor.setPath(topiaId + "#length");
- factor.setValueForIdentifier(49);
-
- Assert.assertEquals((Integer)49, factor.getValue());
-
- // scenario
- Scenario scenario = new Scenario();
- List<Factor> factors = new ArrayList<Factor>();
- factors.add(factor);
- scenario.setFactors(factors);
-
- // context values
- Map<String, Object> root = new HashMap<String, Object>();
- root.put("scenario", scenario);
- root.put("beanUtils", ConverterUtil.getConverter(null));
-
- // process template
- Template template = freemarkerConfiguration
- .getTemplate("templates/prescript/factorprescript.ftl");
- Writer out = new StringWriter();
- template.process(root, out);
- out.flush();
- String scriptContent = out.toString();
- log.info("Script = " + scriptContent);
-
- //
- SimulationPreScript simulationPreScript = new SimulationPreScript();
- params.setUsePreScript(true);
- params.setPreScript(scriptContent);
-
- context.setSimulationStorage(simulation);
- // FIXME here is the error, getDb throw exception
- //simulationPreScript.beforeSimulation(context);
- SimulationContext.remove();
-
- // try to find previous entity
- vesselType = vesselTypeDAO.findByTopiaId(topiaId);
-
- // FIXME should test value remplaced by precript
- //Assert.assertEquals(49, vesselType.getLength());
- }
-
/**
- * Creer un simulation.
- * Creer un populationSeasonInfoDAO.
- * Affectation de la matrice m1.
- * Le prescript doit la changer en m2.
- *
- * @throws IOException
- * @throws TemplateException
- * @throws StorageException
- * @throws TopiaException
- *
- * FIXME fix this test (empty schema error)
- */
- @Test
- public void testFactorPreScriptFactorMatrix() throws IOException, TemplateException, StorageException, TopiaException {
-
- // matrix 1
- MatrixND matrix1 = MatrixFactory.getInstance().create("test1",
- new int[] { 3, 2 }, new String[] { "col1", "col2" });
- matrix1.setValue(new int[] { 0, 0 }, 13);
- matrix1.setValue(new int[] { 0, 1 }, -14);
- matrix1.setValue(new int[] { 1, 0 }, 21);
- matrix1.setValue(new int[] { 1, 1 }, 2);
- matrix1.setValue(new int[] { 2, 0 }, 12);
- matrix1.setValue(new int[] { 2, 1 }, -1);
-
- // matrix 2
- MatrixND matrix2 = MatrixFactory.getInstance().create("test2",
- new int[] { 2, 3 }, new String[] { "col1", "col2" });
- matrix2.setValue(new int[] { 0, 0 }, 9999);
- matrix2.setValue(new int[] { 0, 1 }, 15000);
- matrix2.setValue(new int[] { 0, 2 }, -40000);
- matrix2.setValue(new int[] { 1, 0 }, 21345);
- matrix2.setValue(new int[] { 1, 1 }, 81000);
- matrix2.setValue(new int[] { 1, 2 }, -13000);
-
- String topiaId = null;
-
- // init simulation
- SimulationContext context = SimulationContext.get();
- SimulationParameter params = new SimulationParameterImpl();
- SimulationStorage simulation = SimulationStorage.create("test_2_matrix", params);
- TopiaContext storageContext = simulation.getStorage();
- storageContext.createSchema();
- TopiaContext childStorageContext = storageContext.beginTransaction();
- PopulationSeasonInfoDAO populationSeasonInfoDAO = IsisFishDAOHelper.getPopulationSeasonInfoDAO(childStorageContext);
- PopulationSeasonInfo populationSeasonInfo = populationSeasonInfoDAO.create();
- populationSeasonInfo.setMigrationMatrix(matrix1);
- populationSeasonInfo.update();
- topiaId = populationSeasonInfo.getTopiaId();
- childStorageContext.commitTransaction();
-
- // factor
- Factor factor1 = new Factor("testmatrix");
- DiscreteDomain domain1 = new DiscreteDomain();
- domain1.getValues().put("m1", matrix1);
- factor1.setDomain(domain1);
- factor1.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim");
- factor1.setValueForIdentifier("m1");
-
- // factor
- Factor factor2 = new Factor("testmatrix");
- DiscreteDomain domain2 = new DiscreteDomain();
- domain2.getValues().put("m2", matrix1);
- factor2.setDomain(domain2);
- factor2.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim");
- factor2.setValueForIdentifier("m2");
-
- // scenario
- Scenario scenario = new Scenario();
- List<Factor> factors = new ArrayList<Factor>();
- factors.add(factor1);
- factors.add(factor2);
- scenario.setFactors(factors);
-
- // context values
- Map<String, Object> root = new HashMap<String, Object>();
- root.put("scenario", scenario);
- root.put("beanUtils", ConverterUtil.getConverter(null));
-
- // process template
- Template template = freemarkerConfiguration
- .getTemplate("templates/prescript/factorprescript.ftl");
- Writer out = new StringWriter();
- template.process(root, out);
- out.flush();
- String scriptContent = out.toString();
- log.info("Script = " + scriptContent);
-
- //
- SimulationPreScript simulationPreScript = new SimulationPreScript();
- params.setUsePreScript(true);
- params.setPreScript(scriptContent);
-
- context.setSimulationStorage(simulation);
- // FIXME here is the error, getDb throw exception
- //simulationPreScript.beforeSimulation(context);
- SimulationContext.remove();
-
- // try to find previous entity
- populationSeasonInfo = populationSeasonInfoDAO.findByTopiaId(topiaId);
- // FIXME should test value remplaced by precript
- //Assert.assertEquals(matrix2, populationSeasonInfo.getMigrationMatrix());
- }
-
- /**
- * Creer un scenario basé sur les EquationDomain.
- *
- * @throws IOException
- * @throws TemplateException
- * @throws StorageException
- * @throws TopiaException
- */
- @Test
- public void testFactorPreScriptEquation() throws IOException, TemplateException, StorageException, TopiaException {
-
- // factor
- Factor factorEquation = new Factor("test.equation.name");
- EquationContinuousDomain domain1 = new EquationContinuousDomain();
- domain1.setReferenceValue(3.0);
- domain1.setOperator("-");
- domain1.setCoefficient(0.1);
- domain1.setVariableName("K1");
- factorEquation.setDomain(domain1);
- factorEquation.setPath("fr.ifremer.equation1#testFactorPreScriptEquation");
- factorEquation.setValueForIdentifier(0.1);
-
- log.info("Script = " + domain1.getClass().getSimpleName());
-
- // scenario
- Scenario scenario = new Scenario();
- List<Factor> factors = new ArrayList<Factor>();
- factors.add(factorEquation);
- scenario.setFactors(factors);
-
- // context values
- Map<String, Object> root = new HashMap<String, Object>();
- root.put("scenario", scenario);
- root.put("beanUtils", ConverterUtil.getConverter(null));
-
- // process template
- Template template = freemarkerConfiguration.getTemplate("templates/prescript/factorprescript.ftl");
- Writer out = new StringWriter();
- template.process(root, out);
- out.flush();
- String scriptContent = out.toString();
- log.info("Script = " + scriptContent);
- //Assert.assertTrue(scriptContent.indexOf("\"PopulationEquation.K1\", 0.68, \"-\"") != -1);
-
- // le nom de la valeur de la variable n'apparait pas "en elle meme"
- // dans le prescript, il y a seulement le nom
- // du facteur. Charge à l'UI de savoir comment l'afficher
- Assert.assertTrue(scriptContent.indexOf("\"test.equation.name\", 0.68, \"-\"") != -1);
-
- Assert.assertTrue(scriptContent.indexOf("K1") == -1);
- }
-
- /**
* Test que les chaine represantant des matrices sont correctement
* transformée en MatrixND.
*
Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2011-03-29 10:11:07 UTC (rev 3210)
+++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2011-03-29 10:12:18 UTC (rev 3211)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2006 - 2010 Ifremer, Code Lutin
+ * Copyright (C) 2006 - 2011 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
@@ -25,31 +25,48 @@
package fr.ifremer.isisfish.simulator.launcher;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
+import java.util.Properties;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.nuiton.math.matrix.MatrixFactory;
+import org.nuiton.math.matrix.MatrixHelper;
import org.nuiton.math.matrix.MatrixND;
+import org.nuiton.topia.TopiaContext;
+import org.nuiton.topia.TopiaException;
import fr.ifremer.isisfish.AbstractIsisFishTest;
+import fr.ifremer.isisfish.IsisFishException;
+import fr.ifremer.isisfish.datastore.RegionStorage;
+import fr.ifremer.isisfish.datastore.RuleStorage;
+import fr.ifremer.isisfish.datastore.StorageException;
import fr.ifremer.isisfish.entities.Population;
import fr.ifremer.isisfish.entities.PopulationGroup;
import fr.ifremer.isisfish.entities.PopulationImpl;
import fr.ifremer.isisfish.entities.Strategy;
import fr.ifremer.isisfish.entities.StrategyImpl;
import fr.ifremer.isisfish.entities.Zone;
+import fr.ifremer.isisfish.rule.Rule;
+import fr.ifremer.isisfish.rule.RuleHelper;
import fr.ifremer.isisfish.simulator.SimulationParameter;
import fr.ifremer.isisfish.simulator.SimulationParameterImpl;
import fr.ifremer.isisfish.simulator.sensitivity.DesignPlan;
import fr.ifremer.isisfish.simulator.sensitivity.Factor;
+import fr.ifremer.isisfish.simulator.sensitivity.Scenario;
import fr.ifremer.isisfish.simulator.sensitivity.SensitivityCalculator;
import fr.ifremer.isisfish.simulator.sensitivity.SensitivityCalculatorRandomMock;
import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain;
import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain;
+import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain;
+import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain;
+import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDomain;
+import freemarker.template.TemplateException;
/**
* Test for {@link SimulationService}.
@@ -89,15 +106,15 @@
factor1.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521013#0.1715620681984218#maxLength");
// factor 2
- /*Factor<Double> factor2 = new Factor<Double>("factor 2 (double)");
- DiscreteDomain<Double> domain2 = new DiscreteDomain<Double>();
+ Factor factor2 = new Factor("factor 2 (double)");
+ DiscreteDomain domain2 = new DiscreteDomain();
domain2.getValues().put(0.0, 12.3);
domain2.getValues().put(1.0, 70.9);
domain2.getValues().put(2.0, 21.0);
domain2.getValues().put(3.0, -12.1);
domain2.getValues().put(4.0, -8.45);
factor2.setDomain(domain2);
- factor2.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521064#0.022976136053553198#minLength");*/
+ factor2.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521064#0.022976136053553198#minLength");
// factor 3
Factor factor3 = new Factor("factor 3 (double)");
@@ -206,4 +223,204 @@
}
}
}
+
+ /**
+ * Test la generation de facteur simple.
+ *
+ * @throws IOException
+ * @throws TemplateException
+ * @throws StorageException
+ * @throws TopiaException
+ */
+ @Test
+ public void testFactorPreScriptFactorInt() throws IOException, TemplateException, StorageException, TopiaException {
+
+ // factor
+ Factor factor = new Factor("testint");
+ ContinuousDomain domain = new ContinuousDomain();
+ domain.setMinBound(0);
+ domain.setMaxBound(50);
+ factor.setDomain(domain);
+ factor.setPath("fr.ifremer.entities.Cell#1234567890#length");
+ factor.setValueForIdentifier(49);
+
+ Assert.assertEquals((Integer)49, factor.getValue());
+
+ // scenario
+ Scenario scenario = new Scenario();
+ List<Factor> factors = new ArrayList<Factor>();
+ factors.add(factor);
+ scenario.setFactors(factors);
+
+ SimulationService service = SimulationService.getService();
+ String scriptContent = service.generatePreScript(scenario);
+ Assert.assertTrue(scriptContent.contains("java.lang.Integer"));
+ Assert.assertTrue(scriptContent.contains("db.findByTopiaId(\"fr.ifremer.entities.Cell#1234567890\")"));
+ Assert.assertTrue(scriptContent.contains("BeanUtils.setProperty(entity0, \"length\""));
+ }
+
+ /**
+ * Creer un simulation.
+ * Creer un populationSeasonInfoDAO.
+ * Affectation de la matrice m1.
+ * Le prescript doit la changer en m2.
+ *
+ * @throws IOException
+ * @throws TemplateException
+ * @throws StorageException
+ * @throws TopiaException
+ *
+ * FIXME fix this test (empty schema error)
+ */
+ @Test
+ public void testFactorPreScriptFactorMatrix() throws IOException, TemplateException, StorageException, TopiaException {
+
+ // matrix 1
+ MatrixND matrix1 = MatrixFactory.getInstance().create("test1",
+ new int[] { 3, 2 }, new String[] { "col1", "col2" });
+ matrix1.setValue(new int[] { 0, 0 }, 13);
+ matrix1.setValue(new int[] { 0, 1 }, -14);
+ matrix1.setValue(new int[] { 1, 0 }, 21);
+ matrix1.setValue(new int[] { 1, 1 }, 2);
+ matrix1.setValue(new int[] { 2, 0 }, 12);
+ matrix1.setValue(new int[] { 2, 1 }, -1);
+
+ // matrix 2
+ MatrixND matrix2 = MatrixFactory.getInstance().create("test2",
+ new int[] { 2, 3 }, new String[] { "col1", "col2" });
+ matrix2.setValue(new int[] { 0, 0 }, 9999);
+ matrix2.setValue(new int[] { 0, 1 }, 15000);
+ matrix2.setValue(new int[] { 0, 2 }, -40000);
+ matrix2.setValue(new int[] { 1, 0 }, 21345);
+ matrix2.setValue(new int[] { 1, 1 }, 81000);
+ matrix2.setValue(new int[] { 1, 2 }, -13000);
+
+ // factor
+ Factor factor1 = new Factor("testmatrix");
+ DiscreteDomain domain1 = new DiscreteDomain();
+ domain1.getValues().put("m1", matrix1);
+ factor1.setDomain(domain1);
+ factor1.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim");
+ factor1.setValueForIdentifier("m1");
+
+ // factor
+ Factor factor2 = new Factor("testmatrix");
+ DiscreteDomain domain2 = new DiscreteDomain();
+ domain2.getValues().put("m2", matrix1);
+ factor2.setDomain(domain2);
+ factor2.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim");
+ factor2.setValueForIdentifier("m2");
+
+ // scenario
+ Scenario scenario = new Scenario();
+ List<Factor> factors = new ArrayList<Factor>();
+ factors.add(factor1);
+ factors.add(factor2);
+ scenario.setFactors(factors);
+
+ SimulationService service = SimulationService.getService();
+ String scriptContent = service.generatePreScript(scenario);
+ //log.info("Script = " + scriptContent);
+ Assert.assertTrue(scriptContent.contains("org.nuiton.math.matrix.MatrixNDImpl "));
+ Assert.assertTrue(scriptContent.contains("db.findByTopiaId(\"org.nuiton.math.matrix.MatrixND#563456293453#2.456347646\");"));
+ Assert.assertTrue(scriptContent.contains("BeanUtils.setProperty(entity0, \"dim\""));
+ }
+
+ /**
+ * Creer un scenario basé sur les EquationDomain.
+ *
+ * @throws IOException
+ * @throws TemplateException
+ * @throws StorageException
+ * @throws TopiaException
+ */
+ @Test
+ public void testFactorPreScriptEquation() throws IOException, TemplateException, StorageException, TopiaException {
+
+ // factor
+ Factor factorEquation = new Factor("test.equation.name.K1");
+ EquationContinuousDomain domain1 = new EquationContinuousDomain();
+ domain1.setReferenceValue(10.0);
+ domain1.setOperator("-");
+ domain1.setCoefficient(0.1);
+ domain1.setVariableName("K1");
+ factorEquation.setDomain(domain1);
+ factorEquation.setPath("fr.ifremer.equation1#testFactorPreScriptEquation");
+ factorEquation.setValueForIdentifier(0.4);
+
+ // scenario
+ Scenario scenario = new Scenario();
+ List<Factor> factors = new ArrayList<Factor>();
+ factors.add(factorEquation);
+ scenario.setFactors(factors);
+
+ SimulationService service = SimulationService.getService();
+ String scriptContent = service.generatePreScript(scenario);
+ log.info("Script = " + scriptContent);
+
+ // le nom de la valeur de la variable n'apparait pas "en elle meme"
+ // dans le prescript, il y a seulement le nom
+ // du facteur. Charge à l'UI de savoir comment l'afficher
+ Assert.assertTrue(scriptContent.contains("\"test.equation.name.K1\",8.02,\"-\""));
+ }
+
+ /**
+ * Test que la generation du prescript avec l'ajout des populations
+ * de départ et des regles de IsisFish 3.3.1.0 fonctionne correctement.
+ *
+ * @throws TemplateException
+ * @throws IOException
+ * @throws IsisFishException
+ */
+ @Test
+ public void testPrescriptGenerationPopAndRules() throws IOException, TemplateException, IsisFishException {
+
+ // get a context to a database
+ RegionStorage regionStorage = RegionStorage.getRegion("BaseMotosICA");
+ TopiaContext regionContext = regionStorage.getStorage();
+
+ // build test scenario
+ Scenario scenario1 = new Scenario();
+
+ // factor pop
+ Factor factorPop = new Factor("myPopulationParams");
+ factorPop.setDomain(new MatrixContinuousDomain());
+ factorPop.setPath("parameters.population.xxx");
+ MatrixND mat = MatrixFactory.getInstance().create(new int[]{2, 3});
+ MatrixHelper.convertToId(mat);
+ factorPop.setValue(mat);
+
+ // factor rule, species = c'est une des especes de la base BaseMotosICA
+ Rule ruleTacPoids = RuleStorage.getRule("TACpoids").getNewRuleInstance();
+ Properties props = new Properties();
+ props.setProperty("rule.0.parameter.species", "fr.ifremer.isisfish.entities.Species#1169028645830#0.022262364425031378");
+ RuleHelper.populateRule(0, regionContext, ruleTacPoids, props);
+ Rule ruleTailleMin = RuleStorage.getRule("TailleMin").getNewRuleInstance();
+ props = new Properties();
+ props.setProperty("rule.0.parameter.species", "fr.ifremer.isisfish.entities.Species#1169028645830#0.022262364425031378");
+ props.setProperty("rule.0.parameter.propSurvie", "42");
+ RuleHelper.populateRule(0, regionContext, ruleTailleMin, props);
+ Factor factorRule = new Factor("myRuleParams");
+ factorPop.setDomain(new RuleDomain());
+ factorRule.setPath("parameters.rules");
+ List<Rule> rules = new ArrayList<Rule>();
+ rules.add(ruleTacPoids);
+ rules.add(ruleTailleMin);
+ factorRule.setValue(rules);
+
+ List<Factor> factors = new ArrayList<Factor>();
+ factors.add(factorPop);
+ factors.add(factorRule);
+ scenario1.setFactors(factors);
+
+ // generate prescript for that wonderfull scenario
+ SimulationService service = SimulationService.getService();
+ String preScriptContent = service.generatePreScript(scenario1);
+ log.info("Script = " + preScriptContent);
+
+ Assert.assertTrue(preScriptContent.contains("params.setProperty(\"parameters.population.xxx\""));
+ Assert.assertTrue(preScriptContent.contains("params.setProperty(\"rule.0.parameter.species\",\"fr.ifremer.isisfish.entities.Species#1169028645830#0.022262364425031378\");"));
+ Assert.assertTrue(preScriptContent.contains("params.setProperty(\"rule.1.parameter.propSurvie\",\"42.0\");"));
+ Assert.assertTrue(preScriptContent.contains("rules\",\"TACpoids,TailleMin\")"));
+ }
}
1
0
r3210 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity
by chatellier＠users.labs.libre-entreprise.org March 29, 2011
by chatellier＠users.labs.libre-entreprise.org March 29, 2011
March 29, 2011
Author: chatellier
Date: 2011-03-29 10:11:07 +0000 (Tue, 29 Mar 2011)
New Revision: 3210
Log:
Add doc
Modified:
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2011-03-29 10:10:31 UTC (rev 3209)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2011-03-29 10:11:07 UTC (rev 3210)
@@ -164,6 +164,8 @@
/**
* Set value.
*
+ * Unused (or only for test ?).
+ *
* @param value new value
*/
public void setValue(Object value) {
1
0