diff --git a/data/input/atlanticarea/obsRealAA.xml b/data/input/atlanticarea/obsRealAA.xml index 15b79d1e4b8555a79c47ff62c9fe2aade4c87418..7d48a8fd17f42f8a70c82bfdcc58640cd56174c2 100644 --- a/data/input/atlanticarea/obsRealAA.xml +++ b/data/input/atlanticarea/obsRealAA.xml @@ -61,12 +61,12 @@ </yAxisLabel> <variableName>getFemaleSpawnerEffective</variableName> </fr.cemagref.observation.observers.jfreechart.TemporalSerieChart> - <miscellaneous.TemporalRangeSerieChart> + <observer.TemporalRangeSerieChart> <title>Range distribution</title> <xAxisLabel>Time (season)</xAxisLabel> <yAxisLabel>latitude</yAxisLabel> <variableName>getRangeDistributionWithLat</variableName> - </miscellaneous.TemporalRangeSerieChart> + </observer.TemporalRangeSerieChart> <fr.cemagref.observation.observers.jfreechart.TemporalSerieChart> <graphType>LINE</graphType> <title>Mean age at first reproduction for female</title> @@ -122,7 +122,7 @@ <java-class>environment.RiverBasin</java-class> <fr.cemagref.observation.kernel.ObservablesHandler> <observers> - <miscellaneous.TemporalSerieChartForBasin> + <observer.TemporalSerieChartForBasin> <graphType>LINE</graphType> <title>Number of juveniles</title> <xAxisLabel>Time @@ -130,14 +130,14 @@ </xAxisLabel> <yAxisLabel>number of juveniles</yAxisLabel> <variableName>getJuvenileNumber</variableName> - </miscellaneous.TemporalSerieChartForBasin> - <miscellaneous.TemporalSerieChartForBasin> + </observer.TemporalSerieChartForBasin> + <observer.TemporalSerieChartForBasin> <graphType>LINE</graphType> <title>% Autochtone</title> <xAxisLabel>Time (season)</xAxisLabel> <yAxisLabel>% Autochtone</yAxisLabel> <variableName>getLastPercentageOfAutochtone</variableName> - </miscellaneous.TemporalSerieChartForBasin> + </observer.TemporalSerieChartForBasin> </observers> </fr.cemagref.observation.kernel.ObservablesHandler> </entry> diff --git a/data/input/northeastamerica/RIO_obs_NEA.xml b/data/input/northeastamerica/RIO_obs_NEA.xml index 8e241cba58bc342a3735662fc9edc2cfc573b412..8f9e49df048a13acbfb5b651087d5e828b063d6b 100644 --- a/data/input/northeastamerica/RIO_obs_NEA.xml +++ b/data/input/northeastamerica/RIO_obs_NEA.xml @@ -66,12 +66,12 @@ </yAxisLabel> <variableName>getFemaleSpawnerEffective</variableName> </fr.cemagref.observation.observers.jfreechart.TemporalSerieChart> - <miscellaneous.TemporalRangeSerieChart> + <observer.TemporalRangeSerieChart> <title>Range distribution</title> <xAxisLabel>Time (season)</xAxisLabel> <yAxisLabel>latitude</yAxisLabel> <variableName>getRangeDistributionWithLat</variableName> - </miscellaneous.TemporalRangeSerieChart> + </observer.TemporalRangeSerieChart> <fr.cemagref.observation.observers.jfreechart.TemporalSerieChart> <graphType>LINE</graphType> <title>Mean age at first reproduction for female</title> @@ -127,7 +127,7 @@ <java-class>environment.RiverBasin</java-class> <fr.cemagref.observation.kernel.ObservablesHandler> <observers> - <miscellaneous.TemporalSerieChartForBasin> + <observer.TemporalSerieChartForBasin> <graphType>LINE</graphType> <title>Number of juveniles</title> <xAxisLabel>Time @@ -135,14 +135,14 @@ </xAxisLabel> <yAxisLabel>number of juveniles</yAxisLabel> <variableName>getJuvenileNumber</variableName> - </miscellaneous.TemporalSerieChartForBasin> - <miscellaneous.TemporalSerieChartForBasin> + </observer.TemporalSerieChartForBasin> + <observer.TemporalSerieChartForBasin> <graphType>LINE</graphType> <title>% Autochtone</title> <xAxisLabel>Time (season)</xAxisLabel> <yAxisLabel>% Autochtone</yAxisLabel> <variableName>getLastPercentageOfAutochtone</variableName> - </miscellaneous.TemporalSerieChartForBasin> + </observer.TemporalSerieChartForBasin> </observers> </fr.cemagref.observation.kernel.ObservablesHandler> </entry>