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

r3763 - trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by echatellier＠users.forge.codelutin.com 04 Sep '12

04 Sep '12

Author: echatellier Date: 2012-09-04 11:32:34 +0200 (Tue, 04 Sep 2012) New Revision: 3763 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3763 Log: Add fixme Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2012-09-04 08:52:58 UTC (rev 3762) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2012-09-04 09:32:34 UTC (rev 3763) @@ -43,7 +43,6 @@ import java.util.Map; import java.util.Properties; import java.util.Set; -import java.util.SortedMap; import java.util.TreeSet; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -54,7 +53,6 @@ import org.apache.commons.beanutils.ConvertUtils; import org.apache.commons.beanutils.ConvertUtilsBean; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.mutable.MutableInt; import org.apache.commons.lang3.time.DurationFormatUtils; @@ -67,7 +65,6 @@ import org.nuiton.util.FileUtil; import org.nuiton.util.ListenerSet; import org.nuiton.util.ObjectUtil; -import org.nuiton.util.StringUtil; import org.nuiton.util.ZipUtil; import fr.ifremer.isisfish.IsisFish; @@ -1019,6 +1016,8 @@ } // close context for plan generator + // FIXME echatellier 20120904 could throw + //org.nuiton.topia.TopiaException: Ce contexte a deja ete ferme sim.closeStorage(); // quoi qu'il arrive on supprime le repertoire temporaire

1 0

r3762 - trunk/src/main/java/fr/ifremer/isisfish
by echatellier＠users.forge.codelutin.com 04 Sep '12

04 Sep '12

Author: echatellier Date: 2012-09-04 10:52:58 +0200 (Tue, 04 Sep 2012) New Revision: 3762 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3762 Log: Fix next version Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2012-09-04 08:52:27 UTC (rev 3761) +++ trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2012-09-04 08:52:58 UTC (rev 3762) @@ -119,7 +119,7 @@ * migration de donnees demande automatiquement un changement de version * d'application. */ - protected final static Version version = new Version(4, 1, 1, 1); + protected final static Version version = new Version(4, 1, 1, 2); protected final static Version majorVersion = new Version(version.getNumber(0)); protected final static Version databaseVersion = new Version(

1 0

r3761 - in trunk: . src/main/java/fr/ifremer/isisfish/datastore
by echatellier＠users.forge.codelutin.com 04 Sep '12

04 Sep '12

