Author: echatellier Date: 2015-06-16 15:28:42 +0000 (Tue, 16 Jun 2015) New Revision: 359 Url: http://forge.codelutin.com/projects/isis-fish-data/repository/revisions/359 Log: Add new result info classes Added: branches/4.4.0-resultnames/resultinfos/ branches/4.4.0-resultnames/resultinfos/MatrixAbundance.java branches/4.4.0-resultnames/resultinfos/MatrixAbundanceBeginMonth.java branches/4.4.0-resultnames/resultinfos/MatrixBiomass.java branches/4.4.0-resultnames/resultinfos/MatrixBiomassBeginMonth.java branches/4.4.0-resultnames/resultinfos/MatrixCatchPerStrategyMetPerZoneMet.java branches/4.4.0-resultnames/resultinfos/MatrixCatchPerStrategyMetPerZonePop.java branches/4.4.0-resultnames/resultinfos/MatrixCatchRatePerStrategyMet.java branches/4.4.0-resultnames/resultinfos/MatrixCatchWeightPerStrategyMetPerZoneMet.java branches/4.4.0-resultnames/resultinfos/MatrixCatchWeightPerStrategyMetPerZonePop.java branches/4.4.0-resultnames/resultinfos/MatrixCostsOfFishingPerVessel.java branches/4.4.0-resultnames/resultinfos/MatrixCrewSharePerStrategyPerVessel.java branches/4.4.0-resultnames/resultinfos/MatrixDiscardsPerStrMetPerZonePop.java branches/4.4.0-resultnames/resultinfos/MatrixDiscardsWeightPerStrMetPerZonePop.java branches/4.4.0-resultnames/resultinfos/MatrixEffortNominalPerStrategyMet.java branches/4.4.0-resultnames/resultinfos/MatrixEffortPerStrategyMet.java branches/4.4.0-resultnames/resultinfos/MatrixFishingMortality.java branches/4.4.0-resultnames/resultinfos/MatrixFishingMortalityPerGroup.java branches/4.4.0-resultnames/resultinfos/MatrixFishingTimePerMonthPerVessel.java branches/4.4.0-resultnames/resultinfos/MatrixFuelCostsOfTravelPerVessel.java branches/4.4.0-resultnames/resultinfos/MatrixFuelCostsPerVessel.java branches/4.4.0-resultnames/resultinfos/MatrixGrossValueOfLandingsOtherSpeciesPerStrategyMet.java branches/4.4.0-resultnames/resultinfos/MatrixGrossValueOfLandingsPerSpeciesPerStrategyMet.java branches/4.4.0-resultnames/resultinfos/MatrixGrossValueOfLandingsPerStrategyMet.java branches/4.4.0-resultnames/resultinfos/MatrixGrossValueOfLandingsPerStrategyMetPerVessel.java branches/4.4.0-resultnames/resultinfos/MatrixLandingPerMet.java branches/4.4.0-resultnames/resultinfos/MatrixLbar.java branches/4.4.0-resultnames/resultinfos/MatrixMetierZone.java branches/4.4.0-resultnames/resultinfos/MatrixNetRevenueToSharePerStrategyMetPerVessel.java branches/4.4.0-resultnames/resultinfos/MatrixNetValueOfLandingsPerStrategyMet.java branches/4.4.0-resultnames/resultinfos/MatrixNetValueOfLandingsPerStrategyMetPerVessel.java branches/4.4.0-resultnames/resultinfos/MatrixNoActivity.java branches/4.4.0-resultnames/resultinfos/MatrixOtherRunningCostsPerVessel.java branches/4.4.0-resultnames/resultinfos/MatrixOwnerMarginOverVariableCostsPerStrategy.java branches/4.4.0-resultnames/resultinfos/MatrixOwnerMarginOverVariableCostsPerStrategyMetPerVessel.java branches/4.4.0-resultnames/resultinfos/MatrixOwnerMarginOverVariableCostsPerStrategyPerVessel.java branches/4.4.0-resultnames/resultinfos/MatrixPrice.java branches/4.4.0-resultnames/resultinfos/MatrixRecruitment.java branches/4.4.0-resultnames/resultinfos/MatrixRepairAndMaintenanceGearCostsPerVessel.java branches/4.4.0-resultnames/resultinfos/MatrixSharedNotFixedCostsPerVessel.java branches/4.4.0-resultnames/resultinfos/MatrixTotalFishingMortality.java branches/4.4.0-resultnames/resultinfos/MatrixVesselMarginOverVariableCostsPerStrategy.java branches/4.4.0-resultnames/resultinfos/MatrixVesselMarginOverVariableCostsPerStrategyMetPerVessel.java branches/4.4.0-resultnames/resultinfos/MatrixVesselMarginOverVariableCostsPerStrategyPerVessel.java Modified: branches/4.4.0-resultnames/scripts/ResultName.java Added: branches/4.4.0-resultnames/resultinfos/MatrixAbundance.java =================================================================== --- branches/4.4.0-resultnames/resultinfos/MatrixAbundance.java (rev 0) +++ branches/4.4.0-resultnames/resultinfos/MatrixAbundance.java 2015-06-16 15:28:42 UTC (rev 359) @@ -0,0 +1,38 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2015 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ +package resultinfos; + +import fr.ifremer.isisfish.result.AbstractResultInfo; + +/** + * Matrix with three dimensions + * Dimension 1 : TimeStep + * Dimension 2 : Group (semantics : Dimension 1) + * Dimension 3 : Zone (semantics : Dimension 2) + */ +public class MatrixAbundance extends AbstractResultInfo { + + @Override + public String getDescription() { + return "do the doc of Result MatrixAbundance"; + } +} Property changes on: branches/4.4.0-resultnames/resultinfos/MatrixAbundance.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/4.4.0-resultnames/resultinfos/MatrixAbundanceBeginMonth.java =================================================================== --- branches/4.4.0-resultnames/resultinfos/MatrixAbundanceBeginMonth.java (rev 0) +++ branches/4.4.0-resultnames/resultinfos/MatrixAbundanceBeginMonth.java 2015-06-16 15:28:42 UTC (rev 359) @@ -0,0 +1,38 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2015 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ +package resultinfos; + +import fr.ifremer.isisfish.result.AbstractResultInfo; + +/** + * Matrix with three dimensions + * Dimension 1 : Date + * Dimension 2 : Group + * Dimension 3 : Zone + */ +public class MatrixAbundanceBeginMonth extends AbstractResultInfo { + + @Override + public String getDescription() { + return "do the doc of Result MatrixAbundanceBeginMonth"; + } +} Property changes on: branches/4.4.0-resultnames/resultinfos/MatrixAbundanceBeginMonth.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/4.4.0-resultnames/resultinfos/MatrixBiomass.java =================================================================== --- branches/4.4.0-resultnames/resultinfos/MatrixBiomass.java (rev 0) +++ branches/4.4.0-resultnames/resultinfos/MatrixBiomass.java 2015-06-16 15:28:42 UTC (rev 359) @@ -0,0 +1,38 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2015 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ +package resultinfos; + +import fr.ifremer.isisfish.result.AbstractResultInfo; + +/** + * Matrix with three dimensions + * Dimension 1 : TimeStep + * Dimension 2 : Group + * Dimension 3 : Zone + */ +public class MatrixBiomass extends AbstractResultInfo { + + @Override + public String getDescription() { + return "do the doc of Result MatrixBiomass"; + } +} Property changes on: branches/4.4.0-resultnames/resultinfos/MatrixBiomass.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/4.4.0-resultnames/resultinfos/MatrixBiomassBeginMonth.java =================================================================== --- branches/4.4.0-resultnames/resultinfos/MatrixBiomassBeginMonth.java (rev 0) +++ branches/4.4.0-resultnames/resultinfos/MatrixBiomassBeginMonth.java 2015-06-16 15:28:42 UTC (rev 359) @@ -0,0 +1,38 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2015 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ +package resultinfos; + +import fr.ifremer.isisfish.result.AbstractResultInfo; + +/** + * Matrix with three dimensions + * Dimension 1 : TimeStep + * Dimension 2 : Group + * Dimension 3 : Zone + */ +public class MatrixBiomassBeginMonth extends AbstractResultInfo { + + @Override + public String getDescription() { + return "do the doc of Result MatrixBiomassBeginMonth"; + } +} Property changes on: branches/4.4.0-resultnames/resultinfos/MatrixBiomassBeginMonth.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/4.4.0-resultnames/resultinfos/MatrixCatchPerStrategyMetPerZoneMet.java =================================================================== --- branches/4.4.0-resultnames/resultinfos/MatrixCatchPerStrategyMetPerZoneMet.java (rev 0) +++ branches/4.4.0-resultnames/resultinfos/MatrixCatchPerStrategyMetPerZoneMet.java 2015-06-16 15:28:42 UTC (rev 359) @@ -0,0 +1,43 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2015 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ +package resultinfos; + +import fr.ifremer.isisfish.result.AbstractResultInfo; + +/** + * Matrix with five dimensions + * Dimension 1 : TimeStep + * Dimension 2 : Strategy + * Dimension 3 : Metier + * Dimension 4 : Group + * Dimension 5 : Zone + * + * N'est calcule que si l'effort est calcule par cellule et non par zone. + * @see simulators.SimulatorEffortByCell + */ +public class MatrixCatchPerStrategyMetPerZoneMet extends AbstractResultInfo { + + @Override + public String getDescription() { + return "do the doc of Result MatrixCatchPerStrategyMetPerZoneMet"; + } +} Property changes on: branches/4.4.0-resultnames/resultinfos/MatrixCatchPerStrategyMetPerZoneMet.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/4.4.0-resultnames/resultinfos/MatrixCatchPerStrategyMetPerZonePop.java =================================================================== --- branches/4.4.0-resultnames/resultinfos/MatrixCatchPerStrategyMetPerZonePop.java (rev 0) +++ branches/4.4.0-resultnames/resultinfos/MatrixCatchPerStrategyMetPerZonePop.java 2015-06-16 15:28:42 UTC (rev 359) @@ -0,0 +1,40 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2015 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ +package resultinfos; + +import fr.ifremer.isisfish.result.AbstractResultInfo; + +/** + * Matrix with five dimensions + * Dimension 1 : TimeStep + * Dimension 2 : Strategy + * Dimension 3 : Metier + * Dimension 4 : Group + * Dimension 5 : Zone + */ +public class MatrixCatchPerStrategyMetPerZonePop extends AbstractResultInfo { + + @Override + public String getDescription() { + return "do the doc of Result MatrixCatchPerStrategyMetPerZonePop"; + } +} Property changes on: branches/4.4.0-resultnames/resultinfos/MatrixCatchPerStrategyMetPerZonePop.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/4.4.0-resultnames/resultinfos/MatrixCatchRatePerStrategyMet.java =================================================================== --- branches/4.4.0-resultnames/resultinfos/MatrixCatchRatePerStrategyMet.java (rev 0) +++ branches/4.4.0-resultnames/resultinfos/MatrixCatchRatePerStrategyMet.java 2015-06-16 15:28:42 UTC (rev 359) @@ -0,0 +1,40 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2015 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ +package resultinfos; + +import fr.ifremer.isisfish.result.AbstractResultInfo; + +/** + * Matrix with five dimensions + * Dimension 1 : TimeStep + * Dimension 2 : Strategy + * Dimension 3 : Metier + * Dimension 4 : Group + * Dimension 5 : Zone + */ +public class MatrixCatchRatePerStrategyMet extends AbstractResultInfo { + + @Override + public String getDescription() { + return "do the doc of Result MatrixCatchRatePerStrategyMet"; + } +} Property changes on: branches/4.4.0-resultnames/resultinfos/MatrixCatchRatePerStrategyMet.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/4.4.0-resultnames/resultinfos/MatrixCatchWeightPerStrategyMetPerZoneMet.java =================================================================== --- branches/4.4.0-resultnames/resultinfos/MatrixCatchWeightPerStrategyMetPerZoneMet.java (rev 0) +++ branches/4.4.0-resultnames/resultinfos/MatrixCatchWeightPerStrategyMetPerZoneMet.java 2015-06-16 15:28:42 UTC (rev 359) @@ -0,0 +1,43 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2015 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ +package resultinfos; + +import fr.ifremer.isisfish.result.AbstractResultInfo; + +/** + * Matrix with five dimensions + * Dimension 1 : TimeStep + * Dimension 2 : Strategy + * Dimension 3 : Metier + * Dimension 4 : Group + * Dimension 5 : Zone + * + * N'est calcule que si l'effort est calcule par cellule et non par zone. + * @see simulators.SimulatorEffortByCell + */ +public class MatrixCatchWeightPerStrategyMetPerZoneMet extends AbstractResultInfo { + + @Override + public String getDescription() { + return "do the doc of Result MatrixCatchWeightPerStrategyMetPerZoneMet"; + } +} Property changes on: branches/4.4.0-resultnames/resultinfos/MatrixCatchWeightPerStrategyMetPerZoneMet.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/4.4.0-resultnames/resultinfos/MatrixCatchWeightPerStrategyMetPerZonePop.java =================================================================== --- branches/4.4.0-resultnames/resultinfos/MatrixCatchWeightPerStrategyMetPerZonePop.java (rev 0) +++ branches/4.4.0-resultnames/resultinfos/MatrixCatchWeightPerStrategyMetPerZonePop.java 2015-06-16 15:28:42 UTC (rev 359) @@ -0,0 +1,40 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2015 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ +package resultinfos; + +import fr.ifremer.isisfish.result.AbstractResultInfo; + +/** + * Matrix with five dimensions + * Dimension 1 : TimeStep + * Dimension 2 : Strategy + * Dimension 3 : Metier + * Dimension 4 : Group + * Dimension 5 : Zone + */ +public class MatrixCatchWeightPerStrategyMetPerZonePop extends AbstractResultInfo { + + @Override + public String getDescription() { + return "do the doc of Result MatrixCatchWeightPerStrategyMetPerZonePop"; + } +} Property changes on: branches/4.4.0-resultnames/resultinfos/MatrixCatchWeightPerStrategyMetPerZonePop.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/4.4.0-resultnames/resultinfos/MatrixCostsOfFishingPerVessel.java =================================================================== --- branches/4.4.0-resultnames/resultinfos/MatrixCostsOfFishingPerVessel.java (rev 0) +++ branches/4.4.0-resultnames/resultinfos/MatrixCostsOfFishingPerVessel.java 2015-06-16 15:28:42 UTC (rev 359) @@ -0,0 +1,38 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2015 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ +package resultinfos; + +import fr.ifremer.isisfish.result.AbstractResultInfo; + +/** + * Matrix with three dimensions + * Dimension 1 : TimeStep + * Dimension 2 : Strategy + * Dimension 3 : Metier + */ +public class MatrixCostsOfFishingPerVessel extends AbstractResultInfo { + + @Override + public String getDescription() { + return "do the doc of Result MatrixCostsOfFishingPerVessel"; + } +} Property changes on: branches/4.4.0-resultnames/resultinfos/MatrixCostsOfFishingPerVessel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/4.4.0-resultnames/resultinfos/MatrixCrewSharePerStrategyPerVessel.java =================================================================== --- branches/4.4.0-resultnames/resultinfos/MatrixCrewSharePerStrategyPerVessel.java (rev 0) +++ branches/4.4.0-resultnames/resultinfos/MatrixCrewSharePerStrategyPerVessel.java 2015-06-16 15:28:42 UTC (rev 359) @@ -0,0 +1,38 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2015 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ +package resultinfos; + +import fr.ifremer.isisfish.result.AbstractResultInfo; + +/** + * Matrix with three dimensions + * Dimension 1 : TimeStep + * Dimension 2 : Strategy + * Dimension 3 : Metier + */ +public class MatrixCrewSharePerStrategyPerVessel extends AbstractResultInfo { + + @Override + public String getDescription() { + return "do the doc of Result MatrixCrewSharePerStrategyPerVessel"; + } +} Property changes on: branches/4.4.0-resultnames/resultinfos/MatrixCrewSharePerStrategyPerVessel.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/4.4.0-resultnames/resultinfos/MatrixDiscardsPerStrMetPerZonePop.java =================================================================== --- branches/4.4.0-resultnames/resultinfos/MatrixDiscardsPerStrMetPerZonePop.java (rev 0) +++ branches/4.4.0-resultnames/resultinfos/MatrixDiscardsPerStrMetPerZonePop.java 2015-06-16 15:28:42 UTC (rev 359) @@ -0,0 +1,40 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2015 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ +package resultinfos; + +import fr.ifremer.isisfish.result.AbstractResultInfo; + +/** + * Matrix with five dimensions + * Dimension 1 : TimeStep + * Dimension 2 : Strategy + * Dimension 3 : Metier + * Dimension 4 : Group + * Dimension 5 : Zone + */ +public class MatrixDiscardsPerStrMetPerZonePop extends AbstractResultInfo { + + @Override + public String getDescription() { + return "do the doc of Result MatrixDiscardsPerStrMetPerZonePop"; + } +} Property changes on: branches/4.4.0-resultnames/resultinfos/MatrixDiscardsPerStrMetPerZonePop.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/4.4.0-resultnames/resultinfos/MatrixDiscardsWeightPerStrMetPerZonePop.java =================================================================== --- branches/4.4.0-resultnames/resultinfos/MatrixDiscardsWeightPerStrMetPerZonePop.java (rev 0) +++ branches/4.4.0-resultnames/resultinfos/MatrixDiscardsWeightPerStrMetPerZonePop.java 2015-06-16 15:28:42 UTC (rev 359) @@ -0,0 +1,40 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2015 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ +package resultinfos; + +import fr.ifremer.isisfish.result.AbstractResultInfo; + +/** + * Matrix with 4 dimensions: + * + * Dimension 1 : TimeStep + * Dimension 2 : Metier + * Dimension 3 : Population + * Dimension 4 : Zone + */ +public class MatrixDiscardsWeightPerStrMetPerZonePop extends AbstractResultInfo { + + @Override + public String getDescription() { + return "do the doc of Result MatrixDiscardsWeightPerStrMetPerZonePop"; + } +} Property changes on: branches/4.4.0-resultnames/resultinfos/MatrixDiscardsWeightPerStrMetPerZonePop.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/4.4.0-resultnames/resultinfos/MatrixEffortNominalPerStrategyMet.java =================================================================== --- branches/4.4.0-resultnames/resultinfos/MatrixEffortNominalPerStrategyMet.java (rev 0) +++ branches/4.4.0-resultnames/resultinfos/MatrixEffortNominalPerStrategyMet.java 2015-06-16 15:28:42 UTC (rev 359) @@ -0,0 +1,38 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2015 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ +package resultinfos; + +import fr.ifremer.isisfish.result.AbstractResultInfo; + +/** + * Matrix with three dimensions + * Dimension 1 : TimeStep + * Dimension 2 : Strategy + * Dimension 3 : Metier + */ +public class MatrixEffortNominalPerStrategyMet extends AbstractResultInfo { + + @Override + public String getDescription() { + return "do the doc of Result MatrixEffortNominalPerStrategyMet"; + } +} Property changes on: branches/4.4.0-resultnames/resultinfos/MatrixEffortNominalPerStrategyMet.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/4.4.0-resultnames/resultinfos/MatrixEffortPerStrategyMet.java =================================================================== --- branches/4.4.0-resultnames/resultinfos/MatrixEffortPerStrategyMet.java (rev 0) +++ branches/4.4.0-resultnames/resultinfos/MatrixEffortPerStrategyMet.java 2015-06-16 15:28:42 UTC (rev 359) @@ -0,0 +1,38 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2015 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ +package resultinfos; + +import fr.ifremer.isisfish.result.AbstractResultInfo; + +/** + * Matrix with three dimensions + * Dimension 1 : TimeStep + * Dimension 2 : Strategy + * Dimension 3 : Metier + */ +public class MatrixEffortPerStrategyMet extends AbstractResultInfo { + + @Override + public String getDescription() { + return "do the doc of Result MatrixEffortPerStrategyMet"; + } +} Property changes on: branches/4.4.0-resultnames/resultinfos/MatrixEffortPerStrategyMet.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/4.4.0-resultnames/resultinfos/MatrixFishingMortality.java =================================================================== --- branches/4.4.0-resultnames/resultinfos/MatrixFishingMortality.java (rev 0) +++ branches/4.4.0-resultnames/resultinfos/MatrixFishingMortality.java 2015-06-16 15:28:42 UTC (rev 359) @@ -0,0 +1,40 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2015 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ +package resultinfos; + +import fr.ifremer.isisfish.result.AbstractResultInfo; + +/** + * Matrix with five dimensions + * Dimension 1 : TimeStep + * Dimension 2 : Strategy + * Dimension 3 : Metier + * Dimension 4 : Group + * Dimension 5 : Zone + */ +public class MatrixFishingMortality extends AbstractResultInfo { + + @Override + public String getDescription() { + return "do the doc of Result MatrixFishingMortality"; + } +} Property changes on: branches/4.4.0-resultnames/resultinfos/MatrixFishingMortality.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/4.4.0-resultnames/resultinfos/MatrixFishingMortalityPerGroup.java =================================================================== --- branches/4.4.0-resultnames/resultinfos/MatrixFishingMortalityPerGroup.java (rev 0) +++ branches/4.4.0-resultnames/resultinfos/MatrixFishingMortalityPerGroup.java 2015-06-16 15:28:42 UTC (rev 359) @@ -0,0 +1,37 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2015 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ +package resultinfos; + +import fr.ifremer.isisfish.result.AbstractResultInfo; + +/** + * Matrix with 2 dimensions + * Dimension 1 : TimeStep + * Dimension 2 : Group + */ +public class MatrixFishingMortalityPerGroup extends AbstractResultInfo { + + @Override + public String getDescription() { + return "do the doc of Result MatrixFishingMortalityPerGroup"; + } +} Property changes on: branches/4.4.0-resultnames/resultinfos/MatrixFishingMortalityPerGroup.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/4.4.0-resultnames/resultinfos/MatrixFishingTimePerMonthPerVessel.java =================================================================== --- branches/4.4.0-resultnames/resultinfos/MatrixFishingTimePerMonthPerVessel.java (rev 0) +++ branches/4.4.0-resultnames/resultinfos/MatrixFishingTimePerMonthPerVessel.java 2015-06-16 15:28:42 UTC (rev 359) @@ -0,0 +1,38 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2015 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ +package resultinfos; + +import fr.ifremer.isisfish.result.AbstractResultInfo; + +/** + * Matrix with three dimensions + * Dimension 1 : TimeStep + * Dimension 2 : Strategy + * Dimension 3 : Metier + */ +public class MatrixFishingTimePerMonthPerVessel extends AbstractResultInfo { + + @Override + public String getDescription() { + return "do the doc of Result MatrixFishingTimePerMonthPerVessel"; + } +} Property changes on: branches/4.4.0-resultnames/resultinfos/MatrixFishingTimePerMonthPerVessel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/4.4.0-resultnames/resultinfos/MatrixFuelCostsOfTravelPerVessel.java =================================================================== --- branches/4.4.0-resultnames/resultinfos/MatrixFuelCostsOfTravelPerVessel.java (rev 0) +++ branches/4.4.0-resultnames/resultinfos/MatrixFuelCostsOfTravelPerVessel.java 2015-06-16 15:28:42 UTC (rev 359) @@ -0,0 +1,38 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2015 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ +package resultinfos; + +import fr.ifremer.isisfish.result.AbstractResultInfo; + +/** + * Matrix with three dimensions + * Dimension 1 : TimeStep + * Dimension 2 : Strategy + * Dimension 3 : Metier + */ +public class MatrixFuelCostsOfTravelPerVessel extends AbstractResultInfo { + + @Override + public String getDescription() { + return "do the doc of Result MatrixFuelCostsOfTravelPerVessel"; + } +} Property changes on: branches/4.4.0-resultnames/resultinfos/MatrixFuelCostsOfTravelPerVessel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/4.4.0-resultnames/resultinfos/MatrixFuelCostsPerVessel.java =================================================================== --- branches/4.4.0-resultnames/resultinfos/MatrixFuelCostsPerVessel.java (rev 0) +++ branches/4.4.0-resultnames/resultinfos/MatrixFuelCostsPerVessel.java 2015-06-16 15:28:42 UTC (rev 359) @@ -0,0 +1,38 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2015 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ +package resultinfos; + +import fr.ifremer.isisfish.result.AbstractResultInfo; + +/** + * Matrix with three dimensions + * Dimension 1 : TimeStep + * Dimension 2 : Strategy + * Dimension 3 : Metier + */ +public class MatrixFuelCostsPerVessel extends AbstractResultInfo { + + @Override + public String getDescription() { + return "do the doc of Result MatrixFuelCostsPerVessel"; + } +} Property changes on: branches/4.4.0-resultnames/resultinfos/MatrixFuelCostsPerVessel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/4.4.0-resultnames/resultinfos/MatrixGrossValueOfLandingsOtherSpeciesPerStrategyMet.java =================================================================== --- branches/4.4.0-resultnames/resultinfos/MatrixGrossValueOfLandingsOtherSpeciesPerStrategyMet.java (rev 0) +++ branches/4.4.0-resultnames/resultinfos/MatrixGrossValueOfLandingsOtherSpeciesPerStrategyMet.java 2015-06-16 15:28:42 UTC (rev 359) @@ -0,0 +1,40 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2015 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ +package resultinfos; + +import fr.ifremer.isisfish.result.AbstractResultInfo; + +/** + * Matrix with three dimensions + * Dimension 1 : TimeStep + * Dimension 2 : Strategy + * Dimension 3 : Metier + * + * Matrix calculated in the non generic Rule : GraviteVPUE1LangEtGrossValueOtherSpeciesECOMOD + */ +public class MatrixGrossValueOfLandingsOtherSpeciesPerStrategyMet extends AbstractResultInfo { + + @Override + public String getDescription() { + return "do the doc of Result MatrixGrossValueOfLandingsOtherSpeciesPerStrategyMet"; + } +} Property changes on: branches/4.4.0-resultnames/resultinfos/MatrixGrossValueOfLandingsOtherSpeciesPerStrategyMet.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/4.4.0-resultnames/resultinfos/MatrixGrossValueOfLandingsPerSpeciesPerStrategyMet.java =================================================================== --- branches/4.4.0-resultnames/resultinfos/MatrixGrossValueOfLandingsPerSpeciesPerStrategyMet.java (rev 0) +++ branches/4.4.0-resultnames/resultinfos/MatrixGrossValueOfLandingsPerSpeciesPerStrategyMet.java 2015-06-16 15:28:42 UTC (rev 359) @@ -0,0 +1,40 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2015 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ +package resultinfos; + +import fr.ifremer.isisfish.result.AbstractResultInfo; + +/** + * Matrix with five dimensions + * Dimension 1 : TimeStep + * Dimension 2 : Strategy + * Dimension 3 : Metier + * Dimension 4 : Group + * Dimension 5 : Zone + */ +public class MatrixGrossValueOfLandingsPerSpeciesPerStrategyMet extends AbstractResultInfo { + + @Override + public String getDescription() { + return "do the doc of Result MatrixGrossValueOfLandingsPerSpeciesPerStrategyMet"; + } +} Property changes on: branches/4.4.0-resultnames/resultinfos/MatrixGrossValueOfLandingsPerSpeciesPerStrategyMet.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/4.4.0-resultnames/resultinfos/MatrixGrossValueOfLandingsPerStrategyMet.java =================================================================== --- branches/4.4.0-resultnames/resultinfos/MatrixGrossValueOfLandingsPerStrategyMet.java (rev 0) +++ branches/4.4.0-resultnames/resultinfos/MatrixGrossValueOfLandingsPerStrategyMet.java 2015-06-16 15:28:42 UTC (rev 359) @@ -0,0 +1,38 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2015 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ +package resultinfos; + +import fr.ifremer.isisfish.result.AbstractResultInfo; + +/** + * Matrix with three dimensions + * Dimension 1 : TimeStep + * Dimension 2 : Strategy + * Dimension 3 : Metier + */ +public class MatrixGrossValueOfLandingsPerStrategyMet extends AbstractResultInfo { + + @Override + public String getDescription() { + return "do the doc of Result MatrixGrossValueOfLandingsPerStrategyMet"; + } +} Property changes on: branches/4.4.0-resultnames/resultinfos/MatrixGrossValueOfLandingsPerStrategyMet.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/4.4.0-resultnames/resultinfos/MatrixGrossValueOfLandingsPerStrategyMetPerVessel.java =================================================================== --- branches/4.4.0-resultnames/resultinfos/MatrixGrossValueOfLandingsPerStrategyMetPerVessel.java (rev 0) +++ branches/4.4.0-resultnames/resultinfos/MatrixGrossValueOfLandingsPerStrategyMetPerVessel.java 2015-06-16 15:28:42 UTC (rev 359) @@ -0,0 +1,38 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2015 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ +package resultinfos; + +import fr.ifremer.isisfish.result.AbstractResultInfo; + +/** + * Matrix with three dimensions + * Dimension 1 : TimeStep + * Dimension 2 : Strategy + * Dimension 3 : Metier + */ +public class MatrixGrossValueOfLandingsPerStrategyMetPerVessel extends AbstractResultInfo { + + @Override + public String getDescription() { + return "do the doc of Result MatrixGrossValueOfLandingsPerStrategyMetPerVessel"; + } +} Property changes on: branches/4.4.0-resultnames/resultinfos/MatrixGrossValueOfLandingsPerStrategyMetPerVessel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/4.4.0-resultnames/resultinfos/MatrixLandingPerMet.java =================================================================== --- branches/4.4.0-resultnames/resultinfos/MatrixLandingPerMet.java (rev 0) +++ branches/4.4.0-resultnames/resultinfos/MatrixLandingPerMet.java 2015-06-16 15:28:42 UTC (rev 359) @@ -0,0 +1,40 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2015 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ +package resultinfos; + +import fr.ifremer.isisfish.result.AbstractResultInfo; + +/** + * Matrix with five dimensions + * Dimension 1 : TimeStep + * Dimension 2 : Strategy + * Dimension 3 : Metier + * Dimension 4 : Group + * Dimension 5 : Zone + */ +public class MatrixLandingPerMet extends AbstractResultInfo { + + @Override + public String getDescription() { + return "do the doc of Result MatrixLandingPerMet"; + } +} Property changes on: branches/4.4.0-resultnames/resultinfos/MatrixLandingPerMet.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/4.4.0-resultnames/resultinfos/MatrixLbar.java =================================================================== --- branches/4.4.0-resultnames/resultinfos/MatrixLbar.java (rev 0) +++ branches/4.4.0-resultnames/resultinfos/MatrixLbar.java 2015-06-16 15:28:42 UTC (rev 359) @@ -0,0 +1,37 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2015 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ +package resultinfos; + +import fr.ifremer.isisfish.result.AbstractResultInfo; + +/** + * Matrix with two dimensions + * Dimension 1 : TimeStep + * Dimension 2 : Zone (semantics : Dimension 1) + */ +public class MatrixLbar extends AbstractResultInfo { + + @Override + public String getDescription() { + return "do the doc of Result MatrixLbar"; + } +} Property changes on: branches/4.4.0-resultnames/resultinfos/MatrixLbar.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/4.4.0-resultnames/resultinfos/MatrixMetierZone.java =================================================================== --- branches/4.4.0-resultnames/resultinfos/MatrixMetierZone.java (rev 0) +++ branches/4.4.0-resultnames/resultinfos/MatrixMetierZone.java 2015-06-16 15:28:42 UTC (rev 359) @@ -0,0 +1,38 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2015 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ +package resultinfos; + +import fr.ifremer.isisfish.result.AbstractResultInfo; + +/** + * Matrix with three dimensions + * Dimension 1 : TimeStep + * Dimension 2 : Metier + * Dimension 3 : Zone + */ +public class MatrixMetierZone extends AbstractResultInfo { + + @Override + public String getDescription() { + return "do the doc of Result MatrixMetierZone"; + } +} Property changes on: branches/4.4.0-resultnames/resultinfos/MatrixMetierZone.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/4.4.0-resultnames/resultinfos/MatrixNetRevenueToSharePerStrategyMetPerVessel.java =================================================================== --- branches/4.4.0-resultnames/resultinfos/MatrixNetRevenueToSharePerStrategyMetPerVessel.java (rev 0) +++ branches/4.4.0-resultnames/resultinfos/MatrixNetRevenueToSharePerStrategyMetPerVessel.java 2015-06-16 15:28:42 UTC (rev 359) @@ -0,0 +1,38 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2015 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ +package resultinfos; + +import fr.ifremer.isisfish.result.AbstractResultInfo; + +/** + * Matrix with three dimensions + * Dimension 1 : TimeStep + * Dimension 2 : Strategy + * Dimension 3 : Metier + */ +public class MatrixNetRevenueToSharePerStrategyMetPerVessel extends AbstractResultInfo { + + @Override + public String getDescription() { + return "do the doc of Result MatrixNetRevenueToSharePerStrategyMetPerVessel"; + } +} Property changes on: branches/4.4.0-resultnames/resultinfos/MatrixNetRevenueToSharePerStrategyMetPerVessel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/4.4.0-resultnames/resultinfos/MatrixNetValueOfLandingsPerStrategyMet.java =================================================================== --- branches/4.4.0-resultnames/resultinfos/MatrixNetValueOfLandingsPerStrategyMet.java (rev 0) +++ branches/4.4.0-resultnames/resultinfos/MatrixNetValueOfLandingsPerStrategyMet.java 2015-06-16 15:28:42 UTC (rev 359) @@ -0,0 +1,38 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2015 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ +package resultinfos; + +import fr.ifremer.isisfish.result.AbstractResultInfo; + +/** + * Matrix with three dimensions + * Dimension 1 : TimeStep + * Dimension 2 : Strategy + * Dimension 3 : Metier + */ +public class MatrixNetValueOfLandingsPerStrategyMet extends AbstractResultInfo { + + @Override + public String getDescription() { + return "do the doc of Result MatrixNetValueOfLandingsPerStrategyMet"; + } +} Property changes on: branches/4.4.0-resultnames/resultinfos/MatrixNetValueOfLandingsPerStrategyMet.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/4.4.0-resultnames/resultinfos/MatrixNetValueOfLandingsPerStrategyMetPerVessel.java =================================================================== --- branches/4.4.0-resultnames/resultinfos/MatrixNetValueOfLandingsPerStrategyMetPerVessel.java (rev 0) +++ branches/4.4.0-resultnames/resultinfos/MatrixNetValueOfLandingsPerStrategyMetPerVessel.java 2015-06-16 15:28:42 UTC (rev 359) @@ -0,0 +1,38 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2015 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ +package resultinfos; + +import fr.ifremer.isisfish.result.AbstractResultInfo; + +/** + * Matrix with three dimensions + * Dimension 1 : TimeStep + * Dimension 2 : Strategy + * Dimension 3 : Metier + */ +public class MatrixNetValueOfLandingsPerStrategyMetPerVessel extends AbstractResultInfo { + + @Override + public String getDescription() { + return "do the doc of Result MatrixNetValueOfLandingsPerStrategyMetPerVessel"; + } +} Property changes on: branches/4.4.0-resultnames/resultinfos/MatrixNetValueOfLandingsPerStrategyMetPerVessel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/4.4.0-resultnames/resultinfos/MatrixNoActivity.java =================================================================== --- branches/4.4.0-resultnames/resultinfos/MatrixNoActivity.java (rev 0) +++ branches/4.4.0-resultnames/resultinfos/MatrixNoActivity.java 2015-06-16 15:28:42 UTC (rev 359) @@ -0,0 +1,38 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2015 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ +package resultinfos; + +import fr.ifremer.isisfish.result.AbstractResultInfo; + +/** + * Matrix with three dimensions + * Dimension 1 : TimeStep + * Dimension 2 : Strategy + * Dimension 3 : Metier + */ +public class MatrixNoActivity extends AbstractResultInfo { + + @Override + public String getDescription() { + return "do the doc of Result MatrixNoActivity"; + } +} Property changes on: branches/4.4.0-resultnames/resultinfos/MatrixNoActivity.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/4.4.0-resultnames/resultinfos/MatrixOtherRunningCostsPerVessel.java =================================================================== --- branches/4.4.0-resultnames/resultinfos/MatrixOtherRunningCostsPerVessel.java (rev 0) +++ branches/4.4.0-resultnames/resultinfos/MatrixOtherRunningCostsPerVessel.java 2015-06-16 15:28:42 UTC (rev 359) @@ -0,0 +1,38 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2015 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ +package resultinfos; + +import fr.ifremer.isisfish.result.AbstractResultInfo; + +/** + * Matrix with three dimensions + * Dimension 1 : TimeStep + * Dimension 2 : Strategy + * Dimension 3 : Metier + */ +public class MatrixOtherRunningCostsPerVessel extends AbstractResultInfo { + + @Override + public String getDescription() { + return "do the doc of Result MatrixOtherRunningCostsPerVessel"; + } +} Property changes on: branches/4.4.0-resultnames/resultinfos/MatrixOtherRunningCostsPerVessel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/4.4.0-resultnames/resultinfos/MatrixOwnerMarginOverVariableCostsPerStrategy.java =================================================================== --- branches/4.4.0-resultnames/resultinfos/MatrixOwnerMarginOverVariableCostsPerStrategy.java (rev 0) +++ branches/4.4.0-resultnames/resultinfos/MatrixOwnerMarginOverVariableCostsPerStrategy.java 2015-06-16 15:28:42 UTC (rev 359) @@ -0,0 +1,37 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2015 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ +package resultinfos; + +import fr.ifremer.isisfish.result.AbstractResultInfo; + +/** + * Matrix with two dimensions + * Dimension 1 : TimeStep + * Dimension 2 : Strategy + */ +public class MatrixOwnerMarginOverVariableCostsPerStrategy extends AbstractResultInfo { + + @Override + public String getDescription() { + return "do the doc of Result MatrixOwnerMarginOverVariableCostsPerStrategy"; + } +} Property changes on: branches/4.4.0-resultnames/resultinfos/MatrixOwnerMarginOverVariableCostsPerStrategy.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/4.4.0-resultnames/resultinfos/MatrixOwnerMarginOverVariableCostsPerStrategyMetPerVessel.java =================================================================== --- branches/4.4.0-resultnames/resultinfos/MatrixOwnerMarginOverVariableCostsPerStrategyMetPerVessel.java (rev 0) +++ branches/4.4.0-resultnames/resultinfos/MatrixOwnerMarginOverVariableCostsPerStrategyMetPerVessel.java 2015-06-16 15:28:42 UTC (rev 359) @@ -0,0 +1,38 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2015 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ +package resultinfos; + +import fr.ifremer.isisfish.result.AbstractResultInfo; + +/** + * Matrix with three dimensions + * Dimension 1 : TimeStep + * Dimension 2 : Strategy + * Dimension 3 : Metier + */ +public class MatrixOwnerMarginOverVariableCostsPerStrategyMetPerVessel extends AbstractResultInfo { + + @Override + public String getDescription() { + return "do the doc of Result MatrixOwnerMarginOverVariableCostsPerStrategyMetPerVessel"; + } +} Property changes on: branches/4.4.0-resultnames/resultinfos/MatrixOwnerMarginOverVariableCostsPerStrategyMetPerVessel.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/4.4.0-resultnames/resultinfos/MatrixOwnerMarginOverVariableCostsPerStrategyPerVessel.java =================================================================== --- branches/4.4.0-resultnames/resultinfos/MatrixOwnerMarginOverVariableCostsPerStrategyPerVessel.java (rev 0) +++ branches/4.4.0-resultnames/resultinfos/MatrixOwnerMarginOverVariableCostsPerStrategyPerVessel.java 2015-06-16 15:28:42 UTC (rev 359) @@ -0,0 +1,38 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2015 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ +package resultinfos; + +import fr.ifremer.isisfish.result.AbstractResultInfo; + +/** + * Matrix with three dimensions + * Dimension 1 : TimeStep + * Dimension 2 : Strategy + * Dimension 3 : Metier + */ +public class MatrixOwnerMarginOverVariableCostsPerStrategyPerVessel extends AbstractResultInfo { + + @Override + public String getDescription() { + return "do the doc of Result MatrixOwnerMarginOverVariableCostsPerStrategyPerVessel"; + } +} Property changes on: branches/4.4.0-resultnames/resultinfos/MatrixOwnerMarginOverVariableCostsPerStrategyPerVessel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/4.4.0-resultnames/resultinfos/MatrixPrice.java =================================================================== --- branches/4.4.0-resultnames/resultinfos/MatrixPrice.java (rev 0) +++ branches/4.4.0-resultnames/resultinfos/MatrixPrice.java 2015-06-16 15:28:42 UTC (rev 359) @@ -0,0 +1,37 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2015 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ +package resultinfos; + +import fr.ifremer.isisfish.result.AbstractResultInfo; + +/** + * Matrix with two dimensions + * Dimension 1 : TimeStep + * Dimension 2 : Group + */ +public class MatrixPrice extends AbstractResultInfo { + + @Override + public String getDescription() { + return "do the doc of Result MatrixPrice"; + } +} Property changes on: branches/4.4.0-resultnames/resultinfos/MatrixPrice.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/4.4.0-resultnames/resultinfos/MatrixRecruitment.java =================================================================== --- branches/4.4.0-resultnames/resultinfos/MatrixRecruitment.java (rev 0) +++ branches/4.4.0-resultnames/resultinfos/MatrixRecruitment.java 2015-06-16 15:28:42 UTC (rev 359) @@ -0,0 +1,36 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2015 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ +package resultinfos; + +import fr.ifremer.isisfish.result.AbstractResultInfo; + +/** + * Matrix with one dimension + * Dimension 1 : TimeStep + */ +public class MatrixRecruitment extends AbstractResultInfo { + + @Override + public String getDescription() { + return "do the doc of Result MatrixRecruitment"; + } +} Property changes on: branches/4.4.0-resultnames/resultinfos/MatrixRecruitment.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/4.4.0-resultnames/resultinfos/MatrixRepairAndMaintenanceGearCostsPerVessel.java =================================================================== --- branches/4.4.0-resultnames/resultinfos/MatrixRepairAndMaintenanceGearCostsPerVessel.java (rev 0) +++ branches/4.4.0-resultnames/resultinfos/MatrixRepairAndMaintenanceGearCostsPerVessel.java 2015-06-16 15:28:42 UTC (rev 359) @@ -0,0 +1,38 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2015 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ +package resultinfos; + +import fr.ifremer.isisfish.result.AbstractResultInfo; + +/** + * Matrix with three dimensions + * Dimension 1 : TimeStep + * Dimension 2 : Strategy + * Dimension 3 : Metier + */ +public class MatrixRepairAndMaintenanceGearCostsPerVessel extends AbstractResultInfo { + + @Override + public String getDescription() { + return "do the doc of Result MatrixRepairAndMaintenanceGearCostsPerVessel"; + } +} Property changes on: branches/4.4.0-resultnames/resultinfos/MatrixRepairAndMaintenanceGearCostsPerVessel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/4.4.0-resultnames/resultinfos/MatrixSharedNotFixedCostsPerVessel.java =================================================================== --- branches/4.4.0-resultnames/resultinfos/MatrixSharedNotFixedCostsPerVessel.java (rev 0) +++ branches/4.4.0-resultnames/resultinfos/MatrixSharedNotFixedCostsPerVessel.java 2015-06-16 15:28:42 UTC (rev 359) @@ -0,0 +1,38 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2015 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ +package resultinfos; + +import fr.ifremer.isisfish.result.AbstractResultInfo; + +/** + * Matrix with three dimensions + * Dimension 1 : TimeStep + * Dimension 2 : Strategy + * Dimension 3 : Metier + */ +public class MatrixSharedNotFixedCostsPerVessel extends AbstractResultInfo { + + @Override + public String getDescription() { + return "do the doc of Result MatrixSharedNotFixedCostsPerVessel"; + } +} Property changes on: branches/4.4.0-resultnames/resultinfos/MatrixSharedNotFixedCostsPerVessel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/4.4.0-resultnames/resultinfos/MatrixTotalFishingMortality.java =================================================================== --- branches/4.4.0-resultnames/resultinfos/MatrixTotalFishingMortality.java (rev 0) +++ branches/4.4.0-resultnames/resultinfos/MatrixTotalFishingMortality.java 2015-06-16 15:28:42 UTC (rev 359) @@ -0,0 +1,36 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2015 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ +package resultinfos; + +import fr.ifremer.isisfish.result.AbstractResultInfo; + +/** + * Matrix with 1 dimension + * Dimension 1 : TimeStep + */ +public class MatrixTotalFishingMortality extends AbstractResultInfo { + + @Override + public String getDescription() { + return "do the doc of Result MatrixTotalFishingMortality"; + } +} Property changes on: branches/4.4.0-resultnames/resultinfos/MatrixTotalFishingMortality.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/4.4.0-resultnames/resultinfos/MatrixVesselMarginOverVariableCostsPerStrategy.java =================================================================== --- branches/4.4.0-resultnames/resultinfos/MatrixVesselMarginOverVariableCostsPerStrategy.java (rev 0) +++ branches/4.4.0-resultnames/resultinfos/MatrixVesselMarginOverVariableCostsPerStrategy.java 2015-06-16 15:28:42 UTC (rev 359) @@ -0,0 +1,37 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2015 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ +package resultinfos; + +import fr.ifremer.isisfish.result.AbstractResultInfo; + +/** + * Matrix with two dimensions + * Dimension 1 : TimeStep + * Dimension 2 : Strategy + */ +public class MatrixVesselMarginOverVariableCostsPerStrategy extends AbstractResultInfo { + + @Override + public String getDescription() { + return "do the doc of Result MatrixVesselMarginOverVariableCostsPerStrategy"; + } +} Property changes on: branches/4.4.0-resultnames/resultinfos/MatrixVesselMarginOverVariableCostsPerStrategy.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/4.4.0-resultnames/resultinfos/MatrixVesselMarginOverVariableCostsPerStrategyMetPerVessel.java =================================================================== --- branches/4.4.0-resultnames/resultinfos/MatrixVesselMarginOverVariableCostsPerStrategyMetPerVessel.java (rev 0) +++ branches/4.4.0-resultnames/resultinfos/MatrixVesselMarginOverVariableCostsPerStrategyMetPerVessel.java 2015-06-16 15:28:42 UTC (rev 359) @@ -0,0 +1,38 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2015 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ +package resultinfos; + +import fr.ifremer.isisfish.result.AbstractResultInfo; + +/** + * Matrix with three dimensions + * Dimension 1 : TimeStep + * Dimension 2 : Strategy + * Dimension 3 : Metier + */ +public class MatrixVesselMarginOverVariableCostsPerStrategyMetPerVessel extends AbstractResultInfo { + + @Override + public String getDescription() { + return "do the doc of Result MatrixVesselMarginOverVariableCostsPerStrategyMetPerVessel"; + } +} Property changes on: branches/4.4.0-resultnames/resultinfos/MatrixVesselMarginOverVariableCostsPerStrategyMetPerVessel.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/4.4.0-resultnames/resultinfos/MatrixVesselMarginOverVariableCostsPerStrategyPerVessel.java =================================================================== --- branches/4.4.0-resultnames/resultinfos/MatrixVesselMarginOverVariableCostsPerStrategyPerVessel.java (rev 0) +++ branches/4.4.0-resultnames/resultinfos/MatrixVesselMarginOverVariableCostsPerStrategyPerVessel.java 2015-06-16 15:28:42 UTC (rev 359) @@ -0,0 +1,37 @@ +/* + * #%L + * IsisFish data + * %% + * Copyright (C) 2015 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 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-3.0.html>. + * #L% + */ +package resultinfos; + +import fr.ifremer.isisfish.result.AbstractResultInfo; + +/** + * Matrix with two dimensions + * Dimension 1 : TimeStep + * Dimension 2 : Strategy + */ +public class MatrixVesselMarginOverVariableCostsPerStrategyPerVessel extends AbstractResultInfo { + + @Override + public String getDescription() { + return "do the doc of Result MatrixVesselMarginOverVariableCostsPerStrategyPerVessel"; + } +} Property changes on: branches/4.4.0-resultnames/resultinfos/MatrixVesselMarginOverVariableCostsPerStrategyPerVessel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/4.4.0-resultnames/scripts/ResultName.java =================================================================== --- branches/4.4.0-resultnames/scripts/ResultName.java 2015-06-12 08:44:33 UTC (rev 358) +++ branches/4.4.0-resultnames/scripts/ResultName.java 2015-06-16 15:28:42 UTC (rev 359) @@ -22,10 +22,9 @@ package scripts; -import static org.nuiton.i18n.I18n.n; +import fr.ifremer.isisfish.util.Doc; +import resultinfos.*; -import fr.ifremer.isisfish.util.Doc; // pour pouvoir afficher une aide contextuelle (BUG#1605) - /** * Contient l'ensemble des noms des differents resultats. Le mieux lorsque l'on * veut un nouveau resultat est d'ajouter une constante ici, et de l'utiliser @@ -40,7 +39,11 @@ * afficher l'ensemble des resultats disponible * * @author poussin + * + * @deprecated since 4.4, result has been moved to dedicated classes in "resultname" package. + * This class will remaing to ensure compatibility issue with pre 4.4 users scripts */ +@Deprecated public class ResultName { /** @@ -51,7 +54,7 @@ * Dimension 4 : Zone */ @Doc(value = "do the doc of Result matrixDiscardsWeightPerStrMet") - static final public String MATRIX_DISCARDS_WEIGHT_PER_STR_MET_PER_ZONE_POP = n("matrixDiscardsWeightPerStrMetPerZonePop"); + static final public String MATRIX_DISCARDS_WEIGHT_PER_STR_MET_PER_ZONE_POP = MatrixDiscardsWeightPerStrMetPerZonePop.class.getSimpleName(); /** * Matrix with five dimensions @@ -62,7 +65,7 @@ * Dimension 5 : Zone */ @Doc(value = "do the doc of Result matrixDiscardsPerStrMet") - static final public String MATRIX_DISCARDS_PER_STR_MET_PER_ZONE_POP = n("matrixDiscardsPerStrMetPerZonePop"); + static final public String MATRIX_DISCARDS_PER_STR_MET_PER_ZONE_POP = MatrixDiscardsPerStrMetPerZonePop.class.getSimpleName(); /** * Matrix with five dimensions @@ -73,7 +76,7 @@ * Dimension 5 : Zone */ @Doc(value = "do the doc of Result matrixLandingPerMet") - static final public String MATRIX_LANDING_PER_MET = n("matrixLandingPerMet"); + static final public String MATRIX_LANDING_PER_MET = MatrixLandingPerMet.class.getSimpleName(); /** * Matrix with three dimensions @@ -82,7 +85,7 @@ * Dimension 3 : Metier */ @Doc(value = "do the doc of Result matrixEffortPerStrategyMet") - static final public String MATRIX_EFFORT_PER_STRATEGY_MET = n("matrixEffortPerStrategyMet"); + static final public String MATRIX_EFFORT_PER_STRATEGY_MET = MatrixEffortPerStrategyMet.class.getSimpleName(); /** * Matrix with three dimensions @@ -91,7 +94,7 @@ * Dimension 3 : Metier */ @Doc(value = "do the doc of Result matrixEffortNominalPerStrategyMet") - static final public String MATRIX_EFFORT_NOMINAL_PER_STRATEGY_MET = n("matrixEffortNominalPerStrategyMet"); + static final public String MATRIX_EFFORT_NOMINAL_PER_STRATEGY_MET = MatrixEffortNominalPerStrategyMet.class.getSimpleName(); /** * Matrix with five dimensions @@ -102,7 +105,7 @@ * Dimension 5 : Zone */ @Doc(value = "Disponible uniquement avec les simulations par Zone. do the doc of Result matrixCatchRatePerStrategyMet") - static final public String MATRIX_CATCH_RATE_PER_STRATEGY_MET_PER_ZONE_POP = n("matrixCatchRatePerStrategyMet"); + static final public String MATRIX_CATCH_RATE_PER_STRATEGY_MET_PER_ZONE_POP = MatrixCatchRatePerStrategyMet.class.getSimpleName(); /** * Matrix with five dimensions @@ -116,7 +119,7 @@ * @see simulators.SimulatorEffortByCell */ @Doc(value = "do the doc of Result matrixCatchPerStrategyMetPerZoneMet") - static final public String MATRIX_CATCH_PER_STRATEGY_MET_PER_ZONE_MET = n("matrixCatchPerStrategyMetPerZoneMet"); + static final public String MATRIX_CATCH_PER_STRATEGY_MET_PER_ZONE_MET = MatrixCatchPerStrategyMetPerZoneMet.class.getSimpleName(); /** * Matrix with five dimensions @@ -127,7 +130,7 @@ * Dimension 5 : Zone */ @Doc(value = "do the doc of Result matrixCatchPerStrategyMetPerZonePop") - static final public String MATRIX_CATCH_PER_STRATEGY_MET_PER_ZONE_POP = n("matrixCatchPerStrategyMetPerZonePop"); + static final public String MATRIX_CATCH_PER_STRATEGY_MET_PER_ZONE_POP = MatrixCatchPerStrategyMetPerZonePop.class.getSimpleName(); /** * Matrix with five dimensions @@ -141,7 +144,7 @@ * @see simulators.SimulatorEffortByCell */ @Doc(value = "do the doc of Result matrixCatchWeightPerStrategyMetPerZoneMet") - static final public String MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_MET = n("matrixCatchWeightPerStrategyMetPerZoneMet"); + static final public String MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_MET = MatrixCatchWeightPerStrategyMetPerZoneMet.class.getSimpleName(); /** * Matrix with five dimensions @@ -152,7 +155,7 @@ * Dimension 5 : Zone */ @Doc(value = "do the doc of Result matrixCatchWeightPerStrategyMetPerZonePop") - static final public String MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP = n("matrixCatchWeightPerStrategyMetPerZonePop"); + static final public String MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP = MatrixCatchWeightPerStrategyMetPerZonePop.class.getSimpleName(); /** * Matrix with five dimensions @@ -163,14 +166,14 @@ * Dimension 5 : Zone */ @Doc(value = "Disponible uniquement avec les simulations par Zone. do the doc of Result matrixFishingMortality") - static final public String MATRIX_FISHING_MORTALITY = n("matrixFishingMortality"); + static final public String MATRIX_FISHING_MORTALITY = MatrixFishingMortality.class.getSimpleName(); /** * Matrix with 1 dimension * Dimension 1 : TimeStep */ @Doc(value = "do the doc of Result matrixTotalFishingMortality") - static final public String MATRIX_TOTAL_FISHING_MORTALITY = n("matrixTotalFishingMortality"); + static final public String MATRIX_TOTAL_FISHING_MORTALITY = MatrixTotalFishingMortality.class.getSimpleName(); /** * Matrix with 2 dimensions @@ -178,7 +181,7 @@ * Dimension 2 : Group */ @Doc(value = "do the doc of Result matrixFishingMortalityPerGroup") - static final public String MATRIX_FISHING_MORTALITY_PER_GROUP = n("matrixFishingMortalityPerGroup"); + static final public String MATRIX_FISHING_MORTALITY_PER_GROUP = MatrixFishingMortalityPerGroup.class.getSimpleName(); /** * Matrix with three dimensions @@ -187,7 +190,7 @@ * Dimension 3 : Zone (semantics : Dimension 2) */ @Doc(value = "do the doc of Result matrixAbundance") - static final public String MATRIX_ABUNDANCE = n("matrixAbundance"); + static final public String MATRIX_ABUNDANCE = MatrixAbundance.class.getSimpleName(); /** * Matrix with two dimensions @@ -195,14 +198,14 @@ * Dimension 2 : Zone (semantics : Dimension 1) */ @Doc(value = "do the doc of Result matrixLbar") - static final public String MATRIX_LBAR = n("matrixLbar"); + static final public String MATRIX_LBAR = MatrixLbar.class.getSimpleName(); /** * Matrix with one dimension * Dimension 1 : TimeStep */ @Doc(value = "do the doc of Result matrixRecruitment") - static final public String MATRIX_RECRUITMENT = n("matrixRecruitment"); + static final public String MATRIX_RECRUITMENT = MatrixRecruitment.class.getSimpleName(); /** * Matrix with three dimensions @@ -211,7 +214,7 @@ * Dimension 3 : Zone */ @Doc(value = "do the doc of Result matrixAbundanceBeginMonth") - static final public String MATRIX_ABUNDANCE_BEGIN_MONTH = n("matrixAbundanceBeginMonth"); + static final public String MATRIX_ABUNDANCE_BEGIN_MONTH = MatrixAbundanceBeginMonth.class.getSimpleName(); /** * Matrix with three dimensions @@ -220,7 +223,7 @@ * Dimension 3 : Zone */ @Doc(value = "do the doc of Result matrixBiomass") - static final public String MATRIX_BIOMASS = n("matrixBiomass"); + static final public String MATRIX_BIOMASS = MatrixBiomass.class.getSimpleName(); /** * Matrix with three dimensions @@ -229,7 +232,7 @@ * Dimension 3 : Zone */ @Doc(value = "do the doc of Result matrixBiomassBeginMonth") - static final public String MATRIX_BIOMASS_BEGIN_MONTH = n("matrixBiomassBeginMonth"); + static final public String MATRIX_BIOMASS_BEGIN_MONTH = MatrixBiomassBeginMonth.class.getSimpleName(); /** * Matrix with three dimensions @@ -238,7 +241,7 @@ * Dimension 3 : Metier */ @Doc(value = "do the doc of Result matrixFishingTimePerMonthPerVessel") - static final public String MATRIX_FISHING_TIME_PER_MONTH_PER_VESSEL = n("matrixFishingTimePerMonthPerVessel"); + static final public String MATRIX_FISHING_TIME_PER_MONTH_PER_VESSEL = MatrixFishingTimePerMonthPerVessel.class.getSimpleName(); /** * Matrix with three dimensions @@ -247,7 +250,7 @@ * Dimension 3 : Metier */ @Doc(value = "do the doc of Result matrixFuelCostsOfTravelPerVessel") - static final public String MATRIX_FUEL_COSTS_OF_TRAVEL_PER_VESSEL = n("matrixFuelCostsOfTravelPerVessel"); + static final public String MATRIX_FUEL_COSTS_OF_TRAVEL_PER_VESSEL = MatrixFuelCostsOfTravelPerVessel.class.getSimpleName(); /** * Matrix with three dimensions @@ -256,7 +259,7 @@ * Dimension 3 : Metier */ @Doc(value = "do the doc of Result matrixCostsOfFishingPerVessel") - static final public String MATRIX_COSTS_OF_FISHING_PER_VESSEL = n("matrixCostsOfFishingPerVessel"); + static final public String MATRIX_COSTS_OF_FISHING_PER_VESSEL = MatrixCostsOfFishingPerVessel.class.getSimpleName(); /** * Matrix with three dimensions @@ -265,7 +268,7 @@ * Dimension 3 : Metier */ @Doc(value = "do the doc of Result matrixFuelCostsPerVessel") - static final public String MATRIX_FUEL_COSTS_PER_VESSEL = n("matrixFuelCostsPerVessel"); + static final public String MATRIX_FUEL_COSTS_PER_VESSEL = MatrixFuelCostsPerVessel.class.getSimpleName(); /** * Matrix with three dimensions @@ -274,7 +277,7 @@ * Dimension 3 : Metier */ @Doc(value = "do the doc of Result matrixRepairAndMaintenanceGearCostsPerVessel") - static final public String MATRIX_REPAIR_AND_MAINTENANCE_GEAR_COSTS_PER_VESSEL = n("matrixRepairAndMaintenanceGearCostsPerVessel"); + static final public String MATRIX_REPAIR_AND_MAINTENANCE_GEAR_COSTS_PER_VESSEL = MatrixRepairAndMaintenanceGearCostsPerVessel.class.getSimpleName(); /** * Matrix with three dimensions @@ -283,7 +286,7 @@ * Dimension 3 : Metier */ @Doc(value = "do the doc of Result matrixOtherRunningCostsPerVessel") - static final public String MATRIX_OTHER_RUNNING_COSTS_PER_VESSEL = n("matrixOtherRunningCostsPerVessel"); + static final public String MATRIX_OTHER_RUNNING_COSTS_PER_VESSEL = MatrixOtherRunningCostsPerVessel.class.getSimpleName(); /** * Matrix with three dimensions @@ -292,7 +295,7 @@ * Dimension 3 : Metier */ @Doc(value = "do the doc of Result matrixSharedNotFixedCostsPerVessel") - static final public String MATRIX_SHARED_NOT_FIXED_COSTS_PER_VESSEL = n("matrixSharedNotFixedCostsPerVessel"); + static final public String MATRIX_SHARED_NOT_FIXED_COSTS_PER_VESSEL = MatrixSharedNotFixedCostsPerVessel.class.getSimpleName(); /** * Matrix with four dimensions @@ -302,7 +305,7 @@ * Dimension 4 : Population */ @Doc(value = "do the doc of Result matrixGrossValueOfLandingsPerSpeciesPerStrategyMet") - static final public String MATRIX_GROSS_VALUE_OF_LANDINGS_PER_SPECIES_PER_STRATEGY_MET = n("matrixGrossValueOfLandingsPerSpeciesPerStrategyMet"); + static final public String MATRIX_GROSS_VALUE_OF_LANDINGS_PER_SPECIES_PER_STRATEGY_MET = MatrixGrossValueOfLandingsPerSpeciesPerStrategyMet.class.getSimpleName(); /** * Matrix with three dimensions @@ -311,7 +314,7 @@ * Dimension 3 : Metier */ @Doc(value = "do the doc of Result matrixGrossValueOfLandingsPerStrategyMet") - static final public String MATRIX_GROSS_VALUE_OF_LANDINGS_PER_STRATEGY_MET = n("matrixGrossValueOfLandingsPerStrategyMet"); + static final public String MATRIX_GROSS_VALUE_OF_LANDINGS_PER_STRATEGY_MET = MatrixGrossValueOfLandingsPerStrategyMet.class.getSimpleName(); /** * Matrix with three dimensions @@ -322,7 +325,7 @@ * Matrix calculated in the non generic Rule : GraviteVPUE1LangEtGrossValueOtherSpeciesECOMOD */ @Doc(value = "do the doc of Result matrixGrossValueOfLandingsOtherSpeciesPerStrategyMet") - static final public String MATRIX_GROSS_VALUE_OF_LANDINGS_OTHER_SPECIES_PER_STRATEGY_MET = n("matrixGrossValueOfLandingsOtherSpeciesPerStrategyMet"); + static final public String MATRIX_GROSS_VALUE_OF_LANDINGS_OTHER_SPECIES_PER_STRATEGY_MET = MatrixGrossValueOfLandingsOtherSpeciesPerStrategyMet.class.getSimpleName(); /** * Matrix with three dimensions @@ -331,7 +334,7 @@ * Dimension 3 : Metier */ @Doc(value = "do the doc of Result matrixGrossValueOfLandingsPerStrategyMetPerVessel") - static final public String MATRIX_GROSS_VALUE_OF_LANDINGS_PER_STRATEGY_MET_PER_VESSEL = n("matrixGrossValueOfLandingsPerStrategyMetPerVessel"); + static final public String MATRIX_GROSS_VALUE_OF_LANDINGS_PER_STRATEGY_MET_PER_VESSEL = MatrixGrossValueOfLandingsPerStrategyMetPerVessel.class.getSimpleName(); /** * Matrix with three dimensions @@ -340,7 +343,7 @@ * Dimension 3 : Metier */ @Doc(value = "do the doc of Result matrixNetValueOfLandingsPerStrategyMet") - static final public String MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET = n("matrixNetValueOfLandingsPerStrategyMet"); + static final public String MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET = MatrixNetValueOfLandingsPerStrategyMet.class.getSimpleName(); /** * Matrix with three dimensions @@ -349,7 +352,7 @@ * Dimension 3 : Metier */ @Doc(value = "do the doc of Result matrixNetValueOfLandingsPerStrategyMetPerVessel") - static final public String MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET_PER_VESSEL = n("matrixNetValueOfLandingsPerStrategyMetPerVessel"); + static final public String MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET_PER_VESSEL = MatrixNetValueOfLandingsPerStrategyMetPerVessel.class.getSimpleName(); /** * Matrix with three dimensions @@ -358,7 +361,7 @@ * Dimension 3 : Metier */ @Doc(value = "do the doc of Result matrixNetRenevueToSharePerStrategyMetPerVessel") - static final public String MATRIX_NET_RENEVUE_TO_SHARE_PER_STRATEGY_MET_PER_VESSEL = n("matrixNetRenevueToSharePerStrategyMetPerVessel"); + static final public String MATRIX_NET_RENEVUE_TO_SHARE_PER_STRATEGY_MET_PER_VESSEL = MatrixNetRenevueToSharePerStrategyMetPerVessel.class.getSimpleName(); /** * Matrix with three dimensions @@ -367,7 +370,7 @@ * Dimension 3 : Metier */ @Doc(value = "do the doc of Result matrixCrewSharePerStrategyPerVessel") - static final public String MATRIX_CREW_SHARE_PER_STRATEGY_MET_PER_VESSEL = n("matrixCrewSharePerStrategyPerVessel"); + static final public String MATRIX_CREW_SHARE_PER_STRATEGY_MET_PER_VESSEL = MatrixCrewSharePerStrategyPerVessel.class.getSimpleName(); /** * Matrix with three dimensions @@ -376,7 +379,7 @@ * Dimension 3 : Metier */ @Doc(value = "do the doc of Result matrixOwnerMarginOverVariableCostsPerStrategyMetPerVessel") - static final public String MATRIX_OWNER_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY_MET_PER_VESSEL = n("matrixOwnerMarginOverVariableCostsPerStrategyMetPerVessel"); + static final public String MATRIX_OWNER_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY_MET_PER_VESSEL = MatrixOwnerMarginOverVariableCostsPerStrategyMetPerVessel.class.getSimpleName(); /** * Matrix with three dimensions @@ -385,7 +388,7 @@ * Dimension 3 : Metier */ @Doc(value = "do the doc of Result matrixVesselMarginOverVariableCostsPerStrategyMetPerVessel") - static final public String MATRIX_VESSEL_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY_MET_PER_VESSEL = n("matrixVesselMarginOverVariableCostsPerStrategyMetPerVessel"); + static final public String MATRIX_VESSEL_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY_MET_PER_VESSEL = MatrixVesselMarginOverVariableCostsPerStrategyMetPerVessel.class.getSimpleName(); /** * Matrix with three dimensions @@ -394,7 +397,7 @@ * Dimension 3 : Metier */ @Doc(value = "do the doc of Result matrixOwnerMarginOverVariableCostsPerStrategyPerVessel") - static final public String MATRIX_OWNER_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY_PER_VESSEL = n("matrixOwnerMarginOverVariableCostsPerStrategyPerVessel"); + static final public String MATRIX_OWNER_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY_PER_VESSEL = MatrixOwnerMarginOverVariableCostsPerStrategyPerVessel.class.getSimpleName(); /** * Matrix with two dimensions @@ -402,7 +405,7 @@ * Dimension 2 : Strategy */ @Doc(value = "do the doc of Result matrixOwnerMarginOverVariableCostsPerStrategy") - static final public String MATRIX_OWNER_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY = n("matrixOwnerMarginOverVariableCostsPerStrategy"); + static final public String MATRIX_OWNER_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY = MatrixOwnerMarginOverVariableCostsPerStrategy.class.getSimpleName(); /** * Matrix with two dimensions @@ -410,7 +413,7 @@ * Dimension 2 : Strategy */ @Doc(value = "do the doc of Result matrixVesselMarginOverVariableCostsPerStrategyPerVessel") - static final public String MATRIX_VESSEL_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY_PER_VESSEL = n("matrixVesselMarginOverVariableCostsPerStrategyPerVessel"); + static final public String MATRIX_VESSEL_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY_PER_VESSEL = MatrixVesselMarginOverVariableCostsPerStrategyPerVessel.class.getSimpleName(); /** * Matrix with two dimensions @@ -418,7 +421,7 @@ * Dimension 2 : Strategy */ @Doc(value = "do the doc of Result matrixVesselMarginOverVariableCostsPerStrategy") - static final public String MATRIX_VESSEL_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY = n("matrixVesselMarginOverVariableCostsPerStrategy"); + static final public String MATRIX_VESSEL_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY = MatrixVesselMarginOverVariableCostsPerStrategy.class.getSimpleName(); /** * Matrix with three dimensions @@ -427,7 +430,7 @@ * Dimension 3 : Metier */ @Doc(value = "do the doc of Result matrixNoActivity") - static final public String MATRIX_NO_ACTIVITY = n("matrixNoActivity"); + static final public String MATRIX_NO_ACTIVITY = MatrixNoActivity.class.getSimpleName(); /** * Matrix with three dimensions @@ -436,7 +439,7 @@ * Dimension 3 : Zone */ @Doc(value = "do the doc of Result matrixMetierZone") - static final public String MATRIX_METIER_ZONE = n("matrixMetierZone"); + static final public String MATRIX_METIER_ZONE = MatrixMetierZone.class.getSimpleName(); /** * Matrix with two dimensions @@ -444,5 +447,5 @@ * Dimension 2 : Group */ @Doc(value = "do the doc of Result matrixPrice") - static final public String MATRIX_PRICE = n("matrixPrice"); + static final public String MATRIX_PRICE = MatrixPrice.class.getSimpleName(); }