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

r3729 - in trunk/src/main/java/fr/ifremer/isisfish: aspect util
by echatellier＠users.forge.codelutin.com Aug. 24, 2012

Aug. 24, 2012

Author: echatellier Date: 2012-08-24 14:57:23 +0200 (Fri, 24 Aug 2012) New Revision: 3729 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3729 Log: fixes #1411 : Add annotation to not cache method or class call Added: trunk/src/main/java/fr/ifremer/isisfish/util/Nocache.java Modified: trunk/src/main/java/fr/ifremer/isisfish/aspect/Cache.java Modified: trunk/src/main/java/fr/ifremer/isisfish/aspect/Cache.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/aspect/Cache.java 2012-08-24 12:19:40 UTC (rev 3728) +++ trunk/src/main/java/fr/ifremer/isisfish/aspect/Cache.java 2012-08-24 12:57:23 UTC (rev 3729) @@ -47,6 +47,7 @@ import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.simulator.SimulationContext; +import fr.ifremer.isisfish.util.Nocache; /** * Cache aspect. @@ -61,7 +62,7 @@ */ @Aspect("perJVM") public class Cache { - + /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(Cache.class); @@ -117,23 +118,32 @@ @Around("scriptsMethod") public Object call(final JoinPoint jp) throws Throwable { totalCall++; - Object key = computeKey(jp); - Object result = cache.get(key); - if (result == null) { - - // computation increment (/ by 0) - // FIXME need to be called, but fail with empty stack - //Method method = ((MethodSignature)jp.getSignature()).getMethod(); - //getTrace().traceAfterComputation(method); + Object result = null; + Method method = ((MethodSignature)jp.getSignature()).getMethod(); + if (method.getAnnotation(Nocache.class) != null || + method.getDeclaringClass().getAnnotation(Nocache.class) != null) { result = realCall(jp); -// addListenerFor(key); // pas necessaire car on a la date et pour une date donnée rien ne peut changer - if (result != null) { // util pour les methodes retournant void, ne fonctionne pas si on met AND !execute(void *(..)) dans l'aspect. En fait fonction seulement si utilisé avec les traces :( - cache.put(key, result); + } else { + Object key = computeKey(jp); + result = cache.get(key); + if (result == null) { + + // computation increment (/ by 0) + // FIXME need to be called, but fail with empty stack + //Method method = ((MethodSignature)jp.getSignature()).getMethod(); + //getTrace().traceAfterComputation(method); + + result = realCall(jp); + // addListenerFor(key); // pas necessaire car on a la date et pour une date donnée rien ne peut changer + if (result != null) { // util pour les methodes retournant void, ne fonctionne pas si on met AND !execute(void *(..)) dans l'aspect. En fait fonction seulement si utilisé avec les traces :( + cache.put(key, result); + } + } else { + cacheUsed++; } - } else { - cacheUsed++; } + if (log.isTraceEnabled()) { log.trace(((MethodSignature)jp.getSignature()).getMethod() + " args " + Arrays.toString(((MethodRtti)jp.getRtti()).getParameterValues()) Added: trunk/src/main/java/fr/ifremer/isisfish/util/Nocache.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/Nocache.java (rev 0) +++ trunk/src/main/java/fr/ifremer/isisfish/util/Nocache.java 2012-08-24 12:57:23 UTC (rev 3729) @@ -0,0 +1,47 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 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.util; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Annotation pour specifier à l'aspect du cache que l'on ne souhaite ne pas + * mettre en cache l'appel d'une méthode ou des méthodes d'une classe. + * + * @author echatellier + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +(a)Retention(RetentionPolicy.RUNTIME) +(a)Target({ElementType.METHOD, ElementType.TYPE}) +public @interface Nocache { + +} Property changes on: trunk/src/main/java/fr/ifremer/isisfish/util/Nocache.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r3728 - trunk/src/main/java/fr/ifremer/isisfish/util
by echatellier＠users.forge.codelutin.com Aug. 24, 2012

Aug. 24, 2012

Author: echatellier Date: 2012-08-24 14:19:40 +0200 (Fri, 24 Aug 2012) New Revision: 3728 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3728 Log: fixes #1415 : ConverterUtil#getConverter must be cached to return only one instance instead of one for each call Modified: trunk/src/main/java/fr/ifremer/isisfish/util/ConverterUtil.java Modified: trunk/src/main/java/fr/ifremer/isisfish/util/ConverterUtil.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/ConverterUtil.java 2012-08-16 13:05:04 UTC (rev 3727) +++ trunk/src/main/java/fr/ifremer/isisfish/util/ConverterUtil.java 2012-08-24 12:19:40 UTC (rev 3728) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2006 - 2010 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * Copyright (C) 2006 - 2012 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 @@ -36,6 +36,8 @@ import fr.ifremer.isisfish.types.Month; import fr.ifremer.isisfish.types.RangeOfValues; import fr.ifremer.isisfish.types.TimeUnit; +import java.util.Map; +import java.util.WeakHashMap; /** * ConverterUtil. @@ -50,28 +52,43 @@ */ public class ConverterUtil { + static protected Map<TopiaContext, ConvertUtilsBean> cache = new WeakHashMap<TopiaContext, ConvertUtilsBean>(); + static protected ConvertUtilsBean nullConverter = getConverterNoCache(null); + public static ConvertUtilsBean getConverter(TopiaContext context) { - BeanUtilsBean result = BeanUtilsBean.getInstance(); - ConvertUtilsBean cub = result.getConvertUtils(); + ConvertUtilsBean result; + if (context == null) { + result = nullConverter; + } else { + result = cache.get(context); + if (result == null) { + result = getConverterNoCache(context); + } + } + return result; + } + protected static ConvertUtilsBean getConverterNoCache(TopiaContext context) { + BeanUtilsBean bub = BeanUtilsBean.getInstance(); + ConvertUtilsBean result = bub.getConvertUtils(); + cache.put(context, result); + // mise en place de converter de string vers des objet ... - cub.register(new TopiaEntityConverter(context), TopiaEntity.class); - cub.register(new TimeStepConverter(), TimeStep.class); - cub.register(new MonthConverter(), Month.class); - cub.register(new TimeUnitConverter(), TimeUnit.class); - cub.register(new RangeOfValuesConverter(), RangeOfValues.class); - + result.register(new TopiaEntityConverter(context), TopiaEntity.class); + result.register(new TimeStepConverter(), TimeStep.class); + result.register(new MonthConverter(), Month.class); + result.register(new TimeUnitConverter(), TimeUnit.class); + result.register(new RangeOfValuesConverter(), RangeOfValues.class); + // Not used since mexico file format use // Still used in sensivity analysis prescript - cub.register(new MatrixConverter(), MatrixND.class); + result.register(new MatrixConverter(), MatrixND.class); // dans les prescripts generé on a MatrixNDImpl.class // c'est tres étrange, mais ca ne fonctionne pas par MatrixND.class - cub.register(new MatrixConverter(), MatrixNDImpl.class); + result.register(new MatrixConverter(), MatrixNDImpl.class); // ... et inversement - cub.register(new StringConverter(), String.class); - - return cub; + result.register(new StringConverter(), String.class); + return result; } - }

1 0

r3727 - trunk/src/main/java/fr/ifremer/isisfish/ui/script
by echatellier＠users.forge.codelutin.com Aug. 16, 2012

Aug. 16, 2012

Author: echatellier Date: 2012-08-16 15:05:04 +0200 (Thu, 16 Aug 2012) New Revision: 3727 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3727 Log: fixes #1406 : Can't create SimulationPlan Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2012-08-10 16:12:54 UTC (rev 3726) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2012-08-16 13:05:04 UTC (rev 3727) @@ -292,7 +292,7 @@ Language.JAVA); break; case CommunitySimulationPlan: - script = SimulationPlanStorage.getSimulationPlan(fileName, Location.COMMUNITY); + script = SimulationPlanStorage.createSimulationPlan(fileName, Location.COMMUNITY); break; case CommunityExport: script = ExportStorage.createExport(fileName, Location.COMMUNITY);

