Author: chatellier Date: 2009-06-12 08:27:01 +0000 (Fri, 12 Jun 2009) New Revision: 147 Modified: trunk/pom.xml trunk/sensitivity/SensitivityCalculatorJavaExpandGrid.java trunk/sensitivity/SensitivityCalculatorRFast.java trunk/sensitivity/SensitivityCalculatorRFrF2.java trunk/sensitivity/SensitivityCalculatorRMorris.java trunk/sensitivity/SensitivityCalculatorROptimumLHS.java trunk/sensitivity/SensitivityCalculatorRRandomLHS.java trunk/sensitivity/SensitivityCalculatorRSobol.java trunk/sensitivity/SensitivityCalculatorRegularFractions.java Log: Passage des datas sur la derniere version d'isis. Simplification du pom. Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-06-12 08:14:51 UTC (rev 146) +++ trunk/pom.xml 2009-06-12 08:27:01 UTC (rev 147) @@ -1,17 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <!--The version of maven's project object model--> <modelVersion>4.0.0</modelVersion> - <!-- parent project - <parent> - <groupId>org.codelutin</groupId> - <artifactId>lutinproject</artifactId> - <version>3.1</version> - </parent> - --> - <!--A unique name for this project--> <artifactId>isis-fish-data</artifactId> <name>IsisFish data</name> @@ -27,34 +20,27 @@ <description>Data for Isis-fish</description> <inceptionYear>2000</inceptionYear> - <!--Tracking--> - <issueManagement> - <url>http://labs.libre-entreprise.org/tracker/?group_id=8</url> - </issueManagement> + <properties> + <maven.test.skip>true</maven.test.skip> + <maven.compiler.source>1.6</maven.compiler.source> + <maven.compiler.target>1.6</maven.compiler.target> + </properties> <build> <sourceDirectory>${basedir}</sourceDirectory> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.6</source> - <target>1.6</target> - <excludes> - <exclude>**/simulations/**</exclude> - </excludes> - </configuration> - </plugin> - </plugins> </build> + <!--Tracking--> + <issueManagement> + <url>http://labs.libre-entreprise.org/tracker/?group_id=132</url> + </issueManagement> + <!--Librairies--> <dependencies> <dependency> <groupId>ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>3.2.0.4-rc4-SNAPSHOT</version> + <version>3.2.0.5-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies> @@ -66,40 +52,17 @@ </site> </distributionManagement> - <!--Definition of profiles--> - <profiles> - <profile> - <id>codelutin-repository</id> + <repositories> + <repository> + <id>codelutin-lib</id> + <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> + </repository> + </repositories> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - - <properties> - <maven.src.dir>${basedir}/src</maven.src.dir> - <maven.test.skip>true</maven.test.skip> - <maven.compile.source>1.5</maven.compile.source> - <maven.compile.target>1.5</maven.compile.target> - </properties> - - <repositories> - <repository> - <id>codelutin-lib</id> - <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> - </repository> - </repositories> - - <pluginRepositories> - <pluginRepository> - <id>codelutin-plugin</id> - <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> - </pluginRepository> - </pluginRepositories> - </profile> - </profiles> - - <!--List of profiles that are active for all builds.--> - <!--activeProfiles> - <activeProfile>codelutin-repository</activeProfile> - </activeProfiles--> + <pluginRepositories> + <pluginRepository> + <id>codelutin-plugin</id> + <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> + </pluginRepository> + </pluginRepositories> </project> Modified: trunk/sensitivity/SensitivityCalculatorJavaExpandGrid.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorJavaExpandGrid.java 2009-06-12 08:14:51 UTC (rev 146) +++ trunk/sensitivity/SensitivityCalculatorJavaExpandGrid.java 2009-06-12 08:27:01 UTC (rev 147) @@ -73,7 +73,7 @@ int k = 1; //number of sensitivity scenarios (initialization) int factorNumber = plan.getFactors().size(); //number of factors - List<Factor> factors = plan.getFactors(); //list of factors + List<Factor<?, ?>> factors = plan.getFactors(); //list of factors for (int i = 0; i < factorNumber; i++) { if (factors.get(i).getDomain() instanceof ContinuousDomain) { Modified: trunk/sensitivity/SensitivityCalculatorRFast.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorRFast.java 2009-06-12 08:14:51 UTC (rev 146) +++ trunk/sensitivity/SensitivityCalculatorRFast.java 2009-06-12 08:27:01 UTC (rev 147) @@ -96,7 +96,7 @@ double[] dataframe = new double[0]; int nbExperiments = 0; int factorNumber = plan.getFactors().size(); - List<Factor> factors = plan.getFactors(); + List<Factor<?, ?>> factors = plan.getFactors(); SensitivityScenarios thisExperiment = new SensitivityScenarios(); List<Scenario> thisExperimentScenarios = thisExperiment.getScenarios(); Modified: trunk/sensitivity/SensitivityCalculatorRFrF2.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorRFrF2.java 2009-06-12 08:14:51 UTC (rev 146) +++ trunk/sensitivity/SensitivityCalculatorRFrF2.java 2009-06-12 08:27:01 UTC (rev 147) @@ -77,7 +77,7 @@ double[] dataframe = new double[0]; int nbExperiments = 0; int factorNumber = plan.getFactors().size(); - List<Factor> factors = plan.getFactors(); + List<Factor<?, ?>> factors = plan.getFactors(); SensitivityScenarios thisExperiment = new SensitivityScenarios(); List<Scenario> thisExperimentScenarios = thisExperiment.getScenarios(); Modified: trunk/sensitivity/SensitivityCalculatorRMorris.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorRMorris.java 2009-06-12 08:14:51 UTC (rev 146) +++ trunk/sensitivity/SensitivityCalculatorRMorris.java 2009-06-12 08:27:01 UTC (rev 147) @@ -90,7 +90,7 @@ double[] dataframe = new double[0]; int nbExperiments = 0; int factorNumber = plan.getFactors().size(); - List<Factor> factors = plan.getFactors(); + List<Factor<?, ?>> factors = plan.getFactors(); if (param_r == 0) { param_r = 4; Modified: trunk/sensitivity/SensitivityCalculatorROptimumLHS.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorROptimumLHS.java 2009-06-12 08:14:51 UTC (rev 146) +++ trunk/sensitivity/SensitivityCalculatorROptimumLHS.java 2009-06-12 08:27:01 UTC (rev 147) @@ -90,7 +90,7 @@ setIsisFactorsR(plan, outputdirectory); int factornumber = plan.getFactors().size(); - List<Factor> factors = plan.getFactors(); + List<Factor<?, ?>> factors = plan.getFactors(); double[] dataframe = new double[0]; SensitivityScenarios thisExperiment = new SensitivityScenarios(); List<Scenario> thisExperimentScenarios = thisExperiment.getScenarios(); Modified: trunk/sensitivity/SensitivityCalculatorRRandomLHS.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorRRandomLHS.java 2009-06-12 08:14:51 UTC (rev 146) +++ trunk/sensitivity/SensitivityCalculatorRRandomLHS.java 2009-06-12 08:27:01 UTC (rev 147) @@ -89,7 +89,7 @@ double[] dataframe = new double[0]; SensitivityScenarios thisExperiment = new SensitivityScenarios(); List<Scenario> thisExperimentScenarios = thisExperiment.getScenarios(); - List<Factor> factors = plan.getFactors(); + List<Factor<?, ?>> factors = plan.getFactors(); //Test all factors, if one is discrete, return null for (int i = 0; i < factors.size(); i++) { Modified: trunk/sensitivity/SensitivityCalculatorRSobol.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorRSobol.java 2009-06-12 08:14:51 UTC (rev 146) +++ trunk/sensitivity/SensitivityCalculatorRSobol.java 2009-06-12 08:27:01 UTC (rev 147) @@ -93,7 +93,7 @@ double[] dataframe = new double[0]; int nbExperiments = 0; int factorNumber = plan.getFactors().size(); - List<Factor> factors = plan.getFactors(); + List<Factor<?, ?>> factors = plan.getFactors(); SensitivityScenarios thisExperiment = new SensitivityScenarios(); List<Scenario> thisExperimentScenarios = thisExperiment.getScenarios(); Modified: trunk/sensitivity/SensitivityCalculatorRegularFractions.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorRegularFractions.java 2009-06-12 08:14:51 UTC (rev 146) +++ trunk/sensitivity/SensitivityCalculatorRegularFractions.java 2009-06-12 08:27:01 UTC (rev 147) @@ -72,7 +72,7 @@ double[] dataframeplan = new double[0]; int nbExperiments = 0; int factorNumber = plan.getFactors().size(); - List<Factor> factors = plan.getFactors(); + List<Factor<?, ?>> factors = plan.getFactors(); SensitivityScenarios thisExperiment = new SensitivityScenarios(); List<Scenario> thisExperimentScenarios = thisExperiment.getScenarios();