Author: bpoussin Date: 2014-07-11 13:21:35 +0200 (Fri, 11 Jul 2014) New Revision: 4037 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4037 Log: - can use Lazy or not via configuration Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java 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/IsisConfig.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2014-07-11 08:50:40 UTC (rev 4036) +++ trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2014-07-11 11:21:35 UTC (rev 4037) @@ -846,6 +846,8 @@ getOption(Option.SIMULATION_MATRIX_VECTOR_SPARSE_CLASS.key)); result.put(Option.SIMULATION_MATRIX_THRESHOLD_USE_SPARSE_CLASS.key, getOption(Option.SIMULATION_MATRIX_THRESHOLD_USE_SPARSE_CLASS.key)); + result.put(Option.SIMULATION_MATRIX_USE_LAZY_VECTOR.key, + getOption(Option.SIMULATION_MATRIX_USE_LAZY_VECTOR.key)); result.put(Option.SIMULATION_STORE_RESULT_ON_DISK.key, getOption(Option.SIMULATION_STORE_RESULT_ON_DISK.key)); result.put(Option.SIMULATION_STORE_RESULT_CACHE_STEP.key, @@ -1010,6 +1012,18 @@ } /** + * Seuil d'uitilisation des matrices creuse + * + * @return + * @since 4.3.1.0 + */ + public boolean getSimulationMatrixdUseLazyVector() { + ApplicationConfig config = SimulationContext.get().getConfig(); + boolean result = config.getOptionAsBoolean(Option.SIMULATION_MATRIX_USE_LAZY_VECTOR.key); + return result; + } + + /** * Indique le nombre de pas qui doivent etre sauve, en partant du dernier pas * de temps. * @@ -1083,6 +1097,7 @@ SIMULATION_MATRIX_VECTOR_CLASS("simulation.matrix.vector.class", n("isisfish.config.simulation.matrix.vector.class.description"), DoubleBigVector.class.getName()), SIMULATION_MATRIX_VECTOR_SPARSE_CLASS("simulation.matrix.vector.sparse.class", n("isisfish.config.simulation.matrix.vector.sparse.class.description"), DoubleSparseHashVector.class.getName()), SIMULATION_MATRIX_THRESHOLD_USE_SPARSE_CLASS("simulation.matrix.threshold.use.sparse.class", n("isisfish.config.simulation.matrix.threshold.use.sparse.class.description"), "1000"), + SIMULATION_MATRIX_USE_LAZY_VECTOR("simulation.matrix.use.lazy.vector", n("isisfish.config.simulation.matrix.use.lazy.vector.description"), "true"), SIMULATION_STORE_RESULT_ON_DISK("simulation.store.result.ondisk", n("isisfish.config.simulation.store.result.ondisk.description"), "-1"), SIMULATION_STORE_RESULT_CACHE_STEP("simulation.store.result.cachestep", n("isisfish.config.simulation.store.result.cachestep.description"), "13"), Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java 2014-07-11 08:50:40 UTC (rev 4036) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java 2014-07-11 11:21:35 UTC (rev 4037) @@ -131,7 +131,8 @@ MatrixFactory.initMatrixFactoryThreadLocal( IsisFish.config.getSimulationMatrixVectorClass(), IsisFish.config.getSimulationMatrixVectorSparseClass(), - IsisFish.config.getSimulationMatrixThresholdUseSparse()); + IsisFish.config.getSimulationMatrixThresholdUseSparse(), + IsisFish.config.getSimulationMatrixdUseLazyVector()); } /** Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java 2014-07-11 08:50:40 UTC (rev 4036) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java 2014-07-11 11:21:35 UTC (rev 4037) @@ -228,6 +228,7 @@ modelBuilder.addOption(IsisConfig.Option.SIMULATION_MATRIX_VECTOR_CLASS); modelBuilder.addOption(IsisConfig.Option.SIMULATION_MATRIX_VECTOR_SPARSE_CLASS); modelBuilder.addOption(IsisConfig.Option.SIMULATION_MATRIX_THRESHOLD_USE_SPARSE_CLASS); + modelBuilder.addOption(IsisConfig.Option.SIMULATION_MATRIX_USE_LAZY_VECTOR); modelBuilder.addOption(IsisConfig.Option.MAPPED_RESULT_MATRIX_VECTOR_CLASS); modelBuilder.addOption(IsisConfig.Option.SIMULATION_STORE_RESULT_ON_DISK); modelBuilder.addOption(IsisConfig.Option.SIMULATION_STORE_RESULT_CACHE_STEP); Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2014-07-11 08:50:40 UTC (rev 4036) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2014-07-11 11:21:35 UTC (rev 4037) @@ -230,6 +230,7 @@ isisfish.config.main.userName.description=User name isisfish.config.mapped.result.matrix.vector.class.description= isisfish.config.simulation.matrix.threshold.use.sparse.class.description= +isisfish.config.simulation.matrix.use.lazy.vector.description= isisfish.config.simulation.matrix.vector.class.description= isisfish.config.simulation.matrix.vector.sparse.class.description= isisfish.config.simulation.store.result.cachestep.description= Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-07-11 08:50:40 UTC (rev 4036) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-07-11 11:21:35 UTC (rev 4037) @@ -230,6 +230,7 @@ isisfish.config.main.userName.description=le nom - prénom de l'utilisateur isisfish.config.mapped.result.matrix.vector.class.description= isisfish.config.simulation.matrix.threshold.use.sparse.class.description= +isisfish.config.simulation.matrix.use.lazy.vector.description= isisfish.config.simulation.matrix.vector.class.description= isisfish.config.simulation.matrix.vector.sparse.class.description= isisfish.config.simulation.store.result.cachestep.description=