1 0

r3726 - trunk
by maven-release＠users.forge.codelutin.com Aug. 10, 2012

Aug. 10, 2012

Author: maven-release Date: 2012-08-10 18:12:54 +0200 (Fri, 10 Aug 2012) New Revision: 3726 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3726 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-10 16:12:47 UTC (rev 3725) +++ trunk/pom.xml 2012-08-10 16:12:54 UTC (rev 3726) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.1.0.3</version> + <version>4.1.0.4-SNAPSHOT</version>  <dependencies> @@ -730,9 +730,9 @@   <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.1.0.3</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.1.0.3</developerConnection> - <url>http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.1.0.3</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</developerConnection> + <url>http://svn.forge.codelutin.com/svn/isis-fish/trunk</url> </scm> <repositories>

1 0

r3725 - in tags: . isis-fish-4.1.0.3
by maven-release＠users.forge.codelutin.com Aug. 10, 2012

Aug. 10, 2012

Author: maven-release Date: 2012-08-10 18:12:47 +0200 (Fri, 10 Aug 2012) New Revision: 3725 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3725 Log: [maven-release-plugin] copy for tag isis-fish-4.1.0.3 Added: tags/isis-fish-4.1.0.3/ Property changes on: tags/isis-fish-4.1.0.3 ___________________________________________________________________ Added: svn:ignore + maven.log target velocity.log .classpath .project isis-fish.ipr isis-fish.iws isis-fish.iml .settings bin nbproject Inputs_Langoustine Added: svn:mergeinfo + /branches/4.1:3601-3670

1 0

r3724 - trunk
by maven-release＠users.forge.codelutin.com Aug. 10, 2012

Aug. 10, 2012

Author: maven-release Date: 2012-08-10 18:12:36 +0200 (Fri, 10 Aug 2012) New Revision: 3724 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3724 Log: [maven-release-plugin] prepare release isis-fish-4.1.0.3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-10 16:05:29 UTC (rev 3723) +++ trunk/pom.xml 2012-08-10 16:12:36 UTC (rev 3724) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.1.0.3-SNAPSHOT</version> + <version>4.1.0.3</version>  <dependencies> @@ -730,9 +730,9 @@   <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</developerConnection> - <url>http://svn.forge.codelutin.com/svn/isis-fish/trunk</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.1.0.3</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.1.0.3</developerConnection> + <url>http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.1.0.3</url> </scm> <repositories>

1 0

r3723 - trunk
by echatellier＠users.forge.codelutin.com Aug. 10, 2012

Aug. 10, 2012

Author: echatellier Date: 2012-08-10 18:05:29 +0200 (Fri, 10 Aug 2012) New Revision: 3723 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3723 Log: Udpate to mavenpom 3.3.6 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-10 14:52:27 UTC (rev 3722) +++ trunk/pom.xml 2012-08-10 16:05:29 UTC (rev 3723) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.3.5</version> + <version>3.3.6</version> </parent> <groupId>fr.ifremer</groupId>

1 0

r3722 - trunk
by echatellier＠users.forge.codelutin.com Aug. 10, 2012

Aug. 10, 2012

Author: echatellier Date: 2012-08-10 16:52:27 +0200 (Fri, 10 Aug 2012) New Revision: 3722 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3722 Log: Fix animal-sniffer signature (sun version) Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-10 14:43:15 UTC (rev 3721) +++ trunk/pom.xml 2012-08-10 14:52:27 UTC (rev 3722) @@ -624,6 +624,18 @@ </dependency> </dependencies> </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>animal-sniffer-maven-plugin</artifactId> + <configuration> + <signature> + <groupId>org.codehaus.mojo.signature</groupId> + <artifactId>java16-sun</artifactId> + <version>1.10</version> + </signature> + </configuration> + </plugin> </plugins> </pluginManagement>

1 0

r3721 - trunk
by echatellier＠users.forge.codelutin.com Aug. 10, 2012

Aug. 10, 2012

Author: echatellier Date: 2012-08-10 16:43:15 +0200 (Fri, 10 Aug 2012) New Revision: 3721 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3721 Log: fixes #1400 : Update to nuiton-matrix 2.3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-10 14:37:18 UTC (rev 3720) +++ trunk/pom.xml 2012-08-10 14:43:15 UTC (rev 3721) @@ -62,14 +62,14 @@ <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.3</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix-gui</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.3</version> <scope>compile</scope> </dependency>

1 0

r3720 - trunk/src/test/java/fr/ifremer/isisfish/util
by echatellier＠users.forge.codelutin.com Aug. 10, 2012

Aug. 10, 2012

