Author: tchemit Date: 2012-03-28 18:06:23 +0200 (Wed, 28 Mar 2012) New Revision: 426 Url: http://forge.codelutin.com/repositories/revision/echobase/426 Log: update referentiels Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/CellTypeLoaderIT.java trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/DataMetadataLoaderIT.java trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/DataTypeLoaderIT.java trunk/echobase-tools/src/test/resources/csv/new/input-DataMetadata.csv trunk/echobase-tools/src/test/resources/csv/new/input-DataType.csv Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/CellTypeLoaderIT.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/CellTypeLoaderIT.java 2012-03-28 12:18:31 UTC (rev 425) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/CellTypeLoaderIT.java 2012-03-28 16:06:23 UTC (rev 426) @@ -35,7 +35,7 @@ public class CellTypeLoaderIT extends AbstractLoaderIT<CellType, CellTypeLoader> { public CellTypeLoaderIT() { - super(CellTypeLoader.class, 7, 0); + super(CellTypeLoader.class, 8, 0); } @Test Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/DataMetadataLoaderIT.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/DataMetadataLoaderIT.java 2012-03-28 12:18:31 UTC (rev 425) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/DataMetadataLoaderIT.java 2012-03-28 16:06:23 UTC (rev 426) @@ -35,7 +35,7 @@ public class DataMetadataLoaderIT extends AbstractLoaderIT<DataMetadata, DataMetadataLoader> { public DataMetadataLoaderIT() { - super(DataMetadataLoader.class, 41, 28); + super(DataMetadataLoader.class, 58, 28); } @Test Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/DataTypeLoaderIT.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/DataTypeLoaderIT.java 2012-03-28 12:18:31 UTC (rev 425) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/DataTypeLoaderIT.java 2012-03-28 16:06:23 UTC (rev 426) @@ -35,7 +35,7 @@ public class DataTypeLoaderIT extends AbstractLoaderIT<DataType, DataTypeLoader> { public DataTypeLoaderIT() { - super(DataTypeLoader.class, 17, 0); + super(DataTypeLoader.class, 21, 0); } @Test Modified: trunk/echobase-tools/src/test/resources/csv/new/input-DataMetadata.csv =================================================================== --- trunk/echobase-tools/src/test/resources/csv/new/input-DataMetadata.csv 2012-03-28 12:18:31 UTC (rev 425) +++ trunk/echobase-tools/src/test/resources/csv/new/input-DataMetadata.csv 2012-03-28 16:06:23 UTC (rev 426) @@ -40,3 +40,20 @@ "SigmaSp";;"Species mean backscattering cross-section";;"m²";;;;;0;999999999;1;0;999999;; "pondBiomass";;"Biomass estimate (in weight) extrapolated to the inter-transect width";;"tons";;;;;0;999999999;1;0;9999999;; "pondAbundance";;"Abundance estimate (in number of fish) extrapolated to the inter-transect width";;"no. of fish";;;;;0;999999999;1;0;9999999999;; +"VarianceXe";;"XeRegionVariance";;;;;;;0;999999999;1;0;999999;;"Variance of acoustic scaling factors in (region) cells" +"VarianceNASC";;"ArealNASCVariance";;;;;;;0;999999999;1;0;999999;;"Variance of acoustic densities in (region) cells" +"MeanNASC";;"ArealNASCMean";;"m²/nmi²";;;;;0;999999999;1;0;999999;;"Average of acoustic densities in (region) cells" +"NASCWeightedMeanXe";;"ArealNASCWeightedMeanXe";;;;;;;0;999999999;1;0;999999;;"Average of acoustic scaling factors in area, weighted by fish NASC per echotype around hauls" +"Nesdu";;"NesduInArea";;;;;;;1;999;1;0;999999;;"Number of acoustic esdus in area" +"Nhauls";;"NhaulsInArea";;;;;;;1;999;1;0;999999;;"Number of trawl hauls in area" +"MeanNASCWeightedBiomassDensity";;"MeanWeightedBiomassDensity";;"t/nmi²";;;;;0;999999999;1;0;999999;;"Mean Weighted Biomass Density in area, weighted by fish NASC per echotype around hauls" +"NASCWeightedEstimationVariance";;"NASCWeightedEstimationVariance in area";;;;;;;0;999999999;1;0;999999;;"Fish biomass density estimation variance, weighted by fish NASC per echotype around hauls" +"NASCWeightedEstimationCV";;"NASCWeightedEstimationCV in area";;"%";;;;;0;1;1;0;1;;"Fish biomass density estimation error, weighted by fish NASC per echotype around hauls" +"MeanBiomassDensity";;"MeanBiomassDensity";;"tons/nmi²";;;;;0;999999999;1;0;999999;;"Mean Biomass Density in area" +"EstimationVariance";;"EstimationVariance in area";;;;;;;0;999999999;1;0;999999;;"Fish biomass density estimation variance" +"EstimationCV";;"EstimationCV in area";;"%";;;;;0;1;1;0;1;;"Fish biomass density estimation error" +"TotalEstimationVariance";;"TotalEstimationVariance";;;;;;;0;999999999;1;0;999999;;"Fish biomass density total estimation variance, in the whole sample area" +"TotalNASCWeightedEstimationVariance";;"TotalNASCWeightedEstimationVariance";;;;;;;0;999999999;1;0;999999;;"Fish biomass density total estimation variance, in the whole sample area, weighted by fish NASC per echotype around hauls" +"ProportionOfTotalEstimationVariance";;"ProportionOfTotalEstimationVariance in area";;"%";;;;;0;1;1;0;1;;"Proportion in an area of the fish biomass density total estimation variance" +"ProportionOfNASCWeightedTotalEstimationVariance";;"ProportionOfNASCWeightedTotalEstimationVariance";;"%";;;;;0;1;1;0;1;;"Proportion in an area of the fish biomass density total estimation variance, weighted by fish NASC per echotype around hauls" +"NASCWeightedBiomass";;"NASCWeighted fish Biomass in area";;"tons";;;;;0;999999999;1;0;999999;;"Fish biomass in area, weighted by fish NASC per echotype around hauls" Modified: trunk/echobase-tools/src/test/resources/csv/new/input-DataType.csv =================================================================== --- trunk/echobase-tools/src/test/resources/csv/new/input-DataType.csv 2012-03-28 12:18:31 UTC (rev 425) +++ trunk/echobase-tools/src/test/resources/csv/new/input-DataType.csv 2012-03-28 16:06:23 UTC (rev 426) @@ -15,4 +15,8 @@ Formula;String; MeanXe;Double; EsduFlag;String; -NumberOfSamples;Integer; \ No newline at end of file +NumberOfSamples;Integer; +EstimationVariance;Double; +Density;Double; +NumberOfEsdus;Integer; +NumberOfHauls;Integer;