Author: chatellier Date: 2010-01-20 12:12:12 +0000 (Wed, 20 Jan 2010) New Revision: 2924 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java isis-fish/trunk/src/main/resources/sensitivity.properties Log: TargetSpecies.targetFactorEquation is now an enabled factor. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java 2010-01-20 11:24:52 UTC (rev 2923) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java 2010-01-20 12:12:12 UTC (rev 2924) @@ -35,6 +35,7 @@ import fr.ifremer.isisfish.entities.PopulationSeasonInfo; import fr.ifremer.isisfish.entities.Selectivity; import fr.ifremer.isisfish.entities.StrategyMonthInfo; +import fr.ifremer.isisfish.entities.TargetSpecies; import fr.ifremer.isisfish.mexico.MexicoHelper; import fr.ifremer.isisfish.types.RangeOfValues; import fr.ifremer.isisfish.types.TimeUnit; @@ -221,13 +222,21 @@ exportFactorName = factorClass + "." + newEntity.getStrategy().getName() + "."; exportFactorName += newEntity.getMonth() + "." + propertyName; } - // example : Selectivity.Senne.Anchois_long + // example : Selectivity.Senne.Anchois_long.equation else if (entity instanceof Selectivity) { // association class with no name attribute Selectivity newEntity = (Selectivity)entity; exportFactorName = factorClass + "." + newEntity.getGear().getName(); - exportFactorName += "." + newEntity.getPopulation().getName(); + exportFactorName += "." + newEntity.getPopulation().getName() + "." + propertyName; } + // example : TargetSpecies.Anchois_long.janvier-decembre. + else if (entity instanceof TargetSpecies) { + // association class with no name attribute + TargetSpecies newEntity = (TargetSpecies)entity; + exportFactorName = factorClass + "." + newEntity.getSpecies().getName() + "."; + exportFactorName += newEntity.getMetierSeasonInfo().getFirstMonth() + "." + newEntity.getMetierSeasonInfo().getLastMonth(); + exportFactorName += "." + propertyName + "." + RandomStringUtils.randomAlphanumeric(8); + } } return exportFactorName; Modified: isis-fish/trunk/src/main/resources/sensitivity.properties =================================================================== --- isis-fish/trunk/src/main/resources/sensitivity.properties 2010-01-20 11:24:52 UTC (rev 2923) +++ isis-fish/trunk/src/main/resources/sensitivity.properties 2010-01-20 12:12:12 UTC (rev 2924) @@ -35,6 +35,7 @@ StrategyMonthInfo.minInactivityDays StrategyMonthInfo.proportionMetier Strategy.proportionSetOfVessels +TargetSpecies.targetFactorEquation TripType.minTimeBetweenTrip TripType.tripDuration VesselType.activityRange