Author: echatellier Date: 2012-08-10 16:37:18 +0200 (Fri, 10 Aug 2012) New Revision: 3720 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3720 Log: Suppression du thread local (gros effet de bord sur les autres tests) Modified: trunk/src/test/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapperTest.java Modified: trunk/src/test/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapperTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapperTest.java 2012-08-10 13:22:56 UTC (rev 3719) +++ trunk/src/test/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapperTest.java 2012-08-10 14:37:18 UTC (rev 3720) @@ -33,6 +33,7 @@ import java.util.Collections; import java.util.List; +import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -64,6 +65,11 @@ SimulationContext.get().setSimulationStorage(simRef); } + @After + public void clearThreadLocal() { + SimulationContext.remove(); + } + /** * Test la conversion des entités. * @throws IOException

1 0

r3719 - in trunk: . src/main/java/fr/ifremer/isisfish/util src/test/java/fr/ifremer/isisfish/util
by echatellier＠users.forge.codelutin.com Aug. 10, 2012

Aug. 10, 2012

Author: echatellier Date: 2012-08-10 15:22:56 +0200 (Fri, 10 Aug 2012) New Revision: 3719 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3719 Log: Remove cpdetector (not used anymore) Modified: trunk/pom.xml trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-10 13:15:37 UTC (rev 3718) +++ trunk/pom.xml 2012-08-10 13:22:56 UTC (rev 3719) @@ -385,13 +385,6 @@ <scope>compile</scope> </dependency> -  - <dependency> <groupId>com.sun</groupId> <artifactId>tools</artifactId> Modified: trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2012-08-10 13:15:37 UTC (rev 3718) +++ trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2012-08-10 13:22:56 UTC (rev 3719) @@ -386,96 +386,4 @@ } return result; } - - /*protected static CodepageDetectorProxy getCodepageDetector() { - - if (detector == null) { - detector = CodepageDetectorProxy.getInstance(); // A singleton. - - // Add the implementations of info.monitorenter.cpdetector.io.ICodepageDetector: - // This one is quick if we deal with unicode codepages: - detector.add(new ByteOrderMarkDetector()); - // The first instance delegated to tries to detect the meta charset attribut in html pages. - detector.add(new ParsingDetector(true)); // be verbose about parsing. - // This one does the tricks of exclusion and frequency detection, if first implementation is - // unsuccessful: - detector.add(JChardetFacade.getInstance()); // Another singleton. - detector.add(ASCIIDetector.getInstance()); // Fallback, see javadoc. - } - return detector; - }*/ - - /* - * Convert all files to UTF-8. - * - * @param files fiels to convert - * @return converted file list - * - public static List<File> convertToUnicode(List<File> files) { - - CodepageDetectorProxy myDetector = getCodepageDetector(); - - for (File file : files) { - try { - Charset charset = myDetector.detectCodepage(file.toURI().toURL()); - - if (log.isDebugEnabled()) { - log.debug("Charset for " + file.getAbsolutePath() + " is " + charset); - } - - if (charset != null && !charset.name().equalsIgnoreCase("utf-8")) { - - if (log.isDebugEnabled()) { - log.debug("Convert " + file.getAbsolutePath() + " to unicode"); - } - - File tmpFile = File.createTempFile(file.getName(), ".copy"); - tmpFile.deleteOnExit(); - - // direct copy - InputStream is = new FileInputStream(file); - OutputStream os = new FileOutputStream(tmpFile); - try { - IOUtils.copy(is, os); - } - finally { - is.close(); - os.close(); - } - - // copy using cp transaltion - is = new FileInputStream(tmpFile); - os = new FileOutputStream(file); - Reader ir = new InputStreamReader(is, charset); - Writer ow = new OutputStreamWriter(new FileOutputStream(file), "utf-8"); - try { - IOUtils.copy(ir, ow); - } - finally { - ir.close(); - ow.close(); - is.close(); - os.close(); - } - - } - else { - if (log.isDebugEnabled()) { - log.debug("File " + file.getAbsolutePath() + " already in unicode : skip"); - } - } - } catch (MalformedURLException e) { - if (log.isErrorEnabled()) { - log.error("Can't convert file in unicode", e); - } - } catch (IOException e) { - if (log.isErrorEnabled()) { - log.error("Can't convert file in unicode", e); - } - } - - } - - return files; - }*/ } Modified: trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java 2012-08-10 13:15:37 UTC (rev 3718) +++ trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java 2012-08-10 13:22:56 UTC (rev 3719) @@ -27,19 +27,17 @@ import java.io.File; import java.io.IOException; -import java.lang.reflect.Method; import java.net.URL; import java.net.URLClassLoader; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.FileUtil; import org.junit.Assert; import org.junit.Test; +import org.nuiton.util.FileUtil; import fr.ifremer.isisfish.AbstractIsisFishTest; import fr.ifremer.isisfish.equation.PopulationReproductionEquation; @@ -183,64 +181,7 @@ fB.delete(); FileUtil.deleteRecursively(dest); } - - /* - * Save a file as non utf-8 encoded. - * Convert to uft-8. - * Assert that file has been converted. - * @throws IOException - * - @Test - public void convertToUnicodeTest() throws IOException { - String content = getFirstClassContent("ConvertToUnicode"); - // add un accent - content = content.replace("code", "cod\u00E9"); - - File nonUnicodeFile = File.createTempFile("ConvertToUnicode", ".java", getTestDirectory()); - FileUtil.writeString(nonUnicodeFile, content, "ISO-8859-15"); - - if (log.isDebugEnabled()) { - log.debug("Saved file " + nonUnicodeFile.getAbsolutePath() + " as ISO-8859-15"); - } - - CompileHelper.convertToUnicode(Collections.singletonList(nonUnicodeFile)); - - // don't support encoding String newContent = FileUtil.readAsString(nonUnicodeFile); - String newContent = FileUtils.readFileToString(nonUnicodeFile, "UTF-8"); - Assert.assertTrue(newContent.indexOf("cod\u00E9") > 0); - - nonUnicodeFile.delete(); - }*/ - - /* - * Try to convert file already in UTF-8. - * - * @throws IOException - * - @Test - public void convertToUnicodeUselessTest() throws IOException { - String content = getFirstClassContent("UselessConvertToUnicode"); - - // add un accent - content = content.replace("code", "cod\u00E9"); - - File nonUnicodeFile = File.createTempFile("UselessConvertToUnicode", ".java", getTestDirectory()); - FileUtil.writeString(nonUnicodeFile, content, "UTF-8"); - - if (log.isDebugEnabled()) { - log.debug("Saved file " + nonUnicodeFile.getAbsolutePath() + " as UTF-8"); - } - - CompileHelper.convertToUnicode(Collections.singletonList(nonUnicodeFile)); - - // don't support encoding String newContent = FileUtil.readAsString(nonUnicodeFile); - String newContent = FileUtils.readFileToString(nonUnicodeFile, "UTF-8"); - Assert.assertTrue(newContent.indexOf("cod\u00E9") > 0); - - nonUnicodeFile.delete(); - }*/ - /** * Test que le contenu du fichier java correspondant à l'equation est * corectement généré.

1 0

r3718 - in trunk: . src/test/java/fr/ifremer/isisfish/util
by echatellier＠users.forge.codelutin.com Aug. 10, 2012

Aug. 10, 2012

Author: echatellier Date: 2012-08-10 15:15:37 +0200 (Fri, 10 Aug 2012) New Revision: 3718 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3718 Log: Update nuiton-matrix and fix tests. Modified: trunk/pom.xml trunk/src/test/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapperTest.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-10 09:24:11 UTC (rev 3717) +++ trunk/pom.xml 2012-08-10 13:15:37 UTC (rev 3718) @@ -62,21 +62,15 @@ <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix</artifactId> - <version>2.2.3</version> + <version>2.3-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix-gui</artifactId> - <version>2.2.3</version> + <version>2.3-SNAPSHOT</version> <scope>compile</scope> - <exclusions> - <exclusion> - <artifactId>xml-apis</artifactId> - <groupId>xml-apis</groupId> - </exclusion> - </exclusions> </dependency> <dependency> Modified: trunk/src/test/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapperTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapperTest.java 2012-08-10 09:24:11 UTC (rev 3717) +++ trunk/src/test/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapperTest.java 2012-08-10 13:15:37 UTC (rev 3718) @@ -44,9 +44,6 @@ import fr.ifremer.isisfish.AbstractIsisFishTest; import fr.ifremer.isisfish.IsisFishDAOHelper; import fr.ifremer.isisfish.datastore.SimulationStorage; -import fr.ifremer.isisfish.entities.Gear; -import fr.ifremer.isisfish.entities.Population; -import fr.ifremer.isisfish.entities.Zone; import fr.ifremer.isisfish.simulator.SimulationContext; import fr.ifremer.isisfish.types.TimeStep; @@ -63,7 +60,7 @@ public void setUp() throws IOException, TopiaException { MatrixFactory.setSemanticMapper(new IsisMatrixSemanticMapper()); URL zipURL = this.getClass().getResource("/simulations/test-nonregression-20090203.zip"); - SimulationStorage simRef = SimulationStorage.importAndRenameZip(new File(zipURL.getFile()), "test-nonregression"); + SimulationStorage simRef = SimulationStorage.importAndRenameZip(new File(zipURL.getFile()), "test-" + System.currentTimeMillis()); SimulationContext.get().setSimulationStorage(simRef); } @@ -75,9 +72,9 @@ @Test public void testImportEntityImportString() throws IOException, TopiaException { String data = "[1, 1, 1]\n" + - "String:testpopulation\n" + - "String:Testengin\n" + - "String:Zone test1\n" + + "Population:test population\n" + + "Gear:Testengin\n" + + "Zone:Zone test1\n" + "0;0;0;42.0"; TopiaContext tx = SimulationContext.get().getDB(); @@ -129,7 +126,7 @@ String data = "[1, 1, 2]\n" + "Population:test population\n" + "Gear:Testengin\n" + - "TimeStep:0,1\n" + + "TimeStep:1,0\n" + "0;0;0;1.0\n" + "0;0;1;2.0"; @@ -143,7 +140,7 @@ MatrixND m = MatrixFactory.getInstance().create(sems); m.importCSV(new StringReader(data), null); - Assert.assertEquals(1.0, m.getValue(0, 0, 0), 0.001); - Assert.assertEquals(2.0, m.getValue(0, 0, 1), 0.001); + Assert.assertEquals(2.0, m.getValue(0, 0, 0), 0.001); + Assert.assertEquals(1.0, m.getValue(0, 0, 1), 0.001); } }

1 0

r3717 - in trunk: . src/main/java/fr/ifremer/isisfish/util
by echatellier＠users.forge.codelutin.com Aug. 10, 2012

Aug. 10, 2012

Author: echatellier Date: 2012-08-10 11:24:11 +0200 (Fri, 10 Aug 2012) New Revision: 3717 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3717 Log: fixes : #1395 Script are compiled using default encoding Modified: trunk/pom.xml trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java trunk/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-09 13:04:18 UTC (rev 3716) +++ trunk/pom.xml 2012-08-10 09:24:11 UTC (rev 3717) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.2</version> + <version>3.3.5</version> </parent> <groupId>fr.ifremer</groupId> Modified: trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2012-08-09 13:04:18 UTC (rev 3716) +++ trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2012-08-10 09:24:11 UTC (rev 3717) @@ -239,6 +239,8 @@ args.add("-g"); // Show a description of each use or override of a deprecated member or class. args.add("-deprecation"); + args.add("-encoding"); + args.add("utf-8"); args.add("-classpath"); args.add(classpathAsString); args.add("-d"); Modified: trunk/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java 2012-08-09 13:04:18 UTC (rev 3716) +++ trunk/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java 2012-08-10 09:24:11 UTC (rev 3717) @@ -36,6 +36,7 @@ import java.util.List; import java.util.Map; +import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.FileUtil; @@ -94,9 +95,9 @@ Method interfaceMethod = methods[0]; String content = generateContent(packageName, className, interfaceMethod, script); - - FileUtil.writeString(src, content); + FileUtils.writeStringToFile(src, content, "utf-8"); + int compileResult = CompileHelper.compile(src.getParentFile(), src, src.getParentFile(), out); File dest = new File(src.getParentFile(), className + ".class"); dest.deleteOnExit();

1 0

r3716 - trunk/src/main/java/fr/ifremer/isisfish/aspect
by echatellier＠users.forge.codelutin.com Aug. 9, 2012

Aug. 9, 2012

Author: echatellier Date: 2012-08-09 15:04:18 +0200 (Thu, 09 Aug 2012) New Revision: 3716 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3716 Log: fixes #1393 : When using statistics, if an exception occurs, it's masked by another one Modified: trunk/src/main/java/fr/ifremer/isisfish/aspect/Trace.java Modified: trunk/src/main/java/fr/ifremer/isisfish/aspect/Trace.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/aspect/Trace.java 2012-08-08 16:30:02 UTC (rev 3715) +++ trunk/src/main/java/fr/ifremer/isisfish/aspect/Trace.java 2012-08-09 13:04:18 UTC (rev 3716) @@ -99,7 +99,7 @@ getTrace().traceBefore(); } - @AfterThrowing(type = "Exception", pointcut = "executeMethod") + @AfterThrowing(type = "java.lang.Exception", pointcut = "executeMethod") public void traceAfterThrowingExecute(JoinPoint jp) { // si une exeption est leve, il faut faire la meme chose traceAfterExecute(jp);

1 0

r3715 - in trunk/src/main/java/fr/ifremer/isisfish: datastore export logging mexico/export simulator types/hibernate ui/sensitivity ui/sensitivity/model util
by echatellier＠users.forge.codelutin.com Aug. 8, 2012

Aug. 8, 2012

Author: echatellier Date: 2012-08-08 18:30:02 +0200 (Wed, 08 Aug 2012) New Revision: 3715 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3715 Log: Fix imports... Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java trunk/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java trunk/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java trunk/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExplorer.java trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationVariable.java trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/TableBlockingLayerUI.java trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTreeCellRenderer.java trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTreeModel.java trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java trunk/src/main/java/fr/ifremer/isisfish/util/RangeOfValuesConverter.java Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2012-08-08 16:29:42 UTC (rev 3714) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2012-08-08 16:30:02 UTC (rev 3715) @@ -697,12 +697,12 @@ SimulationStorage result = new SimulationStorage(simDir, name, null); File data = result.getDataBackupFile(); - // FIXME was file.exists() ? if (data.exists()) { - TopiaContext tx = result.getStorage().beginTransaction(); + TopiaContext root = result.getStorage(); + TopiaContext tx = root.beginTransaction(); tx.restore(data); tx.commitTransaction(); - tx.closeContext(); + root.closeContext(); } return result; Modified: trunk/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java 2012-08-08 16:29:42 UTC (rev 3714) +++ trunk/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java 2012-08-08 16:30:02 UTC (rev 3715) @@ -32,18 +32,14 @@ import java.util.List; import java.util.Properties; -import org.apache.commons.beanutils.ConvertUtilsBean; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; -import fr.ifremer.isisfish.IsisFishException; import fr.ifremer.isisfish.datastore.ExportStorage; -import fr.ifremer.isisfish.datastore.SensitivityExportStorage; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.datastore.StorageHelper; -import fr.ifremer.isisfish.util.ConverterUtil; /** * Helper for exports manipulation. Modified: trunk/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java 2012-08-08 16:29:42 UTC (rev 3714) +++ trunk/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java 2012-08-08 16:30:02 UTC (rev 3715) @@ -25,7 +25,6 @@ package fr.ifremer.isisfish.logging; -import fr.ifremer.isisfish.IsisConfig; import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisFishException; import fr.ifremer.isisfish.datastore.SimulationStorage; Modified: trunk/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExplorer.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExplorer.java 2012-08-08 16:29:42 UTC (rev 3714) +++ trunk/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExplorer.java 2012-08-08 16:30:02 UTC (rev 3715) @@ -26,7 +26,6 @@ package fr.ifremer.isisfish.mexico.export; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.persistence.HorizontalEntityVisitor; import fr.ifremer.isisfish.entities.Cell; import fr.ifremer.isisfish.entities.FisheryRegion; Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationVariable.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationVariable.java 2012-08-08 16:29:42 UTC (rev 3714) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationVariable.java 2012-08-08 16:30:02 UTC (rev 3715) @@ -36,7 +36,6 @@ import fr.ifremer.isisfish.entities.EquationImpl; import fr.ifremer.isisfish.entities.Variable; import fr.ifremer.isisfish.equation.VariableEquation; -import fr.ifremer.isisfish.types.TimeStep; import fr.ifremer.isisfish.util.EvaluatorHelper; /** Modified: trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java 2012-08-08 16:29:42 UTC (rev 3714) +++ trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java 2012-08-08 16:30:02 UTC (rev 3715) @@ -41,7 +41,6 @@ import org.nuiton.math.matrix.MatrixND; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.StringUtil; -import org.hibernate.Hibernate; import org.hibernate.HibernateException; import org.hibernate.engine.SessionImplementor; import org.hibernate.engine.jdbc.NonContextualLobCreator; Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/TableBlockingLayerUI.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/TableBlockingLayerUI.java 2012-08-08 16:29:42 UTC (rev 3714) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/TableBlockingLayerUI.java 2012-08-08 16:30:02 UTC (rev 3715) @@ -38,7 +38,6 @@ import org.jdesktop.jxlayer.JXLayer; import org.jdesktop.jxlayer.plaf.AbstractLayerUI; import org.jdesktop.jxlayer.plaf.LayerUI; -import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityContextable; import fr.ifremer.isisfish.ui.input.InputContentUI; Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTreeCellRenderer.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTreeCellRenderer.java 2012-08-08 16:29:42 UTC (rev 3714) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTreeCellRenderer.java 2012-08-08 16:30:02 UTC (rev 3715) @@ -42,8 +42,6 @@ import fr.ifremer.isisfish.simulator.sensitivity.Factor; import fr.ifremer.isisfish.simulator.sensitivity.FactorGroup; import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; -import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; -import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain; /** * Factor tree cell renderer. Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTreeModel.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTreeModel.java 2012-08-08 16:29:42 UTC (rev 3714) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTreeModel.java 2012-08-08 16:30:02 UTC (rev 3715) @@ -47,9 +47,6 @@ */ public class FactorTreeModel implements TreeModel { - /** serialVersionUID. */ - private static final long serialVersionUID = 593284613450915826L; - /** Tree model root. */ protected Factor rootFactor; Modified: trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2012-08-08 16:29:42 UTC (rev 3714) +++ trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2012-08-08 16:30:02 UTC (rev 3715) @@ -41,7 +41,6 @@ import javax.tools.JavaCompiler; import javax.tools.JavaFileObject; import javax.tools.StandardJavaFileManager; -import javax.tools.StandardLocation; import javax.tools.ToolProvider; import org.apache.commons.lang3.StringUtils; Modified: trunk/src/main/java/fr/ifremer/isisfish/util/RangeOfValuesConverter.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/RangeOfValuesConverter.java 2012-08-08 16:29:42 UTC (rev 3714) +++ trunk/src/main/java/fr/ifremer/isisfish/util/RangeOfValuesConverter.java 2012-08-08 16:30:02 UTC (rev 3715) @@ -56,5 +56,3 @@ } } - -

