Isis-fish-data-commits
Threads by month
- ----- 2026 -----
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
June 2020
- 1 participants
- 1 discussions
Author: echatellier
Date: 2020-06-04 13:52:37 +0200 (Thu, 04 Jun 2020)
New Revision: 416
Url: http://forge.codelutin.com/projects/isis-fish-data/repository/revisions/416
Log:
#10679: Annotation des m?\195?\169thodes qui calculent une matrice
Modified:
trunk/resultinfos/MatrixAbundance.java
trunk/resultinfos/MatrixAbundanceBeginMonth.java
trunk/resultinfos/MatrixBiomass.java
trunk/resultinfos/MatrixBiomassBeginMonth.java
trunk/resultinfos/MatrixCatchPerStrategyMetPerZoneMet.java
trunk/resultinfos/MatrixCatchPerStrategyMetPerZonePop.java
trunk/resultinfos/MatrixCatchRatePerStrategyMet.java
trunk/resultinfos/MatrixCatchWeightPerStrategyMetPerZoneMet.java
trunk/resultinfos/MatrixCatchWeightPerStrategyMetPerZonePop.java
trunk/resultinfos/MatrixCostsOfFishingPerVessel.java
trunk/resultinfos/MatrixCrewSharePerStrategyPerVessel.java
trunk/resultinfos/MatrixDiscardsPerStrMetPerZonePop.java
trunk/resultinfos/MatrixDiscardsWeightPerStrMetPerZonePop.java
trunk/resultinfos/MatrixEffortNominalPerStrategyMet.java
trunk/resultinfos/MatrixEffortPerStrategyMet.java
trunk/resultinfos/MatrixFishingMortality.java
trunk/resultinfos/MatrixFishingMortalityPerGroup.java
trunk/resultinfos/MatrixFishingTimePerMonthPerVessel.java
trunk/resultinfos/MatrixFuelCostsOfTravelPerVessel.java
trunk/resultinfos/MatrixFuelCostsPerVessel.java
trunk/resultinfos/MatrixGrossValueOfLandingsOtherSpeciesPerStrategyMet.java
trunk/resultinfos/MatrixGrossValueOfLandingsPerSpeciesPerStrategyMet.java
trunk/resultinfos/MatrixGrossValueOfLandingsPerStrategyMet.java
trunk/resultinfos/MatrixGrossValueOfLandingsPerStrategyMetPerVessel.java
trunk/resultinfos/MatrixLandingPerMet.java
trunk/resultinfos/MatrixLandingWeight.java
trunk/resultinfos/MatrixLbar.java
trunk/resultinfos/MatrixLbarTotal.java
trunk/resultinfos/MatrixMetierZone.java
trunk/resultinfos/MatrixNetRevenueToSharePerStrategyMetPerVessel.java
trunk/resultinfos/MatrixNetValueOfLandingsPerStrategyMet.java
trunk/resultinfos/MatrixNetValueOfLandingsPerStrategyMetPerVessel.java
trunk/resultinfos/MatrixNoActivity.java
trunk/resultinfos/MatrixOtherRunningCostsPerVessel.java
trunk/resultinfos/MatrixOwnerMarginOverVariableCostsPerStrategy.java
trunk/resultinfos/MatrixOwnerMarginOverVariableCostsPerStrategyMetPerVessel.java
trunk/resultinfos/MatrixOwnerMarginOverVariableCostsPerStrategyPerVessel.java
trunk/resultinfos/MatrixPrice.java
trunk/resultinfos/MatrixRecruitment.java
trunk/resultinfos/MatrixRepairAndMaintenanceGearCostsPerVessel.java
trunk/resultinfos/MatrixSharedNotFixedCostsPerVessel.java
trunk/resultinfos/MatrixTotalFishingMortality.java
trunk/resultinfos/MatrixVesselMarginOverVariableCostsPerStrategy.java
trunk/resultinfos/MatrixVesselMarginOverVariableCostsPerStrategyMetPerVessel.java
trunk/resultinfos/MatrixVesselMarginOverVariableCostsPerStrategyPerVessel.java
trunk/scripts/GravityModel.java
trunk/scripts/SiMatrix.java
trunk/scripts/SiMatrixEffortByCell.java
Modified: trunk/resultinfos/MatrixAbundance.java
===================================================================
--- trunk/resultinfos/MatrixAbundance.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/resultinfos/MatrixAbundance.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -31,7 +31,7 @@
*/
public class MatrixAbundance extends AbstractResultInfo {
- public static final String NAME = MatrixAbundance.class.getSimpleName();
+ public static final String NAME = "MatrixAbundance";
@Override
public String getDescription() {
Modified: trunk/resultinfos/MatrixAbundanceBeginMonth.java
===================================================================
--- trunk/resultinfos/MatrixAbundanceBeginMonth.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/resultinfos/MatrixAbundanceBeginMonth.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -31,7 +31,7 @@
*/
public class MatrixAbundanceBeginMonth extends AbstractResultInfo {
- public static final String NAME = MatrixAbundanceBeginMonth.class.getSimpleName();
+ public static final String NAME = "MatrixAbundanceBeginMonth";
@Override
public String getDescription() {
Modified: trunk/resultinfos/MatrixBiomass.java
===================================================================
--- trunk/resultinfos/MatrixBiomass.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/resultinfos/MatrixBiomass.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -31,7 +31,7 @@
*/
public class MatrixBiomass extends AbstractResultInfo {
- public static final String NAME = MatrixBiomass.class.getSimpleName();
+ public static final String NAME = "MatrixBiomass";
@Override
public String getDescription() {
Modified: trunk/resultinfos/MatrixBiomassBeginMonth.java
===================================================================
--- trunk/resultinfos/MatrixBiomassBeginMonth.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/resultinfos/MatrixBiomassBeginMonth.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -31,7 +31,7 @@
*/
public class MatrixBiomassBeginMonth extends AbstractResultInfo {
- public static final String NAME = MatrixBiomassBeginMonth.class.getSimpleName();
+ public static final String NAME = "MatrixBiomassBeginMonth";
@Override
public String getDescription() {
Modified: trunk/resultinfos/MatrixCatchPerStrategyMetPerZoneMet.java
===================================================================
--- trunk/resultinfos/MatrixCatchPerStrategyMetPerZoneMet.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/resultinfos/MatrixCatchPerStrategyMetPerZoneMet.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -36,7 +36,7 @@
*/
public class MatrixCatchPerStrategyMetPerZoneMet extends AbstractResultInfo {
- public static final String NAME = MatrixCatchPerStrategyMetPerZoneMet.class.getSimpleName();
+ public static final String NAME = "MatrixCatchPerStrategyMetPerZoneMet";
@Override
public String getDescription() {
Modified: trunk/resultinfos/MatrixCatchPerStrategyMetPerZonePop.java
===================================================================
--- trunk/resultinfos/MatrixCatchPerStrategyMetPerZonePop.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/resultinfos/MatrixCatchPerStrategyMetPerZonePop.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -33,7 +33,7 @@
*/
public class MatrixCatchPerStrategyMetPerZonePop extends AbstractResultInfo {
- public static final String NAME = MatrixCatchPerStrategyMetPerZonePop.class.getSimpleName();
+ public static final String NAME = "MatrixCatchPerStrategyMetPerZonePop";
@Override
public String getDescription() {
Modified: trunk/resultinfos/MatrixCatchRatePerStrategyMet.java
===================================================================
--- trunk/resultinfos/MatrixCatchRatePerStrategyMet.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/resultinfos/MatrixCatchRatePerStrategyMet.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -33,7 +33,7 @@
*/
public class MatrixCatchRatePerStrategyMet extends AbstractResultInfo {
- public static final String NAME = MatrixCatchRatePerStrategyMet.class.getSimpleName();
+ public static final String NAME = "MatrixCatchRatePerStrategyMet";
@Override
public String getDescription() {
Modified: trunk/resultinfos/MatrixCatchWeightPerStrategyMetPerZoneMet.java
===================================================================
--- trunk/resultinfos/MatrixCatchWeightPerStrategyMetPerZoneMet.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/resultinfos/MatrixCatchWeightPerStrategyMetPerZoneMet.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -36,7 +36,7 @@
*/
public class MatrixCatchWeightPerStrategyMetPerZoneMet extends AbstractResultInfo {
- public static final String NAME = MatrixCatchWeightPerStrategyMetPerZoneMet.class.getSimpleName();
+ public static final String NAME = "MatrixCatchWeightPerStrategyMetPerZoneMet";
@Override
public String getDescription() {
Modified: trunk/resultinfos/MatrixCatchWeightPerStrategyMetPerZonePop.java
===================================================================
--- trunk/resultinfos/MatrixCatchWeightPerStrategyMetPerZonePop.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/resultinfos/MatrixCatchWeightPerStrategyMetPerZonePop.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -33,7 +33,7 @@
*/
public class MatrixCatchWeightPerStrategyMetPerZonePop extends AbstractResultInfo {
- public static final String NAME = MatrixCatchWeightPerStrategyMetPerZonePop.class.getSimpleName();
+ public static final String NAME = "MatrixCatchWeightPerStrategyMetPerZonePop";
@Override
public String getDescription() {
Modified: trunk/resultinfos/MatrixCostsOfFishingPerVessel.java
===================================================================
--- trunk/resultinfos/MatrixCostsOfFishingPerVessel.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/resultinfos/MatrixCostsOfFishingPerVessel.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -31,7 +31,7 @@
*/
public class MatrixCostsOfFishingPerVessel extends AbstractResultInfo {
- public static final String NAME = MatrixCostsOfFishingPerVessel.class.getSimpleName();
+ public static final String NAME = "MatrixCostsOfFishingPerVessel";
@Override
public String getDescription() {
Modified: trunk/resultinfos/MatrixCrewSharePerStrategyPerVessel.java
===================================================================
--- trunk/resultinfos/MatrixCrewSharePerStrategyPerVessel.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/resultinfos/MatrixCrewSharePerStrategyPerVessel.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -31,7 +31,7 @@
*/
public class MatrixCrewSharePerStrategyPerVessel extends AbstractResultInfo {
- public static final String NAME = MatrixCrewSharePerStrategyPerVessel.class.getSimpleName();
+ public static final String NAME = "MatrixCrewSharePerStrategyPerVessel";
@Override
public String getDescription() {
Modified: trunk/resultinfos/MatrixDiscardsPerStrMetPerZonePop.java
===================================================================
--- trunk/resultinfos/MatrixDiscardsPerStrMetPerZonePop.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/resultinfos/MatrixDiscardsPerStrMetPerZonePop.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -33,7 +33,7 @@
*/
public class MatrixDiscardsPerStrMetPerZonePop extends AbstractResultInfo {
- public static final String NAME = MatrixDiscardsPerStrMetPerZonePop.class.getSimpleName();
+ public static final String NAME = "MatrixDiscardsPerStrMetPerZonePop";
@Override
public String getDescription() {
Modified: trunk/resultinfos/MatrixDiscardsWeightPerStrMetPerZonePop.java
===================================================================
--- trunk/resultinfos/MatrixDiscardsWeightPerStrMetPerZonePop.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/resultinfos/MatrixDiscardsWeightPerStrMetPerZonePop.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -33,7 +33,7 @@
*/
public class MatrixDiscardsWeightPerStrMetPerZonePop extends AbstractResultInfo {
- public static final String NAME = MatrixDiscardsWeightPerStrMetPerZonePop.class.getSimpleName();
+ public static final String NAME = "MatrixDiscardsWeightPerStrMetPerZonePop";
@Override
public String getDescription() {
Modified: trunk/resultinfos/MatrixEffortNominalPerStrategyMet.java
===================================================================
--- trunk/resultinfos/MatrixEffortNominalPerStrategyMet.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/resultinfos/MatrixEffortNominalPerStrategyMet.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -31,7 +31,7 @@
*/
public class MatrixEffortNominalPerStrategyMet extends AbstractResultInfo {
- public static final String NAME = MatrixEffortNominalPerStrategyMet.class.getSimpleName();
+ public static final String NAME = "MatrixEffortNominalPerStrategyMet";
@Override
public String getDescription() {
Modified: trunk/resultinfos/MatrixEffortPerStrategyMet.java
===================================================================
--- trunk/resultinfos/MatrixEffortPerStrategyMet.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/resultinfos/MatrixEffortPerStrategyMet.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -31,7 +31,7 @@
*/
public class MatrixEffortPerStrategyMet extends AbstractResultInfo {
- public static final String NAME = MatrixEffortPerStrategyMet.class.getSimpleName();
+ public static final String NAME = "MatrixEffortPerStrategyMet";
@Override
public String getDescription() {
Modified: trunk/resultinfos/MatrixFishingMortality.java
===================================================================
--- trunk/resultinfos/MatrixFishingMortality.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/resultinfos/MatrixFishingMortality.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -33,7 +33,7 @@
*/
public class MatrixFishingMortality extends AbstractResultInfo {
- public static final String NAME = MatrixFishingMortality.class.getSimpleName();
+ public static final String NAME = "MatrixFishingMortality";
@Override
public String getDescription() {
Modified: trunk/resultinfos/MatrixFishingMortalityPerGroup.java
===================================================================
--- trunk/resultinfos/MatrixFishingMortalityPerGroup.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/resultinfos/MatrixFishingMortalityPerGroup.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -32,7 +32,7 @@
*/
public class MatrixFishingMortalityPerGroup extends AbstractResultInfo {
- public static final String NAME = MatrixFishingMortalityPerGroup.class.getSimpleName();
+ public static final String NAME = "MatrixFishingMortalityPerGroup";
protected String[] necessaryResult = {
MatrixAbundanceBeginMonth.NAME,
Modified: trunk/resultinfos/MatrixFishingTimePerMonthPerVessel.java
===================================================================
--- trunk/resultinfos/MatrixFishingTimePerMonthPerVessel.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/resultinfos/MatrixFishingTimePerMonthPerVessel.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -31,7 +31,7 @@
*/
public class MatrixFishingTimePerMonthPerVessel extends AbstractResultInfo {
- public static final String NAME = MatrixFishingTimePerMonthPerVessel.class.getSimpleName();
+ public static final String NAME = "MatrixFishingTimePerMonthPerVessel";
@Override
public String getDescription() {
Modified: trunk/resultinfos/MatrixFuelCostsOfTravelPerVessel.java
===================================================================
--- trunk/resultinfos/MatrixFuelCostsOfTravelPerVessel.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/resultinfos/MatrixFuelCostsOfTravelPerVessel.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -31,7 +31,7 @@
*/
public class MatrixFuelCostsOfTravelPerVessel extends AbstractResultInfo {
- public static final String NAME = MatrixFuelCostsOfTravelPerVessel.class.getSimpleName();
+ public static final String NAME = "MatrixFuelCostsOfTravelPerVessel";
@Override
public String getDescription() {
Modified: trunk/resultinfos/MatrixFuelCostsPerVessel.java
===================================================================
--- trunk/resultinfos/MatrixFuelCostsPerVessel.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/resultinfos/MatrixFuelCostsPerVessel.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -31,7 +31,7 @@
*/
public class MatrixFuelCostsPerVessel extends AbstractResultInfo {
- public static final String NAME = MatrixFuelCostsPerVessel.class.getSimpleName();
+ public static final String NAME = "MatrixFuelCostsPerVessel";
@Override
public String getDescription() {
Modified: trunk/resultinfos/MatrixGrossValueOfLandingsOtherSpeciesPerStrategyMet.java
===================================================================
--- trunk/resultinfos/MatrixGrossValueOfLandingsOtherSpeciesPerStrategyMet.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/resultinfos/MatrixGrossValueOfLandingsOtherSpeciesPerStrategyMet.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -33,7 +33,7 @@
*/
public class MatrixGrossValueOfLandingsOtherSpeciesPerStrategyMet extends AbstractResultInfo {
- public static final String NAME = MatrixGrossValueOfLandingsOtherSpeciesPerStrategyMet.class.getSimpleName();
+ public static final String NAME = "MatrixGrossValueOfLandingsOtherSpeciesPerStrategyMet";
@Override
public String getDescription() {
Modified: trunk/resultinfos/MatrixGrossValueOfLandingsPerSpeciesPerStrategyMet.java
===================================================================
--- trunk/resultinfos/MatrixGrossValueOfLandingsPerSpeciesPerStrategyMet.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/resultinfos/MatrixGrossValueOfLandingsPerSpeciesPerStrategyMet.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -33,7 +33,7 @@
*/
public class MatrixGrossValueOfLandingsPerSpeciesPerStrategyMet extends AbstractResultInfo {
- public static final String NAME = MatrixGrossValueOfLandingsPerSpeciesPerStrategyMet.class.getSimpleName();
+ public static final String NAME = "MatrixGrossValueOfLandingsPerSpeciesPerStrategyMet";
@Override
public String getDescription() {
Modified: trunk/resultinfos/MatrixGrossValueOfLandingsPerStrategyMet.java
===================================================================
--- trunk/resultinfos/MatrixGrossValueOfLandingsPerStrategyMet.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/resultinfos/MatrixGrossValueOfLandingsPerStrategyMet.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -31,7 +31,7 @@
*/
public class MatrixGrossValueOfLandingsPerStrategyMet extends AbstractResultInfo {
- public static final String NAME = MatrixGrossValueOfLandingsPerStrategyMet.class.getSimpleName();
+ public static final String NAME = "MatrixGrossValueOfLandingsPerStrategyMet";
@Override
public String getDescription() {
Modified: trunk/resultinfos/MatrixGrossValueOfLandingsPerStrategyMetPerVessel.java
===================================================================
--- trunk/resultinfos/MatrixGrossValueOfLandingsPerStrategyMetPerVessel.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/resultinfos/MatrixGrossValueOfLandingsPerStrategyMetPerVessel.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -31,7 +31,7 @@
*/
public class MatrixGrossValueOfLandingsPerStrategyMetPerVessel extends AbstractResultInfo {
- public static final String NAME = MatrixGrossValueOfLandingsPerStrategyMetPerVessel.class.getSimpleName();
+ public static final String NAME = "MatrixGrossValueOfLandingsPerStrategyMetPerVessel";
@Override
public String getDescription() {
Modified: trunk/resultinfos/MatrixLandingPerMet.java
===================================================================
--- trunk/resultinfos/MatrixLandingPerMet.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/resultinfos/MatrixLandingPerMet.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -33,7 +33,7 @@
*/
public class MatrixLandingPerMet extends AbstractResultInfo {
- public static final String NAME = MatrixLandingPerMet.class.getSimpleName();
+ public static final String NAME = "MatrixLandingPerMet";
@Override
public String getDescription() {
Modified: trunk/resultinfos/MatrixLandingWeight.java
===================================================================
--- trunk/resultinfos/MatrixLandingWeight.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/resultinfos/MatrixLandingWeight.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -33,7 +33,7 @@
*/
public class MatrixLandingWeight extends AbstractResultInfo {
- public static final String NAME = MatrixLandingWeight.class.getSimpleName();
+ public static final String NAME = "MatrixLandingWeight";
@Override
public String getDescription() {
Modified: trunk/resultinfos/MatrixLbar.java
===================================================================
--- trunk/resultinfos/MatrixLbar.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/resultinfos/MatrixLbar.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -30,7 +30,7 @@
*/
public class MatrixLbar extends AbstractResultInfo {
- public static final String NAME = MatrixLbar.class.getSimpleName();
+ public static final String NAME = "MatrixLbar";
@Override
public String getDescription() {
Modified: trunk/resultinfos/MatrixLbarTotal.java
===================================================================
--- trunk/resultinfos/MatrixLbarTotal.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/resultinfos/MatrixLbarTotal.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -29,7 +29,7 @@
*/
public class MatrixLbarTotal extends AbstractResultInfo {
- public static final String NAME = MatrixLbarTotal.class.getSimpleName();
+ public static final String NAME = "MatrixLbarTotal";
@Override
public String getDescription() {
Modified: trunk/resultinfos/MatrixMetierZone.java
===================================================================
--- trunk/resultinfos/MatrixMetierZone.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/resultinfos/MatrixMetierZone.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -31,7 +31,7 @@
*/
public class MatrixMetierZone extends AbstractResultInfo {
- public static final String NAME = MatrixMetierZone.class.getSimpleName();
+ public static final String NAME = "MatrixMetierZone";
@Override
public String getDescription() {
Modified: trunk/resultinfos/MatrixNetRevenueToSharePerStrategyMetPerVessel.java
===================================================================
--- trunk/resultinfos/MatrixNetRevenueToSharePerStrategyMetPerVessel.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/resultinfos/MatrixNetRevenueToSharePerStrategyMetPerVessel.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -31,7 +31,7 @@
*/
public class MatrixNetRevenueToSharePerStrategyMetPerVessel extends AbstractResultInfo {
- public static final String NAME = MatrixNetRevenueToSharePerStrategyMetPerVessel.class.getSimpleName();
+ public static final String NAME = "MatrixNetRevenueToSharePerStrategyMetPerVessel";
@Override
public String getDescription() {
Modified: trunk/resultinfos/MatrixNetValueOfLandingsPerStrategyMet.java
===================================================================
--- trunk/resultinfos/MatrixNetValueOfLandingsPerStrategyMet.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/resultinfos/MatrixNetValueOfLandingsPerStrategyMet.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -31,7 +31,7 @@
*/
public class MatrixNetValueOfLandingsPerStrategyMet extends AbstractResultInfo {
- public static final String NAME = MatrixNetValueOfLandingsPerStrategyMet.class.getSimpleName();
+ public static final String NAME = "MatrixNetValueOfLandingsPerStrategyMet";
@Override
public String getDescription() {
Modified: trunk/resultinfos/MatrixNetValueOfLandingsPerStrategyMetPerVessel.java
===================================================================
--- trunk/resultinfos/MatrixNetValueOfLandingsPerStrategyMetPerVessel.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/resultinfos/MatrixNetValueOfLandingsPerStrategyMetPerVessel.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -31,7 +31,7 @@
*/
public class MatrixNetValueOfLandingsPerStrategyMetPerVessel extends AbstractResultInfo {
- public static final String NAME = MatrixNetValueOfLandingsPerStrategyMetPerVessel.class.getSimpleName();
+ public static final String NAME = "MatrixNetValueOfLandingsPerStrategyMetPerVessel";
@Override
public String getDescription() {
Modified: trunk/resultinfos/MatrixNoActivity.java
===================================================================
--- trunk/resultinfos/MatrixNoActivity.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/resultinfos/MatrixNoActivity.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -31,7 +31,7 @@
*/
public class MatrixNoActivity extends AbstractResultInfo {
- public static final String NAME = MatrixNoActivity.class.getSimpleName();
+ public static final String NAME = "MatrixNoActivity";
@Override
public String getDescription() {
Modified: trunk/resultinfos/MatrixOtherRunningCostsPerVessel.java
===================================================================
--- trunk/resultinfos/MatrixOtherRunningCostsPerVessel.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/resultinfos/MatrixOtherRunningCostsPerVessel.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -31,7 +31,7 @@
*/
public class MatrixOtherRunningCostsPerVessel extends AbstractResultInfo {
- public static final String NAME = MatrixOtherRunningCostsPerVessel.class.getSimpleName();
+ public static final String NAME = "MatrixOtherRunningCostsPerVessel";
@Override
public String getDescription() {
Modified: trunk/resultinfos/MatrixOwnerMarginOverVariableCostsPerStrategy.java
===================================================================
--- trunk/resultinfos/MatrixOwnerMarginOverVariableCostsPerStrategy.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/resultinfos/MatrixOwnerMarginOverVariableCostsPerStrategy.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -30,7 +30,7 @@
*/
public class MatrixOwnerMarginOverVariableCostsPerStrategy extends AbstractResultInfo {
- public static final String NAME = MatrixOwnerMarginOverVariableCostsPerStrategy.class.getSimpleName();
+ public static final String NAME = "MatrixOwnerMarginOverVariableCostsPerStrategy";
@Override
public String getDescription() {
Modified: trunk/resultinfos/MatrixOwnerMarginOverVariableCostsPerStrategyMetPerVessel.java
===================================================================
--- trunk/resultinfos/MatrixOwnerMarginOverVariableCostsPerStrategyMetPerVessel.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/resultinfos/MatrixOwnerMarginOverVariableCostsPerStrategyMetPerVessel.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -31,7 +31,7 @@
*/
public class MatrixOwnerMarginOverVariableCostsPerStrategyMetPerVessel extends AbstractResultInfo {
- public static final String NAME = MatrixOwnerMarginOverVariableCostsPerStrategyMetPerVessel.class.getSimpleName();
+ public static final String NAME = "MatrixOwnerMarginOverVariableCostsPerStrategyMetPerVessel";
@Override
public String getDescription() {
Modified: trunk/resultinfos/MatrixOwnerMarginOverVariableCostsPerStrategyPerVessel.java
===================================================================
--- trunk/resultinfos/MatrixOwnerMarginOverVariableCostsPerStrategyPerVessel.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/resultinfos/MatrixOwnerMarginOverVariableCostsPerStrategyPerVessel.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -31,7 +31,7 @@
*/
public class MatrixOwnerMarginOverVariableCostsPerStrategyPerVessel extends AbstractResultInfo {
- public static final String NAME = MatrixOwnerMarginOverVariableCostsPerStrategyPerVessel.class.getSimpleName();
+ public static final String NAME = "MatrixOwnerMarginOverVariableCostsPerStrategyPerVessel";
@Override
public String getDescription() {
Modified: trunk/resultinfos/MatrixPrice.java
===================================================================
--- trunk/resultinfos/MatrixPrice.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/resultinfos/MatrixPrice.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -30,7 +30,7 @@
*/
public class MatrixPrice extends AbstractResultInfo {
- public static final String NAME = MatrixPrice.class.getSimpleName();
+ public static final String NAME = "MatrixPrice";
@Override
public String getDescription() {
Modified: trunk/resultinfos/MatrixRecruitment.java
===================================================================
--- trunk/resultinfos/MatrixRecruitment.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/resultinfos/MatrixRecruitment.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -29,7 +29,7 @@
*/
public class MatrixRecruitment extends AbstractResultInfo {
- public static final String NAME = MatrixRecruitment.class.getSimpleName();
+ public static final String NAME = "MatrixRecruitment";
@Override
public String getDescription() {
Modified: trunk/resultinfos/MatrixRepairAndMaintenanceGearCostsPerVessel.java
===================================================================
--- trunk/resultinfos/MatrixRepairAndMaintenanceGearCostsPerVessel.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/resultinfos/MatrixRepairAndMaintenanceGearCostsPerVessel.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -31,7 +31,7 @@
*/
public class MatrixRepairAndMaintenanceGearCostsPerVessel extends AbstractResultInfo {
- public static final String NAME = MatrixRepairAndMaintenanceGearCostsPerVessel.class.getSimpleName();
+ public static final String NAME = "MatrixRepairAndMaintenanceGearCostsPerVessel";
@Override
public String getDescription() {
Modified: trunk/resultinfos/MatrixSharedNotFixedCostsPerVessel.java
===================================================================
--- trunk/resultinfos/MatrixSharedNotFixedCostsPerVessel.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/resultinfos/MatrixSharedNotFixedCostsPerVessel.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -31,7 +31,7 @@
*/
public class MatrixSharedNotFixedCostsPerVessel extends AbstractResultInfo {
- public static final String NAME = MatrixSharedNotFixedCostsPerVessel.class.getSimpleName();
+ public static final String NAME = "MatrixSharedNotFixedCostsPerVessel";
@Override
public String getDescription() {
Modified: trunk/resultinfos/MatrixTotalFishingMortality.java
===================================================================
--- trunk/resultinfos/MatrixTotalFishingMortality.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/resultinfos/MatrixTotalFishingMortality.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -31,7 +31,7 @@
*/
public class MatrixTotalFishingMortality extends AbstractResultInfo {
- public static final String NAME = MatrixTotalFishingMortality.class.getSimpleName();
+ public static final String NAME = "MatrixTotalFishingMortality";
protected String[] necessaryResult = {
MatrixFishingMortalityPerGroup.NAME
Modified: trunk/resultinfos/MatrixVesselMarginOverVariableCostsPerStrategy.java
===================================================================
--- trunk/resultinfos/MatrixVesselMarginOverVariableCostsPerStrategy.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/resultinfos/MatrixVesselMarginOverVariableCostsPerStrategy.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -30,7 +30,7 @@
*/
public class MatrixVesselMarginOverVariableCostsPerStrategy extends AbstractResultInfo {
- public static final String NAME = MatrixVesselMarginOverVariableCostsPerStrategy.class.getSimpleName();
+ public static final String NAME = "MatrixVesselMarginOverVariableCostsPerStrategy";
@Override
public String getDescription() {
Modified: trunk/resultinfos/MatrixVesselMarginOverVariableCostsPerStrategyMetPerVessel.java
===================================================================
--- trunk/resultinfos/MatrixVesselMarginOverVariableCostsPerStrategyMetPerVessel.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/resultinfos/MatrixVesselMarginOverVariableCostsPerStrategyMetPerVessel.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -31,7 +31,7 @@
*/
public class MatrixVesselMarginOverVariableCostsPerStrategyMetPerVessel extends AbstractResultInfo {
- public static final String NAME = MatrixVesselMarginOverVariableCostsPerStrategyMetPerVessel.class.getSimpleName();
+ public static final String NAME = "MatrixVesselMarginOverVariableCostsPerStrategyMetPerVessel";
@Override
public String getDescription() {
Modified: trunk/resultinfos/MatrixVesselMarginOverVariableCostsPerStrategyPerVessel.java
===================================================================
--- trunk/resultinfos/MatrixVesselMarginOverVariableCostsPerStrategyPerVessel.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/resultinfos/MatrixVesselMarginOverVariableCostsPerStrategyPerVessel.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -30,7 +30,7 @@
*/
public class MatrixVesselMarginOverVariableCostsPerStrategyPerVessel extends AbstractResultInfo {
- public static final String NAME = MatrixVesselMarginOverVariableCostsPerStrategyPerVessel.class.getSimpleName();
+ public static final String NAME = "MatrixVesselMarginOverVariableCostsPerStrategyPerVessel";
@Override
public String getDescription() {
Modified: trunk/scripts/GravityModel.java
===================================================================
--- trunk/scripts/GravityModel.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/scripts/GravityModel.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -27,6 +27,7 @@
import java.util.Collection;
import java.util.List;
+import fr.ifremer.isisfish.annotations.ComputeResult;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.nuiton.math.matrix.MatrixFactory;
@@ -127,7 +128,7 @@
//////////////////////////////////////////////////////////////////////
// MatrixFishingTimePerMonthPerVessel
//////////////////////////////////////////////////////////////////////
-
+ @ComputeResult(MatrixFishingTimePerMonthPerVessel.NAME)
public MatrixND matrixFishingTimePerMonthPerVessel(TimeStep step)
throws TopiaException {
List<Strategy> strategies = siMatrix.getStrategies(step);
@@ -170,9 +171,8 @@
//////////////////////////////////////////////////////////////////////
// matrixFuelCostsOfTravelPerVessel
//////////////////////////////////////////////////////////////////////
-
- public MatrixND matrixFuelCostsOfTravelPerVessel(TimeStep step)
- throws TopiaException {
+ @ComputeResult(MatrixFuelCostsOfTravelPerVessel.NAME)
+ public MatrixND matrixFuelCostsOfTravelPerVessel(TimeStep step) throws TopiaException {
List<Strategy> strategies = siMatrix.getStrategies(step);
List<Metier> metiers = siMatrix.getMetiers(step);
@@ -202,15 +202,13 @@
* @param step
* @return
*/
- private double fuelCostsOfTravelPerVessel(Strategy str, Metier metier,
- TimeStep step) {
+ private double fuelCostsOfTravelPerVessel(Strategy str, Metier metier, TimeStep step) {
Month month = step.getMonth();
double nbTrip = str.getStrategyMonthInfo(month).getNumberOfTrips();
Collection<Zone> zone = metier.getMetierSeasonInfo(month).getZone();
// TODO: verifier que travelTime est bien en heure, car le unitFuelCost est l'unite par heure
- double travelTime = siMatrix.travelTimePerTrip(str.getSetOfVessels(),
- zone);
+ double travelTime = siMatrix.travelTimePerTrip(str.getSetOfVessels(), zone);
double unitFuelCost = str.getSetOfVessels().getVesselType()
.getUnitFuelCostOfTravel();
@@ -220,9 +218,8 @@
//////////////////////////////////////////////////////////////////////
// matrixCostsOfFishingPerVessel
//////////////////////////////////////////////////////////////////////
-
- public MatrixND matrixCostsOfFishingPerVessel(TimeStep step)
- throws TopiaException {
+ @ComputeResult(MatrixCostsOfFishingPerVessel.NAME)
+ public MatrixND matrixCostsOfFishingPerVessel(TimeStep step) throws TopiaException {
List<Strategy> strategies = siMatrix.getStrategies(step);
List<Metier> metiers = siMatrix.getMetiers(step);
@@ -253,12 +250,10 @@
* @param step
* @return
*/
- private double costsOfFishingPerVessel(Strategy str, Metier metier,
- TimeStep step) {
+ private double costsOfFishingPerVessel(Strategy str, Metier metier, TimeStep step) {
double fishingTime = fishingTimePerMonthPerVessel(str, metier, step);
- EffortDescription effort = str.getSetOfVessels().getPossibleMetiers(
- metier);
+ EffortDescription effort = str.getSetOfVessels().getPossibleMetiers(metier);
int nbOperation = 0;
double unitCostOfFishing = 0;
if (effort != null) {
@@ -266,14 +261,13 @@
unitCostOfFishing = effort.getUnitCostOfFishing();
}
- return fishingTime
- * (nbOperation * unitCostOfFishing / TimeUnit.HOUR_PER_DAY);
+ return fishingTime * (nbOperation * unitCostOfFishing / TimeUnit.HOUR_PER_DAY);
}
//////////////////////////////////////////////////////////////////////
// matrixFuelCostsPerVessel
//////////////////////////////////////////////////////////////////////
-
+ @ComputeResult(MatrixFuelCostsPerVessel.NAME)
public MatrixND matrixFuelCostsPerVessel(TimeStep step) throws TopiaException {
List<Strategy> strategies = siMatrix.getStrategies(step);
List<Metier> metiers = siMatrix.getMetiers(step);
@@ -314,7 +308,7 @@
//////////////////////////////////////////////////////////////////////
// matrixRepairAndMaintenanceGearCostsPerVessel
//////////////////////////////////////////////////////////////////////
-
+ @ComputeResult(MatrixRepairAndMaintenanceGearCostsPerVessel.NAME)
public MatrixND matrixRepairAndMaintenanceGearCostsPerVessel(TimeStep step)
throws TopiaException {
List<Strategy> strategies = siMatrix.getStrategies(step);
@@ -357,36 +351,10 @@
return result;
}
- /*
- * implante suivant document ModifTable3PourBP25-07-2006.doc
- * RepairAndMaintenanceGearCostsPerVessel[str,met,month] =
- * FishingTimePerMonthPerVessel[str,met,month]
- * *RepairAndMaintenanceGearCostsPerDay[sov,met]/NbHoursPerDay
- *
- * @param str
- * @param metier
- * @param step
- * @return
- */
-// private double repairAndMaintenanceGearCostsPerVessel(Strategy str,
-// Metier metier, TimeStep step) {
-// double fishingTime = fishingTimePerMonthPerVessel(str, metier, step);
-//
-// EffortDescription effort = str.getSetOfVessels().getPossibleMetiers(
-// metier);
-//
-// double repair = 0;
-// if (effort != null) {
-// repair = effort.getRepairAndMaintenanceGearCost();
-// }
-// // FIXME verifier qu'il faut bien retourner 0, si pas d'effort
-// return fishingTime * repair / TimeUnit.HOUR_PER_DAY;
-// }
-
//////////////////////////////////////////////////////////////////////
// matrixOtherRunningCostsPerVessel
//////////////////////////////////////////////////////////////////////
-
+ @ComputeResult(MatrixOtherRunningCostsPerVessel.NAME)
public MatrixND matrixOtherRunningCostsPerVessel(TimeStep step)
throws TopiaException {
List<Strategy> strategies = siMatrix.getStrategies(step);
@@ -437,7 +405,7 @@
//////////////////////////////////////////////////////////////////////
// matrixSharedNotFixedCostsPerVessel
//////////////////////////////////////////////////////////////////////
-
+ @ComputeResult(MatrixSharedNotFixedCostsPerVessel.NAME)
public MatrixND matrixSharedNotFixedCostsPerVessel(TimeStep step)
throws TopiaException {
List<Strategy> strategies = siMatrix.getStrategies(step);
@@ -481,7 +449,7 @@
//////////////////////////////////////////////////////////////////////
// matrixGrossValueOfLandingsPerSpeciesPerStrategyMet
//////////////////////////////////////////////////////////////////////
-
+ @ComputeResult(MatrixGrossValueOfLandingsPerSpeciesPerStrategyMet.NAME)
public MatrixND matrixGrossValueOfLandingsPerSpeciesPerStrategyMet(TimeStep step)
throws TopiaException {
List<Strategy> strategies = siMatrix.getStrategies(step);
@@ -511,8 +479,8 @@
prices[cpt++] = group.getPrice();
}
- MatrixND matCatch = getResult_MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP(step, pop);
- MatrixND matDiscards = getResult_MATRIX_DISCARDS_WEIGHT_PER_STR_MET_PER_ZONE_POP(step, pop);
+ MatrixND matCatch = getResultMatrixCatchWeightPerStrategyMetPerZonePop(step, pop);
+ MatrixND matDiscards = getResultMatrixDiscardsWeightPerStrMetPerZonePop(step, pop);
if (matCatch != null) {
for (MatrixIterator i=matCatch.iteratorNotZero(); i.next();){
@@ -614,7 +582,7 @@
*/
private double getCatchWeightPerStrMetPerZonePop(Strategy str,
Metier metier, PopulationGroup group, Zone zone, TimeStep step) {
- MatrixND mat = getResult_MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP(step, group.getPopulation());
+ MatrixND mat = getResultMatrixCatchWeightPerStrategyMetPerZonePop(step, group.getPopulation());
double result = 0;
if (mat != null) {
result = mat.getValue(str, metier, group, zone);
@@ -622,7 +590,7 @@
return result;
}
- private MatrixND getResult_MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP(TimeStep step, Population pop) {
+ private MatrixND getResultMatrixCatchWeightPerStrategyMetPerZonePop(TimeStep step, Population pop) {
MatrixND mat = resultManager.getMatrix(step, pop,
MatrixCatchWeightPerStrategyMetPerZonePop.NAME);
return mat;
@@ -638,7 +606,7 @@
*/
private double getDiscardsWeightPerStrMet(Strategy str, Metier metier,
PopulationGroup group, Zone zone, TimeStep step) {
- MatrixND mat = getResult_MATRIX_DISCARDS_WEIGHT_PER_STR_MET_PER_ZONE_POP(step, group.getPopulation());
+ MatrixND mat = getResultMatrixDiscardsWeightPerStrMetPerZonePop(step, group.getPopulation());
double result = 0;
if (mat != null) {
result = mat.getValue(str, metier, group, zone);
@@ -646,7 +614,7 @@
return result;
}
- private MatrixND getResult_MATRIX_DISCARDS_WEIGHT_PER_STR_MET_PER_ZONE_POP(TimeStep step, Population pop) {
+ private MatrixND getResultMatrixDiscardsWeightPerStrMetPerZonePop(TimeStep step, Population pop) {
MatrixND mat = resultManager.getMatrix(step, pop,
MatrixDiscardsWeightPerStrMetPerZonePop.NAME);
return mat;
@@ -655,7 +623,7 @@
//////////////////////////////////////////////////////////////////////
// matrixGrossValueOfLandingsPerStrategyMet
//////////////////////////////////////////////////////////////////////
-
+ @ComputeResult(MatrixGrossValueOfLandingsPerStrategyMet.NAME)
public MatrixND matrixGrossValueOfLandingsPerStrategyMet(TimeStep step)
throws TopiaException {
@@ -709,7 +677,7 @@
//////////////////////////////////////////////////////////////////////
// matrixGrossValueOfLandingsPerStrategyMetPerVessel
//////////////////////////////////////////////////////////////////////
-
+ @ComputeResult(MatrixGrossValueOfLandingsPerStrategyMetPerVessel.NAME)
public MatrixND matrixGrossValueOfLandingsPerStrategyMetPerVessel(TimeStep step)
throws TopiaException {
MatrixND matGrossValue = matrixGrossValueOfLandingsPerStrategyMet(step);
@@ -788,7 +756,7 @@
//////////////////////////////////////////////////////////////////////
// matrixNetValueOfLandingsPerStrategyMet
//////////////////////////////////////////////////////////////////////
-
+ @ComputeResult(MatrixNetValueOfLandingsPerStrategyMet.NAME)
public MatrixND matrixNetValueOfLandingsPerStrategyMet(TimeStep step)
throws TopiaException {
@@ -881,7 +849,7 @@
//////////////////////////////////////////////////////////////////////
// matrixNetValueOfLandingsPerStrategyMetPerVessel
//////////////////////////////////////////////////////////////////////
-
+ @ComputeResult(MatrixNetValueOfLandingsPerStrategyMetPerVessel.NAME)
public MatrixND matrixNetValueOfLandingsPerStrategyMetPerVessel(TimeStep step)
throws TopiaException {
MatrixND result = matrixNetValueOfLandingsPerStrategyMet(step).copy();
@@ -958,7 +926,7 @@
//////////////////////////////////////////////////////////////////////
// matrixNetRenevueToSharePerStrategyMetPerVessel
//////////////////////////////////////////////////////////////////////
-
+ @ComputeResult(MatrixNetRevenueToSharePerStrategyMetPerVessel.NAME)
public MatrixND matrixNetRenevueToSharePerStrategyMetPerVessel(TimeStep step)
throws TopiaException {
@@ -1034,7 +1002,7 @@
//////////////////////////////////////////////////////////////////////
// matrixCrewSharePerStrategyMetPerVessel
//////////////////////////////////////////////////////////////////////
-
+ @ComputeResult(MatrixCrewSharePerStrategyPerVessel.NAME)
public MatrixND matrixCrewSharePerStrategyMetPerVessel(TimeStep step)
throws TopiaException {
@@ -1111,7 +1079,7 @@
//////////////////////////////////////////////////////////////////////
// matrixOwnerMarginOverVariableCostsPerStrategyMetPerVessel
//////////////////////////////////////////////////////////////////////
-
+ @ComputeResult(MatrixOwnerMarginOverVariableCostsPerStrategyMetPerVessel.NAME)
public MatrixND matrixOwnerMarginOverVariableCostsPerStrategyMetPerVessel(
TimeStep step) throws TopiaException {
@@ -1197,7 +1165,7 @@
//////////////////////////////////////////////////////////////////////
// matrixVesselMarginOverVariableCostsPerStrategyMetPerVessel
//////////////////////////////////////////////////////////////////////
-
+ @ComputeResult(MatrixVesselMarginOverVariableCostsPerStrategyMetPerVessel.NAME)
public MatrixND matrixVesselMarginOverVariableCostsPerStrategyMetPerVessel(
TimeStep step) throws TopiaException {
@@ -1276,7 +1244,7 @@
//////////////////////////////////////////////////////////////////////
// matrixOwnerMarginOverVariableCostsPerStrategyPerVessel
//////////////////////////////////////////////////////////////////////
-
+ @ComputeResult(MatrixOwnerMarginOverVariableCostsPerStrategyPerVessel.NAME)
public MatrixND matrixOwnerMarginOverVariableCostsPerStrategyPerVessel(
TimeStep step) throws TopiaException {
@@ -1353,7 +1321,7 @@
//////////////////////////////////////////////////////////////////////
// matrixOwnerMarginOverVariableCostsPerStrategy
//////////////////////////////////////////////////////////////////////
-
+ @ComputeResult(MatrixOwnerMarginOverVariableCostsPerStrategy.NAME)
public MatrixND matrixOwnerMarginOverVariableCostsPerStrategy(TimeStep step)
throws TopiaException {
MatrixND result = matrixOwnerMarginOverVariableCostsPerStrategyPerVessel(step).copy();
@@ -1414,10 +1382,9 @@
//////////////////////////////////////////////////////////////////////
// matrixVesselMarginOverVariableCostsPerStrategyPerVessel
//////////////////////////////////////////////////////////////////////
+ @ComputeResult(MatrixVesselMarginOverVariableCostsPerStrategyPerVessel.NAME)
+ public MatrixND matrixVesselMarginOverVariableCostsPerStrategyPerVessel(TimeStep step) throws TopiaException {
- public MatrixND matrixVesselMarginOverVariableCostsPerStrategyPerVessel(
- TimeStep step) throws TopiaException {
-
MatrixND matPerMet =
matrixVesselMarginOverVariableCostsPerStrategyMetPerVessel(step);
MatrixND result = MatrixFactory
@@ -1494,7 +1461,7 @@
//////////////////////////////////////////////////////////////////////
// matrixVesselMarginOverVariableCostsPerStrategy
//////////////////////////////////////////////////////////////////////
-
+ @ComputeResult(MatrixVesselMarginOverVariableCostsPerStrategy.NAME)
public MatrixND matrixVesselMarginOverVariableCostsPerStrategy(TimeStep step)
throws TopiaException {
Modified: trunk/scripts/SiMatrix.java
===================================================================
--- trunk/scripts/SiMatrix.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/scripts/SiMatrix.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -2,7 +2,7 @@
* #%L
* IsisFish data
* %%
- * Copyright (C) 2006 - 2015 Ifremer, Code Lutin, Benjamin Poussin
+ * Copyright (C) 2006 - 2020 Ifremer, Code Lutin, Benjamin Poussin
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -29,7 +29,9 @@
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
+import java.util.Set;
+import fr.ifremer.isisfish.annotations.ComputeResult;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.nuiton.math.matrix.MatrixFactory;
@@ -127,8 +129,7 @@
*/
public List<Population> getPopulations(TimeStep step) throws TopiaException {
List<Population> populations = new ArrayList<>();
- for (Population pop : context.getSimulationStorage().getParameter()
- .getPopulations()) {
+ for (Population pop : context.getSimulationStorage().getParameter().getPopulations()) {
Population tmp = (Population) db.findByTopiaId(pop.getTopiaId());
populations.add(tmp);
}
@@ -140,21 +141,17 @@
* @throws TopiaException
*/
public List<Strategy> getStrategies(TimeStep step) throws TopiaException {
- // if (strategies == null) {
List<Strategy> strategies = new ArrayList<>();
- for (Strategy str : context.getSimulationStorage().getParameter()
- .getStrategies()) {
+ for (Strategy str : context.getSimulationStorage().getParameter().getStrategies()) {
Strategy tmp = (Strategy) db.findByTopiaId(str.getTopiaId());
strategies.add(tmp);
}
- // }
return strategies;
}
public List<Metier> getMetiers(TimeStep step) throws TopiaException {
- // if (metiers == null) {
List<Metier> metiers = new ArrayList<>();
- HashSet<Metier> tmp = new HashSet<>();
+ Set<Metier> tmp = new HashSet<>();
for (Strategy str : getStrategies(step)) {
SetOfVessels sov = str.getSetOfVessels();
for (EffortDescription effort : sov.getPossibleMetiers()) {
@@ -164,7 +161,6 @@
}
}
}
- // }
return metiers;
}
@@ -179,18 +175,6 @@
public List<Metier> getMetiers(Strategy str, TimeStep step) {
StrategyMonthInfo info = str.getStrategyMonthInfo(step.getMonth());
List<Metier> result = info.getMetierWithProportion();
-
-// MatrixND props = info.getProportionMetier();
-//
-// List<Metier> result = new ArrayList<Metier>();
-//
-// for (MatrixIterator i = props.iterator(); i.hasNext();) {
-// i.next();
-// if (i.getValue() != 0) {
-// Metier metier = (Metier) i.getSemanticsCoordinates()[0];
-// result.add(metier);
-// }
-// }
return result;
}
@@ -204,6 +188,7 @@
* @return
* @throws TopiaException
*/
+ @ComputeResult(MatrixMetierZone.NAME)
public MatrixND getMetierZone(TimeStep step) throws TopiaException {
List<Metier> metiers = getMetiers(step);
List<Zone> zones = getZones(step);
@@ -213,8 +198,7 @@
new String[] { n("Metiers"), n("Zones") });
for (Metier metier : metiers) {
- Collection<Zone> zoneMetier = metier.getMetierSeasonInfo(
- step.getMonth()).getZone();
+ Collection<Zone> zoneMetier = metier.getMetierSeasonInfo(step.getMonth()).getZone();
for (Zone zone : zoneMetier) {
result.setValue(metier, zone, 1);
}
@@ -222,6 +206,7 @@
return result;
}
+ @ComputeResult(MatrixPrice.NAME)
public MatrixND matrixPrice(TimeStep step, Population pop) {
List<PopulationGroup> groups = pop.getPopulationGroup();
MatrixND result = MatrixFactory.getInstance().create(
@@ -257,6 +242,7 @@
//
///////////////////////////////////////////////////////////////////////////
+ @ComputeResult(MatrixCatchWeightPerStrategyMetPerZonePop.NAME)
public MatrixND matrixCatchWeightPerStrategyMetPerZonePop(TimeStep step,
Population pop, MatrixND matrixCatchPerStrategyMetPerZonePop)
throws TopiaException, IsisFishException {
@@ -278,6 +264,7 @@
* @throws TopiaException
* @throws IsisFishException
*/
+ @ComputeResult(MatrixCatchPerStrategyMetPerZonePop.NAME)
public MatrixND matrixCatchPerStrategyMetPerZone(MatrixND N,
Population pop, TimeStep step)
throws TopiaException, IsisFishException {
@@ -310,6 +297,7 @@
* @throws TopiaException
* @throws IsisFishException
*/
+ @ComputeResult(MatrixCatchRatePerStrategyMet.NAME)
public MatrixND matrixCatchRatePerStrategyMetPerZone(Population pop, TimeStep step) throws TopiaException,
IsisFishException {
@@ -412,15 +400,12 @@
// Optimisation Hilaire
protected double catchRatePerStrategyMet(Strategy str, Metier metier,
TimeStep step, PopulationGroup group, Zone zone,
- MatrixND matrixFishingMortality) throws TopiaException,
- IsisFishException {
- double totalFishingMortality = totalFishingMortality(step,
- matrixFishingMortality).getValue(group, zone);
+ MatrixND matrixFishingMortality) throws TopiaException {
+ double totalFishingMortality = totalFishingMortality(step, matrixFishingMortality).getValue(group, zone);
if (totalFishingMortality == 0) {
if (log.isDebugEnabled()) {
- log.debug("pas de totalFishingMortality pour (" + group + ", "
- + zone + ")");
+ log.debug("pas de totalFishingMortality pour (" + group + ", " + zone + ")");
}
return 0;
}
@@ -435,8 +420,7 @@
+ " fishingMortality=" + fishingMortality
+ " totalCatchRate=" + totalCatchRate);
}
- double result = fishingMortality / totalFishingMortality
- * totalCatchRate;
+ double result = fishingMortality / totalFishingMortality * totalCatchRate;
return result;
}
@@ -492,6 +476,7 @@
* @throws TopiaException
* @throws IsisFishException
*/
+ @ComputeResult(MatrixFishingMortality.NAME)
public MatrixND matrixFishingMortality(TimeStep step, Population pop)
throws TopiaException, IsisFishException {
List<Strategy> strategies = getStrategies(step);
@@ -588,7 +573,7 @@
double propStrMet = smi.getProportionMetier(metier);
double effortNominalPerVessel = effortNominalPerStrategyPerVessel(str, metier, step);
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug(
" strategy=" + str +
" metier=" + metier +
@@ -875,8 +860,8 @@
* @throws IsisFishException
* @throws TopiaException
*/
- public MatrixND matrixAbundance(MatrixND N, Population pop, TimeStep step) throws TopiaException,
- IsisFishException {
+ @ComputeResult(MatrixAbundance.NAME)
+ public MatrixND matrixAbundance(MatrixND N, Population pop, TimeStep step) throws TopiaException, IsisFishException {
MatrixND matrixFishingMortality = matrixFishingMortality(step, pop);
@@ -913,8 +898,8 @@
* @throws IsisFishException
* @throws TopiaException
*/
- public MatrixND matrixAbundanceSsF(MatrixND N, Population pop, TimeStep step)
- throws TopiaException, IsisFishException {
+ @ComputeResult(MatrixAbundance.NAME)
+ public MatrixND matrixAbundanceSsF(MatrixND N, Population pop, TimeStep step) throws TopiaException {
List<PopulationGroup> groups = pop.getPopulationGroup();
List<Zone> zones = pop.getPopulationZone();
@@ -949,8 +934,7 @@
* @throws TopiaException
*/
protected double survivalRatePerZone(TimeStep step, PopulationGroup group,
- Zone zone, MatrixND matrixFishingMortality) throws TopiaException,
- IsisFishException {
+ Zone zone, MatrixND matrixFishingMortality) throws TopiaException {
double F = totalFishingMortality(step, matrixFishingMortality)
.getValue(group, zone); //totalFishingMortality(step, group, zone); // rem perf: totalFishingMortality a deja ete calcule
double M = getTotalDeathRate(step, group, zone)
@@ -972,54 +956,18 @@
* @param step
* @return
*/
+ @ComputeResult(MatrixBiomass.NAME)
public MatrixND matrixBiomass(MatrixND N, Population pop, TimeStep step) {
return matrixToWeightMatrix(step, 0, MatrixBiomass.NAME, N);
-//
-// List<PopulationGroup> groups = (List<PopulationGroup>)N.getSemantic(0);
-// List<Zone> zones = (List<Zone>)N.getSemantic(1);
-//
-// MatrixND result = MatrixFactory.getInstance().create(
-// ResultName.MATRIX_BIOMASS, new List[] { groups, zones },
-// new String[] { n("Groups"), n("Zones") });
-//
-// for (int g = 0; g < groups.size(); g++) {
-// PopulationGroup group = groups.get(g);
-// double meanWeight = group.getMeanWeight();
-// for (int z = 0; z < zones.size(); z++) {
-// Zone zone = zones.get(z);
-// double n = N.getValue(group, zone);
-// double value = n * meanWeight;
-// result.setValue(group, zone, value);
-// }
-// }
-//
-// return result;
}
- public MatrixND matrixBiomassBeginMonth(MatrixND N, Population pop,
- TimeStep step) {
+ @ComputeResult(MatrixBiomassBeginMonth.NAME)
+ public MatrixND matrixBiomassBeginMonth(MatrixND N, Population pop, TimeStep step) {
return matrixToWeightMatrix(step, 0, MatrixBiomassBeginMonth.NAME, N);
-// List<PopulationGroup> groups = (List<PopulationGroup>)N.getSemantic(0);
-// List<Zone> zones = (List<Zone>)N.getSemantic(1);
-//
-// MatrixND result = MatrixFactory.getInstance().create(
-// ResultName.MATRIX_BIOMASS_BEGIN_MONTH, new List[] { groups, zones },
-// new String[] { n("Groups"), n("Zones") });
-//
-// for (int g = 0; g < groups.size(); g++) {
-// PopulationGroup group = groups.get(g);
-// double meanWeight = group.getMeanWeight();
-// for (int z = 0; z < zones.size(); z++) {
-// Zone zone = zones.get(z);
-// double n = N.getValue(group, zone);
-// double value = n * meanWeight;
-// result.setValue(group, zone, value);
-// }
-// }
-// return result;
}
+ @ComputeResult(MatrixAbundanceBeginMonth.NAME)
public MatrixND matrixAbondanceBeginMonth(MatrixND N, Population pop,
TimeStep step) {
List<PopulationGroup> groups = (List<PopulationGroup>)N.getSemantic(0);
@@ -1043,6 +991,7 @@
* @return
* @throws TopiaException
*/
+ @ComputeResult(MatrixEffortPerStrategyMet.NAME)
public MatrixND matrixEffortPerStrategyMet(TimeStep step) throws TopiaException {
List<Strategy> strategies = getStrategies(step);
List<Metier> metiers = getMetiers(step);
@@ -1071,26 +1020,15 @@
* @param matrixDiscardPerStrategyMetPerZonePop
* @return
*/
+ @ComputeResult(MatrixDiscardsWeightPerStrMetPerZonePop.NAME)
public MatrixND matrixDiscardWeightPerStrategyMetPerZonePop(Population pop,
TimeStep step, MatrixND matrixDiscardPerStrategyMetPerZonePop) {
return matrixToWeightMatrix(step, 2,
MatrixDiscardsWeightPerStrMetPerZonePop.NAME,
matrixDiscardPerStrategyMetPerZonePop);
-
-// List<PopulationGroup> groups = pop.getPopulationGroup();
-//
-// MatrixND result = matrixDiscardPerStrategyMetPerZonePop.copy();
-// result.setName(ResultName.MATRIX_DISCARDS_WEIGHT_PER_STR_MET_PER_ZONE_POP);
-//
-// for (PopulationGroup group : groups) {
-// MatrixND sub = result.getSubMatrix(2, group, 1);
-// double meanWeight = group.getMeanWeight();
-// sub.mults(meanWeight);
-// }
-//
-// return result;
}
+ @ComputeResult(MatrixEffortNominalPerStrategyMet.NAME)
public MatrixND matrixEffortNominalPerStrategyMet(TimeStep step) throws TopiaException {
List<Strategy> strategies = getStrategies(step);
@@ -1122,6 +1060,7 @@
* @param pop population
* @return Fishing mortality per group per year (computed in December)
*/
+ @ComputeResult(MatrixFishingMortalityPerGroup.NAME)
public MatrixND fishingMortalityPerGroup(TimeStep step, Population pop, ResultManager resManager) throws TopiaException {
double Fgroup = 0;
double Cgroup = 0;
@@ -1207,7 +1146,8 @@
* Ce morceau de script sert a calculer la mortalite par peche par espece et
* par groupe representatif a partir de la mortalite par peche par groupe
* calculee precedemment.
- */
+ */
+ @ComputeResult(MatrixTotalFishingMortality.NAME)
public MatrixND totalFishingMortality(TimeStep step, Population pop, MatrixND fishingMortalityPerGroup) throws TopiaException {
MatrixND tfmMatrix = fishingMortalityPerGroup.copy();
tfmMatrix.setName(MatrixTotalFishingMortality.NAME);
@@ -1239,8 +1179,7 @@
* @return
*/
@Nocache // no need to cache it, because caller method is cached
- public MatrixND matrixToWeightMatrix(TimeStep step, int dimGroup, String resultName,
- MatrixND matrix) {
+ public MatrixND matrixToWeightMatrix(TimeStep step, int dimGroup, String resultName, MatrixND matrix) {
MatrixND result = matrix.copy();
result.setName(resultName);
@@ -1269,6 +1208,7 @@
* @param N
* @return
*/
+ @ComputeResult(MatrixLbar.NAME)
public MatrixND Lbar(TimeStep step, Population pop, MatrixND N) throws TopiaException {
MatrixND LbarMatrix = N.copy();
LbarMatrix.setName(MatrixLbar.NAME);
@@ -1291,19 +1231,15 @@
LbarMatrix = LbarMatrix.sumOverDim(0); // Somme sur les groupes
LbarMatrix = LbarMatrix.reduce();
- //log.info("LbarMatrix_2 = " + LbarMatrix);
-
+
MatrixND matAB = N.copy();
matAB = matAB.sumOverDim(0);
matAB = matAB.reduce();
- //log.info("matAB = " + matAB);
for (Zone zn : zones) {
LbarMatrix.setValue(zn, LbarMatrix.getValue(zn) / matAB.getValue(zn));
}
- //log.info("LbarMatrix_3 = " + LbarMatrix);
-
return LbarMatrix;
}
@@ -1315,6 +1251,7 @@
* @param N
* @return
*/
+ @ComputeResult(MatrixLbarTotal.NAME)
public MatrixND LbarTotal(TimeStep step, Population pop, MatrixND N) throws TopiaException {
MatrixND LbarTotalMatrix = N.copy();
LbarTotalMatrix = LbarTotalMatrix.sumOverDim(1).reduceDims(1); // reduction des zones
@@ -1341,6 +1278,7 @@
* @param pop
* @return
*/
+ @ComputeResult(MatrixRecruitment.NAME)
public MatrixND Recruitment(TimeStep step, Population pop) throws TopiaException {
List<Population> populations = Collections.singletonList(pop);
@@ -1349,14 +1287,10 @@
MatrixRecruitment.NAME,
new List[]{populations}, //
new String[]{n("Population")});
-
- //log.info("Recruitment_1 = " + RecruitmentMatrix);
// Pour chaque pas de temps on recupere le recrutement
RecruitmentMatrix.setValue(pop, context.getPopulationMonitor().getRecruitment(step, pop).sumAll());
- //log.info("RecruitmentMatrix_2 = " + RecruitmentMatrix);
-
return RecruitmentMatrix;
}
}
Modified: trunk/scripts/SiMatrixEffortByCell.java
===================================================================
--- trunk/scripts/SiMatrixEffortByCell.java 2020-03-17 11:30:31 UTC (rev 415)
+++ trunk/scripts/SiMatrixEffortByCell.java 2020-06-04 11:52:37 UTC (rev 416)
@@ -24,6 +24,7 @@
import static org.nuiton.i18n.I18n.n;
import fr.ifremer.isisfish.IsisFishException;
+import fr.ifremer.isisfish.annotations.ComputeResult;
import fr.ifremer.isisfish.entities.Cell;
import fr.ifremer.isisfish.entities.Gear;
import fr.ifremer.isisfish.entities.Metier;
@@ -85,6 +86,7 @@
}
}
+ @ComputeResult(MatrixCatchWeightPerStrategyMetPerZoneMet.NAME)
protected MatrixND matrixCatchWeightPerStrategyMetPerZoneMet(TimeStep step,
Population pop, MatrixND matrixCatchPerStrategyMetPerZoneMet)
throws TopiaException, IsisFishException {
@@ -94,6 +96,7 @@
matrixCatchPerStrategyMetPerZoneMet);
}
+ @ComputeResult(MatrixCatchPerStrategyMetPerZoneMet.NAME)
protected MatrixND matrixCatchPerStrategyMetPerZoneMet(MatrixND N,
Population pop, TimeStep step) throws TopiaException, IsisFishException {
@@ -152,8 +155,8 @@
return result;
}
-
@Override
+ @ComputeResult(MatrixCatchPerStrategyMetPerZonePop.NAME)
public MatrixND matrixCatchPerStrategyMetPerZone(MatrixND N,
Population pop, TimeStep step) throws TopiaException, IsisFishException {
MatrixND matrixFishingMortalityPerCell = matrixFishingMortalityPerCell(
@@ -183,6 +186,7 @@
* @throws TopiaException
*/
@Override
+ @ComputeResult(MatrixAbundance.NAME)
public MatrixND matrixAbundance(MatrixND N, Population pop, TimeStep step)
throws TopiaException, IsisFishException {
@@ -373,12 +377,9 @@
* @param step
* @return
* @throws TopiaException
- * @throws IsisFishException
*/
- protected MatrixND matrixCatchPerStrategyMetPerCell(MatrixND N,
- Population pop, TimeStep step,
- MatrixND matrixCatchRatePerStrategyMetPerCell)
- throws TopiaException, IsisFishException {
+ protected MatrixND matrixCatchPerStrategyMetPerCell(MatrixND N, Population pop, TimeStep step,
+ MatrixND matrixCatchRatePerStrategyMetPerCell) throws TopiaException {
int groupDim = 2;
int zoneDim = 3;
1
0