r51 - trunk/rules - Isis-fish-community-commits

10 Mar 2016

Author: echatellier
Date: 2016-03-10 12:05:00 +0100 (Thu, 10 Mar 2016)
New Revision: 51

Url: http://forge.codelutin.com/projects/isis-fish-community/repository/revisions...

Log:
Fix script (a little)

Modified:
   trunk/rules/TACpoids20012011.java
   trunk/rules/TACpoids20012011OgiveTriMerlu.java
   trunk/rules/TACpoids20012011TailleMin.java
   trunk/rules/TACpoidsPop.java
   trunk/rules/TACpoidsPop20082011.java
   trunk/rules/TACpoidsPop_PourHCR.java
   trunk/rules/TACpoidsTailleMin.java

Modified: trunk/rules/TACpoids20012011.java
===================================================================

--- trunk/rules/TACpoids20012011.java	2016-03-10 10:56:44 UTC (rev 50)
+++ trunk/rules/TACpoids20012011.java	2016-03-10 11:05:00 UTC (rev 51)
@@ -206,7 +206,7 @@
      * 
      * @param context la simulation pour lequel on utilise cette regle
      * @param step le pas de temps courant
-     * @param metier le metier concernÃƒÆ’Ã†â€™Ãƒâ€ Ã¢â‚¬â„¢ÃƒÆ’Ã¢â‚¬Å¡Ãƒâ€šÃ‚Â©
+     * @param metier le metier concerne
      */
     @Override
     public void preAction(SimulationContext context, TimeStep step, Metier metier)