1 0

r3714 - in trunk/src: main/java/fr/ifremer/isisfish/simulator main/java/fr/ifremer/isisfish/util test/java/fr/ifremer/isisfish/util
by echatellier＠users.forge.codelutin.com Aug. 8, 2012

Aug. 8, 2012

Author: echatellier Date: 2012-08-08 18:29:42 +0200 (Wed, 08 Aug 2012) New Revision: 3714 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3714 Log: Ajout d'un test unitaire sur l'import de matrice n dimensions Added: trunk/src/test/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapperTest.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java trunk/src/main/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapper.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java 2012-08-08 15:17:34 UTC (rev 3713) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java 2012-08-08 16:29:42 UTC (rev 3714) @@ -26,28 +26,19 @@ package fr.ifremer.isisfish.simulator; import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.io.Writer; import java.util.HashMap; import java.util.LinkedHashSet; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; -import org.apache.commons.beanutils.BeanUtils; -import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaEntity; -import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.datastore.SimulationStorage; -import fr.ifremer.isisfish.entities.Variable; import fr.ifremer.isisfish.simulator.sensitivity.SensitivityUtils; -import fr.ifremer.isisfish.types.TimeStep; /** * Keep all information on one simulation. @@ -322,7 +313,7 @@ /** * Script directory to use. * - * Used to chnage isis-database-3 directory in running simulation context. + * Used to change isis-database-3 directory in running simulation context. * * @param scriptDirectory */ Modified: trunk/src/main/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapper.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapper.java 2012-08-08 15:17:34 UTC (rev 3713) +++ trunk/src/main/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapper.java 2012-08-08 16:29:42 UTC (rev 3714) @@ -28,6 +28,7 @@ import org.nuiton.math.matrix.SemanticMapper; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.persistence.TopiaDAO; +import org.nuiton.topia.persistence.TopiaEntity; import fr.ifremer.isisfish.IsisFishDAOHelper; import fr.ifremer.isisfish.simulator.SimulationContext; @@ -64,8 +65,13 @@ try { clazz = Class.forName("fr.ifremer.isisfish.entities." + typeName); } catch (Exception ex) { - log.warn("Can't find class for " + typeName, ex); - clazz = String.class; + try { + clazz = Class.forName("fr.ifremer.isisfish.types." + typeName); + } catch (Exception ex2) { + log.warn("Can't find class for name " + typeName, ex2); + clazz = String.class; + } + } return clazz; } @@ -84,9 +90,13 @@ // In simulation context : Object value = null; try { - TopiaContext context = SimulationContext.get().getDB(); - TopiaDAO dao = IsisFishDAOHelper.getDAO(context, type); - value = dao.findByProperty("name", valueId); + if (TopiaEntity.class.isAssignableFrom(type)) { + TopiaContext context = SimulationContext.get().getDB(); + TopiaDAO dao = IsisFishDAOHelper.getDAO(context, type); + value = dao.findByProperty("name", valueId); + } else { + value = ConverterUtil.getConverter(null).convert(valueId, type); + } } catch (Exception ex) { log.warn("Can't get value for " + valueId, ex); value = valueId; Added: trunk/src/test/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapperTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapperTest.java (rev 0) +++ trunk/src/test/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapperTest.java 2012-08-08 16:29:42 UTC (rev 3714) @@ -0,0 +1,149 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 Ifremer, Code Lutin + * %% + * 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.util; + +import java.io.File; +import java.io.IOException; +import java.io.StringReader; +import java.net.URL; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +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.topia.TopiaContext; +import org.nuiton.topia.TopiaException; + +import fr.ifremer.isisfish.AbstractIsisFishTest; +import fr.ifremer.isisfish.IsisFishDAOHelper; +import fr.ifremer.isisfish.datastore.SimulationStorage; +import fr.ifremer.isisfish.entities.Gear; +import fr.ifremer.isisfish.entities.Population; +import fr.ifremer.isisfish.entities.Zone; +import fr.ifremer.isisfish.simulator.SimulationContext; +import fr.ifremer.isisfish.types.TimeStep; + +/** + * Test que le semantic mapper est bien pris en compte lors de l'import + * de matrix nd et qu'il converti bien tous les types requis. + * + * @author echatellier + * @since 4.1.0.3 + */ +public class IsisMatrixSemanticMapperTest extends AbstractIsisFishTest { + + @Before + public void setUp() throws IOException, TopiaException { + MatrixFactory.setSemanticMapper(new IsisMatrixSemanticMapper()); + URL zipURL = this.getClass().getResource("/simulations/test-nonregression-20090203.zip"); + SimulationStorage simRef = SimulationStorage.importAndRenameZip(new File(zipURL.getFile()), "test-nonregression"); + SimulationContext.get().setSimulationStorage(simRef); + } + + /** + * Test la conversion des entités. + * @throws IOException + * @throws TopiaException + */ + @Test + public void testImportEntityImportString() throws IOException, TopiaException { + String data = "[1, 1, 1]\n" + + "String:testpopulation\n" + + "String:Testengin\n" + + "String:Zone test1\n" + + "0;0;0;42.0"; + + TopiaContext tx = SimulationContext.get().getDB(); + + List[] sems = new List[] { + Collections.singletonList(IsisFishDAOHelper.getPopulationDAO(tx).findByName("test population")), + Collections.singletonList(IsisFishDAOHelper.getGearDAO(tx).findByName("Testengin")), + Collections.singletonList(IsisFishDAOHelper.getZoneDAO(tx).findByName("Zone test1")), + }; + MatrixND m = MatrixFactory.getInstance().create(sems); + m.importCSV(new StringReader(data), null); + + Assert.assertEquals(42.0, m.getValue(0, 0, 0), 0.001); + } + + /** + * Test la conversion des entités. + * @throws IOException + * @throws TopiaException + */ + @Test + public void testImportEntity() throws IOException, TopiaException { + String data = "[1, 1, 1]\n" + + "Population:test population\n" + + "Gear:Testengin\n" + + "Zone:Zone test1\n" + + "0;0;0;42.0"; + + TopiaContext tx = SimulationContext.get().getDB(); + + List[] sems = new List[] { + Collections.singletonList(IsisFishDAOHelper.getPopulationDAO(tx).findByName("test population")), + Collections.singletonList(IsisFishDAOHelper.getGearDAO(tx).findByName("Testengin")), + Collections.singletonList(IsisFishDAOHelper.getZoneDAO(tx).findByName("Zone test1")), + }; + MatrixND m = MatrixFactory.getInstance().create(sems); + m.importCSV(new StringReader(data), null); + + Assert.assertEquals(42.0, m.getValue(0, 0, 0), 0.001); + } + + /** + * Test la conversion des entités et TimeStep + * @throws IOException + * @throws TopiaException + */ + @Test + public void testImportEntityTimeStep() throws IOException, TopiaException { + String data = "[1, 1, 2]\n" + + "Population:test population\n" + + "Gear:Testengin\n" + + "TimeStep:0,1\n" + + "0;0;0;1.0\n" + + "0;0;1;2.0"; + + TopiaContext tx = SimulationContext.get().getDB(); + + List[] sems = new List[] { + Collections.singletonList(IsisFishDAOHelper.getPopulationDAO(tx).findByName("test population")), + Collections.singletonList(IsisFishDAOHelper.getGearDAO(tx).findByName("Testengin")), + Arrays.asList(new TimeStep(0), new TimeStep(1)), + }; + MatrixND m = MatrixFactory.getInstance().create(sems); + m.importCSV(new StringReader(data), null); + + Assert.assertEquals(1.0, m.getValue(0, 0, 0), 0.001); + Assert.assertEquals(2.0, m.getValue(0, 0, 1), 0.001); + } +} Property changes on: trunk/src/test/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapperTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r3713 - in trunk/src/main: java/fr/ifremer/isisfish java/fr/ifremer/isisfish/ui/input java/fr/ifremer/isisfish/ui/input/variable resources/i18n
by echatellier＠users.forge.codelutin.com Aug. 8, 2012