Author: echatellier Date: 2012-09-04 10:52:27 +0200 (Tue, 04 Sep 2012) New Revision: 3761 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3761 Log: Restore commented stuff after release Modified: trunk/pom.xml trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultMappedStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-09-04 08:25:48 UTC (rev 3760) +++ trunk/pom.xml 2012-09-04 08:52:27 UTC (rev 3761) @@ -62,14 +62,14 @@ <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix</artifactId> - <version>2.3.1</version> + <version>2.3.2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix-gui</artifactId> - <version>2.3.1</version> + <version>2.3.2-SNAPSHOT</version> <scope>compile</scope> </dependency> Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultMappedStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultMappedStorage.java 2012-09-04 08:25:48 UTC (rev 3760) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultMappedStorage.java 2012-09-04 08:52:27 UTC (rev 3761) @@ -25,8 +25,22 @@ package fr.ifremer.isisfish.datastore; -import static org.nuiton.i18n.I18n._; - +import fr.ifremer.isisfish.IsisFishDAOHelper; +import fr.ifremer.isisfish.IsisFishException; +import fr.ifremer.isisfish.IsisFishRuntimeException; +import fr.ifremer.isisfish.entities.ActiveRule; +import fr.ifremer.isisfish.entities.ActiveRuleDAO; +import fr.ifremer.isisfish.entities.Population; +import fr.ifremer.isisfish.export.Export; +import fr.ifremer.isisfish.export.SensitivityExport; +import fr.ifremer.isisfish.rule.Rule; +import fr.ifremer.isisfish.simulator.SimulationContext; +import fr.ifremer.isisfish.simulator.SimulationException; +import fr.ifremer.isisfish.simulator.SimulationPlan; +import fr.ifremer.isisfish.simulator.SimulationResultGetter; +import fr.ifremer.isisfish.simulator.SimulationResultListener; +import fr.ifremer.isisfish.types.Month; +import fr.ifremer.isisfish.types.TimeStep; import java.io.File; import java.io.IOException; import java.io.RandomAccessFile; @@ -39,36 +53,25 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; - import org.apache.commons.collections.BidiMap; import org.apache.commons.collections.bidimap.DualHashBidiMap; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.math.matrix.DoubleBigMappedVector; +import org.nuiton.math.matrix.MatrixFactory; +import org.nuiton.math.matrix.MatrixHelper; import org.nuiton.math.matrix.MatrixIterator; import org.nuiton.math.matrix.MatrixND; +import org.nuiton.math.matrix.MatrixSemanticsDecorator; +import org.nuiton.math.matrix.SemanticsDecorator; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.ArrayUtil; import org.nuiton.util.HashList; -import fr.ifremer.isisfish.IsisFishDAOHelper; -import fr.ifremer.isisfish.IsisFishException; -import fr.ifremer.isisfish.IsisFishRuntimeException; -import fr.ifremer.isisfish.entities.ActiveRule; -import fr.ifremer.isisfish.entities.ActiveRuleDAO; -import fr.ifremer.isisfish.entities.Population; -import fr.ifremer.isisfish.export.Export; -import fr.ifremer.isisfish.export.SensitivityExport; -import fr.ifremer.isisfish.rule.Rule; -import fr.ifremer.isisfish.simulator.SimulationContext; -import fr.ifremer.isisfish.simulator.SimulationException; -import fr.ifremer.isisfish.simulator.SimulationPlan; -import fr.ifremer.isisfish.simulator.SimulationResultGetter; -import fr.ifremer.isisfish.simulator.SimulationResultListener; -import fr.ifremer.isisfish.types.Month; -import fr.ifremer.isisfish.types.TimeStep; +import static org.nuiton.i18n.I18n._; /** * Cette classe permet de conserver des résultats de simulation. Elle permet @@ -88,7 +91,7 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(ResultMappedStorage.class); - //static protected MatrixFactory matrixFactory = MatrixFactory.getInstance(DoubleBigMappedVector.class); + static protected MatrixFactory matrixFactory = MatrixFactory.getInstance(DoubleBigMappedVector.class); protected SimulationStorage simulation = null; protected RandomAccessFile raf; @@ -105,7 +108,7 @@ * Convertie une entite, month, timestep en string et inversement. * Entity = "TopiaId:Entity.toString" */ - static protected class EntitySemanticsDecorator /*implements SemanticsDecorator*/ { + static protected class EntitySemanticsDecorator implements SemanticsDecorator { static final private String SEP = ":"; protected TopiaContext tx; @@ -223,8 +226,8 @@ long dataOffset = offset + size; int dataSize = raf.readInt(); // en mettant un int on est limite a 2Go x 8 (double) = 16Go par matrice - //DoubleBigMappedVector data = new DoubleBigMappedVector(raf, dataOffset, dataSize); - //this.matrix = matrixFactory.create(name, sems, dimNames, data); + DoubleBigMappedVector data = new DoubleBigMappedVector(raf, dataOffset, dataSize); + this.matrix = matrixFactory.create(name, sems, dimNames, data); size += dataSize * 8; /* un double est sur 8 bytes*/ this.size = size; @@ -241,7 +244,7 @@ String[] dimNames = matrix.getDimensionNames(); int[] dims = matrix.getDim(); List[] sems = matrix.getSemantics(); - int dataSize = 0; //MatrixHelper.getVectorSize(dims); // en mettant un int on est limite a 2Go x 8 (double) = 16Go par matrice + int dataSize = MatrixHelper.getVectorSize(dims); // en mettant un int on est limite a 2Go x 8 (double) = 16Go par matrice raf.write(step.getStep()); // ecriture du pas de temps raf.writeUTF(name); // ecriture du nom du resultat @@ -255,13 +258,13 @@ } // conversion et enregistrement des semantiques - //SemanticsDecorator deco = new EntitySemanticsDecorator(); + SemanticsDecorator deco = new EntitySemanticsDecorator(); for (int i=0; i<sems.length; i ++) { List l = sems[i]; List undecorate = new ArrayList(l.size()); sems[i] = undecorate; for (Object o : l) { - //o = deco.undecorate(o); + o = deco.undecorate(o); undecorate.add(o); raf.writeUTF(o.toString()); // ecriture de chaque dimension } @@ -274,8 +277,8 @@ long dataOffset = offset + size; // on cree la nouvelle matrice comme il faut (semantique non decore) - //DoubleBigMappedVector data = new DoubleBigMappedVector(raf, dataOffset, dataSize); - //this.matrix = MatrixFactory.getInstance().create(name, sems, dimNames, data); + DoubleBigMappedVector data = new DoubleBigMappedVector(raf, dataOffset, dataSize); + this.matrix = MatrixFactory.getInstance().create(name, sems, dimNames, data); // et on met les valeurs de l'ancienne dans la nouvelle this.matrix.paste(matrix); @@ -305,8 +308,8 @@ public MatrixND getMatrix(TopiaContext tx) { // on met la matrice dans un decorateur pour convertir automatiquement les semantiques - //MatrixND result = new MatrixSemanticsDecorator(matrix, new EntitySemanticsDecorator(tx)); - return null; + MatrixND result = new MatrixSemanticsDecorator(matrix, new EntitySemanticsDecorator(tx)); + return result; } } @@ -711,7 +714,7 @@ } // creation de la matrice resultat - //resultMat = matrixFactory.create(name, sem, dimNames); + resultMat = matrixFactory.create(name, sem, dimNames); // recuperation du resultat pour chaque date de la simulation, de Date(0) à lastDate for (ResultMapped result : results.values()) { @@ -735,7 +738,7 @@ // on decore la matrice resultat au dernier moment, tous les calcules // ce font avec les strings tx = getTx(tx); - //resultMat = new MatrixSemanticsDecorator(resultMat, new EntitySemanticsDecorator(tx)); + resultMat = new MatrixSemanticsDecorator(resultMat, new EntitySemanticsDecorator(tx)); } return resultMat; } Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2012-09-04 08:25:48 UTC (rev 3760) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2012-09-04 08:52:27 UTC (rev 3761) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2005 - 2011 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, Chatellier Eric + * Copyright (C) 2005 - 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 @@ -453,24 +453,24 @@ public ResultStorage getResultStorage() throws StorageException { if (resultStorage == null) { - // depuis la version 4.1.1.1 le stockage a changé de base + // depuis la version 4.1.1.2 le stockage a changé de base // de données à fichier mappe pour les resultat // mais il faut pouvoir relire les anciennes simulations - /*SimulationParameter param = getParameter(); + SimulationParameter param = getParameter(); String isisFishVersion = param.getIsisFishVersion(); Version simuVersion = new Version(isisFishVersion); - Version version4111 = new Version(4,1,1,1); + Version version4112 = new Version(4,1,1,2); // instancier un ResultStorage ou un ResultMappedStorage - if (simuVersion.before(version4111)) {*/ + if (simuVersion.before(version4112)) { resultStorage = new ResultDatabaseStorage(this); - /*} else { + } else { try { resultStorage = new ResultMappedStorage(this); } catch (IOException ex) { throw new StorageException("Can't get storage", ex); } - }*/ + } } return resultStorage; }

1 0

r3760 - trunk
by maven-release＠users.forge.codelutin.com 04 Sep '12

04 Sep '12

Author: maven-release Date: 2012-09-04 10:25:48 +0200 (Tue, 04 Sep 2012) New Revision: 3760 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3760 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-09-04 08:25:41 UTC (rev 3759) +++ trunk/pom.xml 2012-09-04 08:25:48 UTC (rev 3760) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.1.1.1</version> + <version>4.1.1.2-SNAPSHOT</version>  <dependencies> @@ -730,9 +730,9 @@   <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.1.1.1</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.1.1.1</developerConnection> - <url>http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.1.1.1</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

r3759 - in tags: . isis-fish-4.1.1.1
by maven-release＠users.forge.codelutin.com 04 Sep '12

04 Sep '12

Author: maven-release Date: 2012-09-04 10:25:41 +0200 (Tue, 04 Sep 2012) New Revision: 3759 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3759 Log: [maven-release-plugin] copy for tag isis-fish-4.1.1.1 Added: tags/isis-fish-4.1.1.1/ Property changes on: tags/isis-fish-4.1.1.1 ___________________________________________________________________ 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

r3758 - trunk
by maven-release＠users.forge.codelutin.com 04 Sep '12

04 Sep '12

Author: maven-release Date: 2012-09-04 10:25:34 +0200 (Tue, 04 Sep 2012) New Revision: 3758 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3758 Log: [maven-release-plugin] prepare release isis-fish-4.1.1.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-09-04 08:20:38 UTC (rev 3757) +++ trunk/pom.xml 2012-09-04 08:25:34 UTC (rev 3758) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.1.1.1-SNAPSHOT</version> + <version>4.1.1.1</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.1.1</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.1.1.1</developerConnection> + <url>http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.1.1.1</url> </scm> <repositories>

1 0

r3757 - trunk/src/main/java/fr/ifremer/isisfish/datastore
by echatellier＠users.forge.codelutin.com 04 Sep '12

04 Sep '12

Author: echatellier Date: 2012-09-04 10:20:38 +0200 (Tue, 04 Sep 2012) New Revision: 3757 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3757 Log: Add header Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java 2012-09-04 08:18:20 UTC (rev 3756) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java 2012-09-04 08:20:38 UTC (rev 3757) @@ -1,3 +1,28 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 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 + * 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.datastore; import java.util.List;

1 0

r3756 - in trunk: . src/main/java/fr/ifremer/isisfish/datastore
by echatellier＠users.forge.codelutin.com 04 Sep '12

04 Sep '12

Author: echatellier Date: 2012-09-04 10:18:20 +0200 (Tue, 04 Sep 2012) New Revision: 3756 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3756 Log: Comment current development to prepare release. Modified: trunk/pom.xml trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultMappedStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-09-02 23:09:00 UTC (rev 3755) +++ trunk/pom.xml 2012-09-04 08:18:20 UTC (rev 3756) @@ -62,7 +62,7 @@ <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix</artifactId> - <version>2.3.2-SNAPSHOT</version> + <version>2.3.1</version> <scope>compile</scope> </dependency> Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultMappedStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultMappedStorage.java 2012-09-02 23:09:00 UTC (rev 3755) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultMappedStorage.java 2012-09-04 08:18:20 UTC (rev 3756) @@ -25,22 +25,8 @@ package fr.ifremer.isisfish.datastore; -import fr.ifremer.isisfish.IsisFishDAOHelper; -import fr.ifremer.isisfish.IsisFishException; -import fr.ifremer.isisfish.IsisFishRuntimeException; -import fr.ifremer.isisfish.entities.ActiveRule; -import fr.ifremer.isisfish.entities.ActiveRuleDAO; -import fr.ifremer.isisfish.entities.Population; -import fr.ifremer.isisfish.export.Export; -import fr.ifremer.isisfish.export.SensitivityExport; -import fr.ifremer.isisfish.rule.Rule; -import fr.ifremer.isisfish.simulator.SimulationContext; -import fr.ifremer.isisfish.simulator.SimulationException; -import fr.ifremer.isisfish.simulator.SimulationPlan; -import fr.ifremer.isisfish.simulator.SimulationResultGetter; -import fr.ifremer.isisfish.simulator.SimulationResultListener; -import fr.ifremer.isisfish.types.Month; -import fr.ifremer.isisfish.types.TimeStep; +import static org.nuiton.i18n.I18n._; + import java.io.File; import java.io.IOException; import java.io.RandomAccessFile; @@ -48,31 +34,41 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; -import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeMap; + import org.apache.commons.collections.BidiMap; import org.apache.commons.collections.bidimap.DualHashBidiMap; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.math.matrix.DoubleBigMappedVector; -import org.nuiton.math.matrix.MatrixFactory; -import org.nuiton.math.matrix.MatrixHelper; import org.nuiton.math.matrix.MatrixIterator; import org.nuiton.math.matrix.MatrixND; -import org.nuiton.math.matrix.MatrixSemanticsDecorator; -import org.nuiton.math.matrix.SemanticsDecorator; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.ArrayUtil; import org.nuiton.util.HashList; -import static org.nuiton.i18n.I18n._; +import fr.ifremer.isisfish.IsisFishDAOHelper; +import fr.ifremer.isisfish.IsisFishException; +import fr.ifremer.isisfish.IsisFishRuntimeException; +import fr.ifremer.isisfish.entities.ActiveRule; +import fr.ifremer.isisfish.entities.ActiveRuleDAO; +import fr.ifremer.isisfish.entities.Population; +import fr.ifremer.isisfish.export.Export; +import fr.ifremer.isisfish.export.SensitivityExport; +import fr.ifremer.isisfish.rule.Rule; +import fr.ifremer.isisfish.simulator.SimulationContext; +import fr.ifremer.isisfish.simulator.SimulationException; +import fr.ifremer.isisfish.simulator.SimulationPlan; +import fr.ifremer.isisfish.simulator.SimulationResultGetter; +import fr.ifremer.isisfish.simulator.SimulationResultListener; +import fr.ifremer.isisfish.types.Month; +import fr.ifremer.isisfish.types.TimeStep; /** * Cette classe permet de conserver des résultats de simulation. Elle permet @@ -92,7 +88,7 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(ResultMappedStorage.class); - static protected MatrixFactory matrixFactory = MatrixFactory.getInstance(DoubleBigMappedVector.class); + //static protected MatrixFactory matrixFactory = MatrixFactory.getInstance(DoubleBigMappedVector.class); protected SimulationStorage simulation = null; protected RandomAccessFile raf; @@ -109,7 +105,7 @@ * Convertie une entite, month, timestep en string et inversement. * Entity = "TopiaId:Entity.toString" */ - static protected class EntitySemanticsDecorator implements SemanticsDecorator { + static protected class EntitySemanticsDecorator /*implements SemanticsDecorator*/ { static final private String SEP = ":"; protected TopiaContext tx; @@ -227,8 +223,8 @@ long dataOffset = offset + size; int dataSize = raf.readInt(); // en mettant un int on est limite a 2Go x 8 (double) = 16Go par matrice - DoubleBigMappedVector data = new DoubleBigMappedVector(raf, dataOffset, dataSize); - this.matrix = matrixFactory.create(name, sems, dimNames, data); + //DoubleBigMappedVector data = new DoubleBigMappedVector(raf, dataOffset, dataSize); + //this.matrix = matrixFactory.create(name, sems, dimNames, data); size += dataSize * 8; /* un double est sur 8 bytes*/ this.size = size; @@ -245,7 +241,7 @@ String[] dimNames = matrix.getDimensionNames(); int[] dims = matrix.getDim(); List[] sems = matrix.getSemantics(); - int dataSize = MatrixHelper.getVectorSize(dims); // en mettant un int on est limite a 2Go x 8 (double) = 16Go par matrice + int dataSize = 0; //MatrixHelper.getVectorSize(dims); // en mettant un int on est limite a 2Go x 8 (double) = 16Go par matrice raf.write(step.getStep()); // ecriture du pas de temps raf.writeUTF(name); // ecriture du nom du resultat @@ -259,13 +255,13 @@ } // conversion et enregistrement des semantiques - SemanticsDecorator deco = new EntitySemanticsDecorator(); + //SemanticsDecorator deco = new EntitySemanticsDecorator(); for (int i=0; i<sems.length; i ++) { List l = sems[i]; List undecorate = new ArrayList(l.size()); sems[i] = undecorate; for (Object o : l) { - o = deco.undecorate(o); + //o = deco.undecorate(o); undecorate.add(o); raf.writeUTF(o.toString()); // ecriture de chaque dimension } @@ -278,8 +274,8 @@ long dataOffset = offset + size; // on cree la nouvelle matrice comme il faut (semantique non decore) - DoubleBigMappedVector data = new DoubleBigMappedVector(raf, dataOffset, dataSize); - this.matrix = MatrixFactory.getInstance().create(name, sems, dimNames, data); + //DoubleBigMappedVector data = new DoubleBigMappedVector(raf, dataOffset, dataSize); + //this.matrix = MatrixFactory.getInstance().create(name, sems, dimNames, data); // et on met les valeurs de l'ancienne dans la nouvelle this.matrix.paste(matrix); @@ -309,10 +305,9 @@ public MatrixND getMatrix(TopiaContext tx) { // on met la matrice dans un decorateur pour convertir automatiquement les semantiques - MatrixND result = new MatrixSemanticsDecorator(matrix, new EntitySemanticsDecorator(tx)); - return result; + //MatrixND result = new MatrixSemanticsDecorator(matrix, new EntitySemanticsDecorator(tx)); + return null; } - } /** @@ -325,7 +320,15 @@ public ResultMappedStorage(SimulationStorage simulation) throws IOException { this.simulation = simulation; File file = SimulationStorage.getResultFile(simulation.getDirectory()); - raf = new RandomAccessFile(file, "rw"); + + // le fichier semble se corrompre à la relecture (ouverture + // en lecture seule s'il existe déjà) + if (file.isFile()) { + raf = new RandomAccessFile(file, "r"); + } else { + raf = new RandomAccessFile(file, "rw"); + } + // on lit les donnees deja presente offset = 0; while (offset < raf.length()) { @@ -708,7 +711,7 @@ } // creation de la matrice resultat - resultMat = matrixFactory.create(name, sem, dimNames); + //resultMat = matrixFactory.create(name, sem, dimNames); // recuperation du resultat pour chaque date de la simulation, de Date(0) à lastDate for (ResultMapped result : results.values()) { @@ -732,7 +735,7 @@ // on decore la matrice resultat au dernier moment, tous les calcules // ce font avec les strings tx = getTx(tx); - resultMat = new MatrixSemanticsDecorator(resultMat, new EntitySemanticsDecorator(tx)); + //resultMat = new MatrixSemanticsDecorator(resultMat, new EntitySemanticsDecorator(tx)); } return resultMat; } Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2012-09-02 23:09:00 UTC (rev 3755) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2012-09-04 08:18:20 UTC (rev 3756) @@ -43,6 +43,7 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.util.FileUtil; +import org.nuiton.util.Version; import org.nuiton.util.ZipUtil; import fr.ifremer.isisfish.IsisFish; @@ -451,13 +452,25 @@ */ public ResultStorage getResultStorage() throws StorageException { if (resultStorage == null) { + + // depuis la version 4.1.1.1 le stockage a changé de base + // de données à fichier mappe pour les resultat + // mais il faut pouvoir relire les anciennes simulations + /*SimulationParameter param = getParameter(); + String isisFishVersion = param.getIsisFishVersion(); + Version simuVersion = new Version(isisFishVersion); + Version version4111 = new Version(4,1,1,1); + // instancier un ResultStorage ou un ResultMappedStorage - //resultStorage = new ResultDatabaseStorage(this); - try { - resultStorage = new ResultMappedStorage(this); - } catch (IOException ex) { - throw new StorageException("Can't get storage", ex); - } + if (simuVersion.before(version4111)) {*/ + resultStorage = new ResultDatabaseStorage(this); + /*} else { + try { + resultStorage = new ResultMappedStorage(this); + } catch (IOException ex) { + throw new StorageException("Can't get storage", ex); + } + }*/ } return resultStorage; }

1 0

r3755 - trunk/src/main/java/fr/ifremer/isisfish/datastore
by bpoussin＠users.forge.codelutin.com 02 Sep '12

02 Sep '12

Author: bpoussin Date: 2012-09-03 01:09:00 +0200 (Mon, 03 Sep 2012) New Revision: 3755 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3755 Log: on passe offset a long pour supporter les fichiers de resultats > 2go Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultMappedStorage.java Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultMappedStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultMappedStorage.java 2012-08-31 18:17:43 UTC (rev 3754) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultMappedStorage.java 2012-09-02 23:09:00 UTC (rev 3755) @@ -96,7 +96,7 @@ protected SimulationStorage simulation = null; protected RandomAccessFile raf; - protected int offset; + protected long offset; protected Map<TimeStep, Map<String, ResultMapped>> stepNameResults = new TreeMap<TimeStep, Map<String, ResultMapped>>(); protected Map<String, Map<TimeStep, ResultMapped>> nameStepResults = @@ -186,14 +186,14 @@ */ static protected class ResultMapped { protected RandomAccessFile raf; - protected int offset; - protected int size; + protected long offset; + protected long size; protected TimeStep step; protected String name; protected MatrixND matrix; /** read data from file */ - public ResultMapped(RandomAccessFile raf, int offset) throws IOException { + public ResultMapped(RandomAccessFile raf, long offset) throws IOException { this.raf = raf; this.offset = offset; @@ -223,10 +223,10 @@ } } - int size = (int) raf.getFilePointer(); - int dataOffset = offset + size; + long size = raf.getFilePointer(); + long dataOffset = offset + size; - int dataSize = raf.readInt(); + int dataSize = raf.readInt(); // en mettant un int on est limite a 2Go x 8 (double) = 16Go par matrice DoubleBigMappedVector data = new DoubleBigMappedVector(raf, dataOffset, dataSize); this.matrix = matrixFactory.create(name, sems, dimNames, data); @@ -235,7 +235,7 @@ } /** write date to file */ - public ResultMapped(RandomAccessFile raf, int offset, + public ResultMapped(RandomAccessFile raf, long offset, TimeStep step, String name, MatrixND matrix) throws IOException { this.raf = raf; this.offset = offset; @@ -245,7 +245,7 @@ String[] dimNames = matrix.getDimensionNames(); int[] dims = matrix.getDim(); List[] sems = matrix.getSemantics(); - int dataSize = MatrixHelper.getVectorSize(dims); + int dataSize = MatrixHelper.getVectorSize(dims); // en mettant un int on est limite a 2Go x 8 (double) = 16Go par matrice raf.write(step.getStep()); // ecriture du pas de temps raf.writeUTF(name); // ecriture du nom du resultat @@ -274,9 +274,9 @@ raf.writeInt(dataSize); // on prend la position apres l'ecriture de l'entete - int size = (int) raf.getFilePointer(); + long size = raf.getFilePointer(); - int dataOffset = offset + size; + long dataOffset = offset + size; // on cree la nouvelle matrice comme il faut (semantique non decore) DoubleBigMappedVector data = new DoubleBigMappedVector(raf, dataOffset, dataSize); this.matrix = MatrixFactory.getInstance().create(name, sems, dimNames, data); @@ -291,7 +291,7 @@ * retourne la taille en nombre de byte * @return */ - public int size() { + public long size() { return size; }

1 0