@@ -368,7 +368,7 @@
                                 + discardRegle);
                         if (param_propSurvie > 0) {
                             MatrixND eff = popMon.getN(pop);
-                            //on rÃƒÆ’Ã†â€™Ãƒâ€ Ã¢â‚¬â„¢ÃƒÆ’Ã¢â‚¬Å¡Ãƒâ€šÃ‚Â©ajoute les survivants aux effectifs
+                            //on reajoute les survivants aux effectifs
                             for (MatrixIterator i = discardRegle.iterator(); i
                                     .next();) {
                                 Object[] coord = i.getSemanticsCoordinates();

Modified: trunk/rules/TACpoids20012011OgiveTriMerlu.java
===================================================================
--- trunk/rules/TACpoids20012011OgiveTriMerlu.java	2016-03-10 10:56:44 UTC (rev 50)
+++ trunk/rules/TACpoids20012011OgiveTriMerlu.java	2016-03-10 11:05:00 UTC (rev 51)
@@ -2,7 +2,7 @@
  * #%L
  * IsisFish data
  * %%
- * Copyright (C) 2006 - 2012 Ifremer, CodeLutin
+ * Copyright (C) 2006 - 2016 Ifremer, CodeLutin
  * %%
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
@@ -23,9 +23,6 @@
 
 import java.util.HashSet;
 import java.util.Set;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Iterator;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -35,16 +32,6 @@
 import scripts.ResultName;
 import scripts.RuleUtil;
 import scripts.SiMatrix;
-import fr.ifremer.isisfish.datastore.ResultStorage;
-import fr.ifremer.isisfish.entities.EffortDescription;
-import fr.ifremer.isisfish.entities.Metier;
-import fr.ifremer.isisfish.entities.Population;
-import fr.ifremer.isisfish.entities.Species;
-import fr.ifremer.isisfish.entities.Strategy;
-import fr.ifremer.isisfish.entities.StrategyMonthInfo;
-import fr.ifremer.isisfish.entities.TargetSpecies;
-import fr.ifremer.isisfish.entities.MetierSeasonInfo;
-import fr.ifremer.isisfish.entities.PopulationGroup;
 import fr.ifremer.isisfish.entities.*;
 import fr.ifremer.isisfish.rule.AbstractRule;
 import fr.ifremer.isisfish.simulator.MetierMonitor;
@@ -51,7 +38,6 @@
 import fr.ifremer.isisfish.simulator.PopulationMonitor;
 import fr.ifremer.isisfish.simulator.SimulationContext;
 import fr.ifremer.isisfish.types.TimeStep;
-import fr.ifremer.isisfish.types.Month;
 import fr.ifremer.isisfish.util.Doc;
 
 /**

Modified: trunk/rules/TACpoids20012011TailleMin.java
===================================================================
--- trunk/rules/TACpoids20012011TailleMin.java	2016-03-10 10:56:44 UTC (rev 50)
+++ trunk/rules/TACpoids20012011TailleMin.java	2016-03-10 11:05:00 UTC (rev 51)
@@ -2,7 +2,7 @@
  * #%L
  * IsisFish data
  * %%
- * Copyright (C) 2006 - 2012 Ifremer, CodeLutin
+ * Copyright (C) 2006 - 2016 Ifremer, CodeLutin
  * %%
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
@@ -23,9 +23,6 @@
 
 import java.util.HashSet;
 import java.util.Set;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Iterator;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -35,16 +32,6 @@
 import scripts.ResultName;
 import scripts.RuleUtil;
 import scripts.SiMatrix;
-import fr.ifremer.isisfish.datastore.ResultStorage;
-import fr.ifremer.isisfish.entities.EffortDescription;
-import fr.ifremer.isisfish.entities.Metier;
-import fr.ifremer.isisfish.entities.Population;
-import fr.ifremer.isisfish.entities.Species;
-import fr.ifremer.isisfish.entities.Strategy;
-import fr.ifremer.isisfish.entities.StrategyMonthInfo;
-import fr.ifremer.isisfish.entities.TargetSpecies;
-import fr.ifremer.isisfish.entities.MetierSeasonInfo;
-import fr.ifremer.isisfish.entities.PopulationGroup;
 import fr.ifremer.isisfish.entities.*;
 import fr.ifremer.isisfish.rule.AbstractRule;
 import fr.ifremer.isisfish.simulator.MetierMonitor;
@@ -51,7 +38,6 @@
 import fr.ifremer.isisfish.simulator.PopulationMonitor;
 import fr.ifremer.isisfish.simulator.SimulationContext;
 import fr.ifremer.isisfish.types.TimeStep;
-import fr.ifremer.isisfish.types.Month;
 import fr.ifremer.isisfish.util.Doc;
 
 /**
@@ -398,7 +384,7 @@
                                 + discardRegle);
                         if (param_propSurvie > 0) {
                             MatrixND eff = popMon.getN(pop);
-                            //on rÃƒÆ’Ã†â€™Ãƒâ€ Ã¢â‚¬â„¢ÃƒÆ’Ã¢â‚¬Â ÃƒÂ¢Ã¢â€šÂ¬Ã¢â€žÂ¢ÃƒÆ’Ã†â€™ÃƒÂ¢Ã¢â€šÂ¬Ã…Â¡ÃƒÆ’Ã¢â‚¬Å¡Ãƒâ€šÃ‚Â©ajoute les survivants aux effectifs
+                            //on reajoute les survivants aux effectifs
                             for (MatrixIterator i = discardRegle.iterator(); i
                                     .next();) {
                                 Object[] coord = i.getSemanticsCoordinates();

Modified: trunk/rules/TACpoidsPop.java
===================================================================
--- trunk/rules/TACpoidsPop.java	2016-03-10 10:56:44 UTC (rev 50)
+++ trunk/rules/TACpoidsPop.java	2016-03-10 11:05:00 UTC (rev 51)
@@ -2,7 +2,7 @@
  * #%L
  * IsisFish data
  * %%
- * Copyright (C) 2006 - 2011 Ifremer, CodeLutin
+ * Copyright (C) 2006 - 2016 Ifremer, CodeLutin
  * %%
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
@@ -33,13 +33,7 @@
 import scripts.RuleUtil;
 import scripts.SiMatrix;
 import fr.ifremer.isisfish.datastore.ResultStorage;
-import fr.ifremer.isisfish.entities.EffortDescription;
-import fr.ifremer.isisfish.entities.Metier;
-import fr.ifremer.isisfish.entities.Population;
-import fr.ifremer.isisfish.entities.Species;
-import fr.ifremer.isisfish.entities.Strategy;
-import fr.ifremer.isisfish.entities.StrategyMonthInfo;
-import fr.ifremer.isisfish.entities.TargetSpecies;
+import fr.ifremer.isisfish.entities.*;
 import fr.ifremer.isisfish.rule.AbstractRule;
 import fr.ifremer.isisfish.simulator.MetierMonitor;
 import fr.ifremer.isisfish.simulator.PopulationMonitor;

Modified: trunk/rules/TACpoidsPop20082011.java
===================================================================
--- trunk/rules/TACpoidsPop20082011.java	2016-03-10 10:56:44 UTC (rev 50)
+++ trunk/rules/TACpoidsPop20082011.java	2016-03-10 11:05:00 UTC (rev 51)
@@ -32,11 +32,9 @@
 import scripts.ResultName;
 import scripts.RuleUtil;
 import scripts.SiMatrix;
-import fr.ifremer.isisfish.datastore.ResultStorage;
 import fr.ifremer.isisfish.entities.EffortDescription;
 import fr.ifremer.isisfish.entities.Metier;
 import fr.ifremer.isisfish.entities.Population;
-import fr.ifremer.isisfish.entities.Species;
 import fr.ifremer.isisfish.entities.Strategy;
 import fr.ifremer.isisfish.entities.StrategyMonthInfo;
 import fr.ifremer.isisfish.entities.TargetSpecies;
@@ -45,7 +43,6 @@
 import fr.ifremer.isisfish.simulator.PopulationMonitor;
 import fr.ifremer.isisfish.simulator.SimulationContext;
 import fr.ifremer.isisfish.types.TimeStep;
-import fr.ifremer.isisfish.types.Month;
 import fr.ifremer.isisfish.util.Doc;
 
 /**

Modified: trunk/rules/TACpoidsPop_PourHCR.java
===================================================================
--- trunk/rules/TACpoidsPop_PourHCR.java	2016-03-10 10:56:44 UTC (rev 50)
+++ trunk/rules/TACpoidsPop_PourHCR.java	2016-03-10 11:05:00 UTC (rev 51)
@@ -32,22 +32,13 @@
 import scripts.ResultName;
 import scripts.RuleUtil;
 import scripts.SiMatrix;
-import rules.HCR_transition_MSY; // En a-t-on besoin ????
 import fr.ifremer.isisfish.datastore.ResultStorage;
-import fr.ifremer.isisfish.entities.EffortDescription;
-import fr.ifremer.isisfish.entities.Metier;
-import fr.ifremer.isisfish.entities.Population;
-import fr.ifremer.isisfish.entities.Species;
-import fr.ifremer.isisfish.entities.Strategy;
-import fr.ifremer.isisfish.entities.StrategyMonthInfo;
-import fr.ifremer.isisfish.entities.TargetSpecies;
+import fr.ifremer.isisfish.entities.*;
 import fr.ifremer.isisfish.rule.AbstractRule;
 import fr.ifremer.isisfish.simulator.MetierMonitor;
 import fr.ifremer.isisfish.simulator.PopulationMonitor;
 import fr.ifremer.isisfish.simulator.SimulationContext;
 import fr.ifremer.isisfish.types.TimeStep;
-import fr.ifremer.isisfish.types.Month;
-import fr.ifremer.isisfish.util.Doc;
 
 /**
  * TAC peut-etre utilise pour les differents TAC, en proportion des effectifs

Modified: trunk/rules/TACpoidsTailleMin.java
===================================================================
--- trunk/rules/TACpoidsTailleMin.java	2016-03-10 10:56:44 UTC (rev 50)
+++ trunk/rules/TACpoidsTailleMin.java	2016-03-10 11:05:00 UTC (rev 51)
@@ -23,9 +23,6 @@
 
 import java.util.HashSet;
 import java.util.Set;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Iterator;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -35,16 +32,6 @@
 import scripts.ResultName;
 import scripts.RuleUtil;
 import scripts.SiMatrix;
-import fr.ifremer.isisfish.datastore.ResultStorage;
-import fr.ifremer.isisfish.entities.EffortDescription;
-import fr.ifremer.isisfish.entities.Metier;
-import fr.ifremer.isisfish.entities.Population;
-import fr.ifremer.isisfish.entities.Species;
-import fr.ifremer.isisfish.entities.Strategy;
-import fr.ifremer.isisfish.entities.StrategyMonthInfo;
-import fr.ifremer.isisfish.entities.TargetSpecies;
-import fr.ifremer.isisfish.entities.MetierSeasonInfo;
-import fr.ifremer.isisfish.entities.PopulationGroup;
 import fr.ifremer.isisfish.entities.*;
 import fr.ifremer.isisfish.rule.AbstractRule;
 import fr.ifremer.isisfish.simulator.MetierMonitor;
@@ -299,12 +286,12 @@
     }
 
     /**
-     * Si la condition est vrai alors cette action est executÃƒÆ’Ã‚Â©e apres le pas
+     * Si la condition est vrai alors cette action est executee apres le pas
      * de temps de la simulation.
      * 
      * @param context La simulation pour lequel on utilise cette regle
      * @param step le pas de temps courant
-     * @param metier le metier concernÃƒÆ’Ã‚Â©
+     * @param metier le metier concerne
      */
     @Override
     public void postAction(SimulationContext context, TimeStep step, Metier metier)

    

r51 - trunk/rules

echatellier＠users.forge.codelutin.com

tags

participants (1)