Aug. 8, 2012

Author: echatellier Date: 2012-08-08 17:17:34 +0200 (Wed, 08 Aug 2012) New Revision: 3713 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3713 Log: fixes #1389 : Add new variable tab for population Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx trunk/src/main/resources/i18n/isis-fish_en_GB.properties trunk/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2012-08-08 13:15:08 UTC (rev 3712) +++ trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2012-08-08 15:17:34 UTC (rev 3713) @@ -53,6 +53,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.I18n; +import org.nuiton.i18n.init.ClassPathI18nInitializer; import org.nuiton.i18n.init.DefaultI18nInitializer; import org.nuiton.math.matrix.MatrixFactory; import org.nuiton.topia.TopiaException; @@ -230,8 +231,13 @@ config.parse(args); // to work in java webstart - I18n.init(new DefaultI18nInitializer("isis-fish-i18n"), config.getLocale()); - + try { + I18n.init(new DefaultI18nInitializer("isis-fish-i18n"), config.getLocale()); + } catch (Exception ex) { + // dev mode + I18n.init(new ClassPathI18nInitializer(), config.getLocale()); + } + // after init shutdown hook Runtime.getRuntime().addShutdownHook(new IsisQuitHook()); } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2012-08-08 13:15:08 UTC (rev 3712) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2012-08-08 15:17:34 UTC (rev 3713) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2011 Ifremer, Code Lutin, Chatellier Eric + Copyright (C) 2009 - 2012 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 @@ -41,12 +41,6 @@ installChangeListener(populationTab); } -/*public void refresh() { - // reverse ordre is no more needed - getSaveVerifier().addCurrentPanel(populationMigrationUI, populationRecruitementUI, populationCapturabilityUI, - populationSeasonsUI, populationZoneUI, populationEquationUI, populationGroupUI, populationBasicsUI); -}*/ - @Override public void setLayer(boolean active) { super.setLayer(active); @@ -59,6 +53,7 @@ populationCapturabilityUI.setLayer(active); populationMigrationUI.setLayer(active); populationPriceUI.setLayer(active); + variablesUI.setLayer(active); } @Override @@ -72,6 +67,7 @@ populationCapturabilityUI.resetChangeModel(); populationMigrationUI.resetChangeModel(); populationPriceUI.resetChangeModel(); + variablesUI.resetChangeModel(); } ]]> </script> @@ -113,6 +109,11 @@ <tab title='isisfish.populationPrice.title'> <PopulationPriceUI id='populationPriceUI' bean="{getBean()}" active="{isActive()}" sensitivity="{isSensitivity()}" constructorParams='this'/> </tab> + <tab title='isisfish.variables.tabtitle'> + <fr.ifremer.isisfish.ui.input.variable.EntityVariableUI id="variablesUI" + bean="{getBean()}" active="{isActive()}" + sensitivity="{isSensitivity()}" constructorParams='this'/> + </tab> </JTabbedPane> </JPanel> </fr.ifremer.isisfish.ui.input.InputContentUI> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableHandler.java 2012-08-08 13:15:08 UTC (rev 3712) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableHandler.java 2012-08-08 15:17:34 UTC (rev 3713) @@ -30,6 +30,7 @@ import javax.swing.JList; +import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; @@ -79,6 +80,18 @@ } catch (TopiaException ex) { throw new IsisFishRuntimeException("Can't init view", ex); } + + // try to set entity name in label + try { + String name = BeanUtils.getProperty(view.getBean(), "name"); + view.getVariableEntityName().setText(name); + } catch (Exception ex) { + if (log.isWarnEnabled()) { + log.warn("Can't get entity name", ex); + } + } + } else { + view.getVariableEntityName().setText(""); } model.setEntities(variables); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx 2012-08-08 13:15:08 UTC (rev 3712) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx 2012-08-08 15:17:34 UTC (rev 3713) @@ -76,6 +76,16 @@ <Table border='{BorderFactory.createTitledBorder(_("isisfish.variables.variabledetail"))}'> <row> <cell fill="horizontal"> + <JLabel text="isisfish.variables.entityname" + enabled='{isActive() && getVariable() != null}'/> + </cell> + <cell fill="horizontal" weightx='1.0'> + <JLabel id="variableEntityName" + enabled='{isActive() && getVariable() != null}'/> + </cell> + </row> + <row> + <cell fill="horizontal"> <JLabel text="isisfish.variables.variablename" enabled='{isActive() && getVariable() != null}'/> </cell> Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2012-08-08 13:15:08 UTC (rev 3712) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2012-08-08 15:17:34 UTC (rev 3713) @@ -970,6 +970,7 @@ isisfish.variables.defaultname=VarName isisfish.variables.deletevariable=Delete isisfish.variables.double.value=Real value \: +isisfish.variables.entityname=Object name \: isisfish.variables.matrix.value=Matrix \: isisfish.variables.savevariable=Save isisfish.variables.tabtitle=Variables Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2012-08-08 13:15:08 UTC (rev 3712) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2012-08-08 15:17:34 UTC (rev 3713) @@ -970,6 +970,7 @@ isisfish.variables.defaultname=VarName isisfish.variables.deletevariable=Supprimer isisfish.variables.double.value=Valeur réelle \: +isisfish.variables.entityname=Nom de l'objet \: isisfish.variables.matrix.value=Matrice isisfish.variables.savevariable=Sauver isisfish.variables.tabtitle=Variables

1 0

r3712 - in trunk/src/main: java/fr/ifremer/isisfish resources/fr/ifremer/isisfish/entities
by echatellier＠users.forge.codelutin.com Aug. 8, 2012

Aug. 8, 2012

Author: echatellier Date: 2012-08-08 15:15:08 +0200 (Wed, 08 Aug 2012) New Revision: 3712 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3712 Log: fixes #1388 : Can't open database in offline mode Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java trunk/src/main/resources/fr/ifremer/isisfish/entities/Cell-error-validation.xml trunk/src/main/resources/fr/ifremer/isisfish/entities/FisheryRegion-error-validation.xml trunk/src/main/resources/fr/ifremer/isisfish/entities/Gear-gear-error-validation.xml trunk/src/main/resources/fr/ifremer/isisfish/entities/Metier-metier-error-validation.xml trunk/src/main/resources/fr/ifremer/isisfish/entities/Population-basics-error-validation.xml trunk/src/main/resources/fr/ifremer/isisfish/entities/Port-error-validation.xml trunk/src/main/resources/fr/ifremer/isisfish/entities/Port-warning-validation.xml trunk/src/main/resources/fr/ifremer/isisfish/entities/SetOfVessels-basics-error-validation.xml trunk/src/main/resources/fr/ifremer/isisfish/entities/Species-error-validation.xml trunk/src/main/resources/fr/ifremer/isisfish/entities/Strategy-basics-error-validation.xml trunk/src/main/resources/fr/ifremer/isisfish/entities/TripType-error-validation.xml trunk/src/main/resources/fr/ifremer/isisfish/entities/VesselType-error-validation.xml trunk/src/main/resources/fr/ifremer/isisfish/entities/Zone-error-validation.xml trunk/src/main/resources/fr/ifremer/isisfish/entities/Zone-warning-validation.xml Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2012-08-08 13:14:44 UTC (rev 3711) +++ trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2012-08-08 13:15:08 UTC (rev 3712) @@ -119,7 +119,7 @@ * migration de donnees demande automatiquement un changement de version * d'application. */ - protected final static Version version = new Version(4, 1, 0, 0); + protected final static Version version = new Version(4, 1, 0, 3); protected final static Version majorVersion = new Version(version.getNumber(0)); protected final static Version databaseVersion = new Version( Modified: trunk/src/main/resources/fr/ifremer/isisfish/entities/Cell-error-validation.xml =================================================================== --- trunk/src/main/resources/fr/ifremer/isisfish/entities/Cell-error-validation.xml 2012-08-08 13:14:44 UTC (rev 3711) +++ trunk/src/main/resources/fr/ifremer/isisfish/entities/Cell-error-validation.xml 2012-08-08 13:15:08 UTC (rev 3712) @@ -3,7 +3,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2011 -2012 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 @@ -21,8 +21,8 @@ #L% --> <!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="name"> <field-validator type="requiredstring"> Modified: trunk/src/main/resources/fr/ifremer/isisfish/entities/FisheryRegion-error-validation.xml =================================================================== --- trunk/src/main/resources/fr/ifremer/isisfish/entities/FisheryRegion-error-validation.xml 2012-08-08 13:14:44 UTC (rev 3711) +++ trunk/src/main/resources/fr/ifremer/isisfish/entities/FisheryRegion-error-validation.xml 2012-08-08 13:15:08 UTC (rev 3712) @@ -3,7 +3,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2011 - 2012 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 @@ -21,8 +21,8 @@ #L% --> <!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="name"> <field-validator type="requiredstring"> Modified: trunk/src/main/resources/fr/ifremer/isisfish/entities/Gear-gear-error-validation.xml =================================================================== --- trunk/src/main/resources/fr/ifremer/isisfish/entities/Gear-gear-error-validation.xml 2012-08-08 13:14:44 UTC (rev 3711) +++ trunk/src/main/resources/fr/ifremer/isisfish/entities/Gear-gear-error-validation.xml 2012-08-08 13:15:08 UTC (rev 3712) @@ -3,7 +3,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2011 - 2012 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 @@ -21,8 +21,8 @@ #L% --> <!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="name"> <field-validator type="requiredstring"> Modified: trunk/src/main/resources/fr/ifremer/isisfish/entities/Metier-metier-error-validation.xml =================================================================== --- trunk/src/main/resources/fr/ifremer/isisfish/entities/Metier-metier-error-validation.xml 2012-08-08 13:14:44 UTC (rev 3711) +++ trunk/src/main/resources/fr/ifremer/isisfish/entities/Metier-metier-error-validation.xml 2012-08-08 13:15:08 UTC (rev 3712) @@ -3,7 +3,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2011 - 2012 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 @@ -21,8 +21,8 @@ #L% --> <!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="name"> <field-validator type="requiredstring"> Modified: trunk/src/main/resources/fr/ifremer/isisfish/entities/Population-basics-error-validation.xml =================================================================== --- trunk/src/main/resources/fr/ifremer/isisfish/entities/Population-basics-error-validation.xml 2012-08-08 13:14:44 UTC (rev 3711) +++ trunk/src/main/resources/fr/ifremer/isisfish/entities/Population-basics-error-validation.xml 2012-08-08 13:15:08 UTC (rev 3712) @@ -3,7 +3,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2011 - 2012 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 @@ -21,8 +21,8 @@ #L% --> <!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="name"> <field-validator type="requiredstring"> Modified: trunk/src/main/resources/fr/ifremer/isisfish/entities/Port-error-validation.xml =================================================================== --- trunk/src/main/resources/fr/ifremer/isisfish/entities/Port-error-validation.xml 2012-08-08 13:14:44 UTC (rev 3711) +++ trunk/src/main/resources/fr/ifremer/isisfish/entities/Port-error-validation.xml 2012-08-08 13:15:08 UTC (rev 3712) @@ -3,7 +3,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2011 - 2012 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 @@ -21,8 +21,8 @@ #L% --> <!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="name"> <field-validator type="requiredstring"> Modified: trunk/src/main/resources/fr/ifremer/isisfish/entities/Port-warning-validation.xml =================================================================== --- trunk/src/main/resources/fr/ifremer/isisfish/entities/Port-warning-validation.xml 2012-08-08 13:14:44 UTC (rev 3711) +++ trunk/src/main/resources/fr/ifremer/isisfish/entities/Port-warning-validation.xml 2012-08-08 13:15:08 UTC (rev 3712) @@ -3,7 +3,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2011 - 2012 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 @@ -21,8 +21,8 @@ #L% --> <!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="cell"> <field-validator type="fieldexpression"> Modified: trunk/src/main/resources/fr/ifremer/isisfish/entities/SetOfVessels-basics-error-validation.xml =================================================================== --- trunk/src/main/resources/fr/ifremer/isisfish/entities/SetOfVessels-basics-error-validation.xml 2012-08-08 13:14:44 UTC (rev 3711) +++ trunk/src/main/resources/fr/ifremer/isisfish/entities/SetOfVessels-basics-error-validation.xml 2012-08-08 13:15:08 UTC (rev 3712) @@ -3,7 +3,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2011 - 2012 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 @@ -21,8 +21,8 @@ #L% --> <!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="name"> <field-validator type="requiredstring"> Modified: trunk/src/main/resources/fr/ifremer/isisfish/entities/Species-error-validation.xml =================================================================== --- trunk/src/main/resources/fr/ifremer/isisfish/entities/Species-error-validation.xml 2012-08-08 13:14:44 UTC (rev 3711) +++ trunk/src/main/resources/fr/ifremer/isisfish/entities/Species-error-validation.xml 2012-08-08 13:15:08 UTC (rev 3712) @@ -3,7 +3,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2011 - 2012 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 @@ -21,8 +21,8 @@ #L% --> <!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="name"> <field-validator type="requiredstring"> Modified: trunk/src/main/resources/fr/ifremer/isisfish/entities/Strategy-basics-error-validation.xml =================================================================== --- trunk/src/main/resources/fr/ifremer/isisfish/entities/Strategy-basics-error-validation.xml 2012-08-08 13:14:44 UTC (rev 3711) +++ trunk/src/main/resources/fr/ifremer/isisfish/entities/Strategy-basics-error-validation.xml 2012-08-08 13:15:08 UTC (rev 3712) @@ -3,7 +3,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2011 - 2012 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 @@ -21,8 +21,8 @@ #L% --> <!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="name"> <field-validator type="requiredstring"> Modified: trunk/src/main/resources/fr/ifremer/isisfish/entities/TripType-error-validation.xml =================================================================== --- trunk/src/main/resources/fr/ifremer/isisfish/entities/TripType-error-validation.xml 2012-08-08 13:14:44 UTC (rev 3711) +++ trunk/src/main/resources/fr/ifremer/isisfish/entities/TripType-error-validation.xml 2012-08-08 13:15:08 UTC (rev 3712) @@ -3,7 +3,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2011 - 2012 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 @@ -21,8 +21,8 @@ #L% --> <!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="name"> <field-validator type="requiredstring"> Modified: trunk/src/main/resources/fr/ifremer/isisfish/entities/VesselType-error-validation.xml =================================================================== --- trunk/src/main/resources/fr/ifremer/isisfish/entities/VesselType-error-validation.xml 2012-08-08 13:14:44 UTC (rev 3711) +++ trunk/src/main/resources/fr/ifremer/isisfish/entities/VesselType-error-validation.xml 2012-08-08 13:15:08 UTC (rev 3712) @@ -3,7 +3,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2011 - 2012 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 @@ -21,8 +21,8 @@ #L% --> <!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="name"> <field-validator type="requiredstring"> Modified: trunk/src/main/resources/fr/ifremer/isisfish/entities/Zone-error-validation.xml =================================================================== --- trunk/src/main/resources/fr/ifremer/isisfish/entities/Zone-error-validation.xml 2012-08-08 13:14:44 UTC (rev 3711) +++ trunk/src/main/resources/fr/ifremer/isisfish/entities/Zone-error-validation.xml 2012-08-08 13:15:08 UTC (rev 3712) @@ -3,7 +3,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2011 - 2012 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 @@ -21,8 +21,8 @@ #L% --> <!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="name"> <field-validator type="requiredstring"> Modified: trunk/src/main/resources/fr/ifremer/isisfish/entities/Zone-warning-validation.xml =================================================================== --- trunk/src/main/resources/fr/ifremer/isisfish/entities/Zone-warning-validation.xml 2012-08-08 13:14:44 UTC (rev 3711) +++ trunk/src/main/resources/fr/ifremer/isisfish/entities/Zone-warning-validation.xml 2012-08-08 13:15:08 UTC (rev 3712) @@ -3,7 +3,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2011 - 2012 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 @@ -21,8 +21,8 @@ #L% --> <!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="cell"> <field-validator type="fieldexpression">

1 0

r3711 - trunk/src/site/rst/documentation
by echatellier＠users.forge.codelutin.com Aug. 8, 2012

Aug. 8, 2012

Author: echatellier Date: 2012-08-08 15:14:44 +0200 (Wed, 08 Aug 2012) New Revision: 3711 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3711 Log: Add latex presentation of last isis fish formation Added: trunk/src/site/rst/documentation/isisscript.tex Added: trunk/src/site/rst/documentation/isisscript.tex =================================================================== --- trunk/src/site/rst/documentation/isisscript.tex (rev 0) +++ trunk/src/site/rst/documentation/isisscript.tex 2012-08-08 13:14:44 UTC (rev 3711) @@ -0,0 +1,215 @@ +\documentclass[pdf,13pt]{beamer} +\usepackage[utf8]{inputenc} +\usepackage[T1]{fontenc} +\usepackage[francais]{babel} % francais +\usepackage{graphicx} % images +\usepackage{times} +\usepackage{listings} +\usepackage{color} + +% Theme beamer and color +% JuanLesPins Malmoe PaloAlto Berlin Boadilla Copenhagen Hannover Goettingen +% Montpellier Rochester Madrid Antibes Singapore Szeged Warsaw +% Ilmenau Luebeck Dresden Frankfurt* Darmstadt* +\usetheme{Frankfurt} +% albatross,beetle,crane,default,dove,fly,lily,orchid,rose,seagull +% seahorse,whale,dolphin +%\usecolortheme{sidebartab} +%\setbeamertemplate{navigation symbols}{} % supprime la navigation +\usefonttheme[onlylarge]{structurebold} +\setbeamerfont*{frametitle}{size=\normalsize,series=\bfseries} +\setbeamertemplate{navigation symbols}{} + +% Types d'images utilisees +\DeclareGraphicsExtensions{.png, .eps, .jpg} + +% Ajout du logo Code Lutin en fond +\setbeamertemplate{background}{% + \parbox[c][\paperheight]{\paperwidth}{% + \vfill + \vfill + \hfill + \includegraphics[width=0.23\paperwidth,height=0.1\paperheight]{isislogo} + \hfill +}} + + +% ######################### Document Infos ##################################### +% Infos de la page de presentation +\title{ISIS-Fish} +\subtitle{Scripts} +\author{CHATELLIER Eric + \and{} + POUSSIN Benjamin} +\institute{ + Ifremer + \and{} + Code Lutin +} +\date{6 décembre 2011} + +% ############################################################################## +\begin{document} + +\begin{frame} +\titlepage +\end{frame} + +\begin{frame} +\frametitle{Plan} +\tableofcontents +\end{frame} + +% ############################################################################## +\section{Fonctionnement} + +\subsection{Qu'est-ce qu'un script ?} +\begin{frame} +\frametitle{Qu'est-ce qu'un script ?} + + \begin{itemize} + \item Code de production de simulation + \item Code d'execution de simulation + \item Écrit en Java + \item Modifiable par l'utilisateur + \end{itemize} + +\end{frame} + +\subsection{Simulateur} +\begin{frame} +\frametitle{Simulateur} + + \begin{block}{DefaultSimulator.java} + \begin{itemize} + \item Effectifs initiaux + \item Opérations par pas de temps (mois) + \item Application de la dynamique de pêcherie (pêche, mortalité...) + \item Enregistrement des résultats + \end{itemize} + \end{block} + + \begin{block}{Modification} + \begin{itemize} + \item SimulatorEffortByCell + \item Autres scripts... + \end{itemize} + \end{block} +\end{frame} + +\subsection{Scripts} +\begin{frame} +\frametitle{Scripts} + \begin{block}{Avant la simulation} + \begin{itemize} + \item Plan de simulations + \begin{itemize} + \item Plan d'expérience + \item Calibration + \end{itemize} + \item Plan d'analyzes + \begin{itemize} + \item Expand Grid + \item Moriss + \item Sobol + \end{itemize} + \end{itemize} + \end{block} +\end{frame} + +\begin{frame} +\frametitle{Scripts} + \begin{block}{Pendant la simulation} + \begin{itemize} + \item Règles (chaque pas de temps) + \begin{itemize} + \item Fermeture de zone + \item Application de quotat + \item Taille minimum des poissons + \item ... + \end{itemize} + \end{itemize} + \end{block} +\end{frame} + +\begin{frame} +\frametitle{Scripts} + \begin{block}{Après la simulation} + \begin{itemize} + \item Exports + \begin{itemize} + \item Biomasse + \item Abondance + \item Capture + \item Rejet + \end{itemize} + \end{itemize} + \end{block} +\end{frame} + +\begin{frame} +\frametitle{Scripts} + \begin{block}{Scripts importants} + \begin{itemize} + \item ResultName (nom des résultats) + \item SiMatrix (calcul des matrices) + \item GravityModel (calcul des matrices aussi) + \end{itemize} + \end{block} +\end{frame} + +% ############################################################################## +\section{Utilisation et modification} + +\subsection{Utilisation} +\begin{frame} +\frametitle{Utilisation des scripts} + + \begin{itemize} + \item Ajout dans l'interface + \item Définition des parametres (param\_) + \item Lancement de la simulation + \end{itemize} + +\end{frame} + +\subsection{Modification} +\begin{frame} +\frametitle{Modification des scripts} + + \begin{block}{Interface et dépôt} + \begin{itemize} + \item Interface de gestion des scripts + \item Dépôt officiel + \item Dépôt communauté + \end{itemize} + \end{block} + + \begin{block}{Dépôt communauté} + \begin{itemize} + \item Creation d'un nouvelle règle + \item Modification de la régle + \item Vérification de la règle + \item Utilisation de la règle + \end{itemize} + \end{block} + +\end{frame} + + +% ############################################################################## +\section{Contribution} + +\subsection{Contribution} +\begin{frame} + \frametitle{Contribution} + + \begin{itemize} + \item Partage de scripts utilisateur + \item Droit de commit + \item Synchronisation de la communauté + \end{itemize} + +\end{frame} + +\end{document}

1 0