r2982 - in isis-fish/branches/3.3.1/src: main/java/fr/ifremer/isisfish/mexico main/java/fr/ifremer/isisfish/mexico/xml main/java/fr/ifremer/isisfish/simulator/sensitivity main/java/fr/ifremer/isisfish/simulator/sensitivity/domain main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor test/java/fr/ifremer/isisfish/mexico test/java/fr/ifremer/isisfish/mexico/export test/java/fr/ifremer/isisfish/simulator test/java/fr/ifremer/isisfish/simulator/launcher test/java/fr/ifremer/isisfish/si
Author: chatellier Date: 2010-02-04 16:04:31 +0000 (Thu, 04 Feb 2010) New Revision: 2982 Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DesignPlanXMLVisitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DiscreteDomainXMLVisitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomainXMLVisitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationContinuousDomainXMLVisitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/MatrixContinuousDomainXMLVisitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/ScenarioXMLVisitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/SensitivityScenariosXMLVisitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Scenario.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculator.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityException.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityScenarios.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DesignPlanVisitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DomainVisitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/FactorVisitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/ScenarioVisitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/SensitivityScenariosVisitor.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/export/RegionExplorerTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationParameterTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitorTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceIT.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculatorRandomMock.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/types/MonthTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelperTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUtilsTest.java Log: Factor (and all other entities) are not generic anymore Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2010-02-04 15:51:08 UTC (rev 2981) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2010-02-04 16:04:31 UTC (rev 2982) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009-2010 Ifremer, Code Lutin, Chatellier Eric + * Copyright (C) 2009 - 2010 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 Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java 2010-02-04 15:51:08 UTC (rev 2981) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java 2010-02-04 16:04:31 UTC (rev 2982) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009-2010 Ifremer, Code Lutin + * Copyright (C) 2009 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -18,8 +18,6 @@ package fr.ifremer.isisfish.mexico.xml; -import java.io.Serializable; - import fr.ifremer.isisfish.simulator.sensitivity.Domain; import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; @@ -52,8 +50,7 @@ * {@inheritDoc} */ @Override - public <E, F extends Serializable> void visit(Domain<E,F> domain, - F label, E value) { + public void visit(Domain domain, Object label, Object value) { } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DesignPlanXMLVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DesignPlanXMLVisitor.java 2010-02-04 15:51:08 UTC (rev 2981) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DesignPlanXMLVisitor.java 2010-02-04 16:04:31 UTC (rev 2982) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Ifremer, Code Lutin + * Copyright (C) 2009 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DiscreteDomainXMLVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DiscreteDomainXMLVisitor.java 2010-02-04 15:51:08 UTC (rev 2981) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DiscreteDomainXMLVisitor.java 2010-02-04 16:04:31 UTC (rev 2982) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009-2010 Ifremer, Code Lutin + * Copyright (C) 2009 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -18,8 +18,6 @@ package fr.ifremer.isisfish.mexico.xml; -import java.io.Serializable; - import fr.ifremer.isisfish.simulator.sensitivity.Domain; import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; @@ -53,8 +51,7 @@ * {@inheritDoc} */ @Override - public <E, F extends Serializable> void visit(Domain<E,F> domain, - F label, E value) { + public void visit(Domain domain, Object label, Object value) { xmlBuffer.append("<value>" + value + "</value>"); } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java 2010-02-04 15:51:08 UTC (rev 2981) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java 2010-02-04 16:04:31 UTC (rev 2982) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009-2010 Ifremer, Code Lutin + * Copyright (C) 2009 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -67,7 +67,7 @@ // double if ("real".equals(type)) { - Factor<Double,Integer> factor = new Factor<Double,Integer>(name); + Factor factor = new Factor(name); factor.setPath(path); Element fixedElement = factorElement.element("domain").element( "fixed"); @@ -105,7 +105,7 @@ } else { // continous domain - domain = new ContinuousDomain<Double,Double>(); + domain = new ContinuousDomain(); } domain.setCardinality(Integer.valueOf(fixedElement.attributeValue("cardinality"))); @@ -117,7 +117,7 @@ factor.setDomain(domain); } else if ("discrete".equals(property)) { - DiscreteDomain<Double,Integer> domain = new DiscreteDomain<Double,Integer>(); + DiscreteDomain domain = new DiscreteDomain(); List<Element> valueElements = fixedElement.element( "enumeration").elements("value"); int label = 0; @@ -128,9 +128,9 @@ } factor.setDomain(domain); } - plan.getFactors().add(factor); + plan.add(factor); } else if ("integer".equals(type)) { - Factor<Integer,Integer> factor = new Factor<Integer,Integer>(name); + Factor factor = new Factor(name); factor.setPath(path); Element fixedElement = factorElement.element("domain").element("fixed"); if ("continuous".equals(property)) { @@ -168,7 +168,7 @@ } else { // continous domain - domain = new ContinuousDomain<Integer,Integer>(); + domain = new ContinuousDomain(); } domain.setCardinality(Integer.valueOf(fixedElement.attributeValue("cardinality"))); @@ -180,7 +180,7 @@ factor.setDomain(domain); } else if ("discrete".equals(property)) { - DiscreteDomain<Integer,Integer> domain = new DiscreteDomain<Integer,Integer>(); + DiscreteDomain domain = new DiscreteDomain(); List<Element> valueElements = fixedElement.element( "enumeration").elements("value"); int label = 0; @@ -191,7 +191,7 @@ } factor.setDomain(domain); } - plan.getFactors().add(factor); + plan.add(factor); } } @@ -234,7 +234,7 @@ Element fixedElement = factorElement.element("domain") .element("fixed"); if ("continuous".equals(property)) { - ContinuousDomain<Double> domain = new ContinuousDomain<Double>(); + ContinuousDomain domain = new ContinuousDomain(); domain.setCardinality(Integer.valueOf(fixedElement .attributeValue("cardinality"))); Element rangeElement = fixedElement.element("range"); @@ -244,7 +244,7 @@ .attributeValue("max"))); factor.setDomain(domain); } else if ("discrete".equals(property)) { - DiscreteDomain<Double> domain = new DiscreteDomain<Double>(); + DiscreteDomain domain = new DiscreteDomain(); List<Element> valueElements = fixedElement.element( "enumeration").elements("value"); int label = 0; @@ -259,7 +259,7 @@ } scenario.getFactors().add(factor); } else if ("integer".equals(type)) { - Factor<Integer> factor = new Factor<Integer>(name); + Factor factor = new Factor(name); factor.setPath(path); factor.setValue(Integer.valueOf(factorElement.element( "value").getText().trim())); @@ -267,7 +267,7 @@ Element fixedElement = factorElement.element("domain") .element("fixed"); if ("continuous".equals(property)) { - ContinuousDomain<Integer> domain = new ContinuousDomain<Integer>(); + ContinuousDomain domain = new ContinuousDomain(); domain.setCardinality(Integer.valueOf(fixedElement .attributeValue("cardinality"))); Element rangeElement = fixedElement.element("range"); @@ -277,7 +277,7 @@ .attributeValue("max"))); factor.setDomain(domain); } else if ("discrete".equals(property)) { - DiscreteDomain<Integer> domain = new DiscreteDomain<Integer>(); + DiscreteDomain domain = new DiscreteDomain(); List<Element> valueElements = fixedElement.element( "enumeration").elements("value"); int label = 0; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomainXMLVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomainXMLVisitor.java 2010-02-04 15:51:08 UTC (rev 2981) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomainXMLVisitor.java 2010-02-04 16:04:31 UTC (rev 2982) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Ifremer, Code Lutin + * Copyright (C) 2009 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationContinuousDomainXMLVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationContinuousDomainXMLVisitor.java 2010-02-04 15:51:08 UTC (rev 2981) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationContinuousDomainXMLVisitor.java 2010-02-04 16:04:31 UTC (rev 2982) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Ifremer, Code Lutin + * Copyright (C) 2009 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java 2010-02-04 15:51:08 UTC (rev 2981) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java 2010-02-04 16:04:31 UTC (rev 2982) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Ifremer, Code Lutin + * Copyright (C) 2009 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/MatrixContinuousDomainXMLVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/MatrixContinuousDomainXMLVisitor.java 2010-02-04 15:51:08 UTC (rev 2981) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/MatrixContinuousDomainXMLVisitor.java 2010-02-04 16:04:31 UTC (rev 2982) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009-2010 Ifremer, Code Lutin + * Copyright (C) 2009 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/ScenarioXMLVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/ScenarioXMLVisitor.java 2010-02-04 15:51:08 UTC (rev 2981) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/ScenarioXMLVisitor.java 2010-02-04 16:04:31 UTC (rev 2982) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Ifremer, Code Lutin + * Copyright (C) 2009 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/SensitivityScenariosXMLVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/SensitivityScenariosXMLVisitor.java 2010-02-04 15:51:08 UTC (rev 2981) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/SensitivityScenariosXMLVisitor.java 2010-02-04 16:04:31 UTC (rev 2982) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Ifremer, Code Lutin + * Copyright (C) 2009 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2010-02-04 15:51:08 UTC (rev 2981) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2010-02-04 16:04:31 UTC (rev 2982) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009-2010 Ifremer, Code Lutin + * Copyright (C) 2009 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -94,7 +94,7 @@ "\"Bsup\"=Bsup)"; //Create the vectors - List<Factor<?, ?>> factors = plan.getFactors(); + List<Factor> factors = plan.getFactors(); for (int i = 0; i < factors.size(); i++) { Factor factor = factors.get(i); if (i != 0) { @@ -276,7 +276,7 @@ return text.getText(); } - protected void testNoDiscrete(List<Factor<?,?>> factors) throws SensitivityException{ + protected void testNoDiscrete(List<Factor> factors) throws SensitivityException{ for (Factor factor:factors) { if (factor.getDomain() instanceof DiscreteDomain) { throw new SensitivityException(factor.getName() + Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java 2010-02-04 15:51:08 UTC (rev 2981) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java 2010-02-04 16:04:31 UTC (rev 2982) @@ -20,6 +20,7 @@ import java.io.Serializable; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import fr.ifremer.isisfish.simulator.sensitivity.visitor.DesignPlanVisitor; @@ -39,30 +40,41 @@ private static final long serialVersionUID = 977975461743758075L; /** Liste des facteurs a utiliser */ - protected List<Factor<?, ?>> factors; + protected List<Factor> factors; /** * Constructor. */ public DesignPlan() { - factors = new ArrayList<Factor<?, ?>>(); + factors = new ArrayList<Factor>(); } /** - * Get factors list. + * Get factors list (not modifiable). * * @return factors list */ - public List<Factor<?, ?>> getFactors() { - return factors; + public List<Factor> getFactors() { + return Collections.unmodifiableList(factors); } /** + * Add factor. + * + * @param e factor to add + * @return {@code true} if factor has been added + * @see java.util.List#add(java.lang.Object) + */ + public boolean add(Factor f) { + return factors.add(f); + } + + /** * Set factors list. * * @param factors the factors list to set */ - public void setFactors(List<Factor<?, ?>> factors) { + public void setFactors(List<Factor> factors) { this.factors = factors; } @@ -73,7 +85,7 @@ */ public void accept(DesignPlanVisitor visitor) { visitor.start(this); - for (Factor<?, ?> factor : factors) { + for (Factor factor : factors) { visitor.visit(this, factor); } visitor.end(this); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java 2010-02-04 15:51:08 UTC (rev 2981) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java 2010-02-04 16:04:31 UTC (rev 2982) @@ -33,9 +33,6 @@ * Le domain peut etre : * - discret : i.e un ensemble de valeurs * - continu : i.e, une borne min, max - * - * @param <E> type des valeurs gérées par le domaine - * @param <F> type des labels * * @see DiscreteDomain * @see ContinuousDomain @@ -46,7 +43,7 @@ * Last update : $Date: 24 févr. 2009 $ * By : $Author: chatellier $ */ -public interface Domain<E, F extends Serializable> extends Serializable { +public interface Domain extends Serializable, Cloneable { /** * Return value associated to identifier. @@ -54,7 +51,7 @@ * @param identifier * @return found value or <tt>null</tt> if not found */ - E getValueForIdentifier(F identifier); + Object getValueForIdentifier(Object identifier); /** * Accept a new visitor. @@ -69,5 +66,5 @@ * @return the domain cloned */ - public Domain<E, F> clone(); + public Domain clone(); } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2010-02-04 15:51:08 UTC (rev 2981) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2010-02-04 16:04:31 UTC (rev 2982) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009-2010 Ifremer, Code Lutin + * Copyright (C) 2009 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -38,7 +38,7 @@ * * Last update : $Date: 19 févr. 2009 $ By : $Author: chatellier $ */ -public class Factor<E, F extends Serializable> implements Serializable, Cloneable { +public class Factor implements Serializable, Cloneable { /** serialVersionUID. */ private static final long serialVersionUID = 1643804268013964453L; @@ -68,12 +68,12 @@ * @see ContinuousDomain * @see DiscreteDomain */ - protected Domain<E,F> domain; + protected Domain domain; /** * Factor value. */ - protected E value; + protected Object value; /** * Path permettant d'identifier l'objet et la propriete de l'objet a mettre @@ -86,22 +86,11 @@ protected String path; /** - * Constructor. - * - * Protected, name is mandatory. - */ - protected Factor() { - - } - - /** * Constructor with name. * - * @param name - * factor name + * @param name factor name */ public Factor(String name) { - this(); this.name = name; } @@ -117,8 +106,7 @@ /** * Set name. * - * @param name - * the name to set + * @param name the name to set */ public void setName(String name) { this.name = name; @@ -147,17 +135,16 @@ * * @return the domain */ - public Domain<E,F> getDomain() { + public Domain getDomain() { return domain; } /** * Set domain. * - * @param domain - * the domain to set + * @param domain the domain to set */ - public void setDomain(Domain<E,F> domain) { + public void setDomain(Domain domain) { this.domain = domain; } @@ -166,27 +153,25 @@ * * @return the value */ - public E getValue() { + public Object getValue() { return value; } /** * Set value. * - * @param value - * new value + * @param value new value */ - public void setValue(E value) { + public void setValue(Object value) { this.value = value; } /** * Set value for label. * - * @param valueIdentifier - * new value identifier to get + * @param valueIdentifier new value identifier to get */ - public void setValueForIdentifier(F valueIdentifier) { + public void setValueForIdentifier(Object valueIdentifier) { value = domain.getValueForIdentifier(valueIdentifier); } @@ -227,19 +212,23 @@ @Override public Object clone() { - Factor<E,F> f = new Factor<E,F>(); - - f.domain = domain.clone(); - f.name = name; - f.path = path; - // FIXME make real clone() for value - f.value = value; + Factor f = null; + try { + f = (Factor)super.clone(); + f.domain = domain.clone(); + //f.path = path; + // FIXME make real clone() for value + //f.value = value; + } catch (CloneNotSupportedException e) { + throw new RuntimeException("Error on clone()", e); + } + return f; } @Override public String toString() { - return name; + return "Factor : " + name + "(" + comment + ")"; } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Scenario.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Scenario.java 2010-02-04 15:51:08 UTC (rev 2981) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Scenario.java 2010-02-04 16:04:31 UTC (rev 2982) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009-2010 Ifremer, Code Lutin + * Copyright (C) 2009 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculator.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculator.java 2010-02-04 15:51:08 UTC (rev 2981) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculator.java 2010-02-04 16:04:31 UTC (rev 2982) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityException.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityException.java 2010-02-04 15:51:08 UTC (rev 2981) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityException.java 2010-02-04 16:04:31 UTC (rev 2982) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityScenarios.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityScenarios.java 2010-02-04 15:51:08 UTC (rev 2981) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityScenarios.java 2010-02-04 16:04:31 UTC (rev 2982) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2010-02-04 15:51:08 UTC (rev 2981) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2010-02-04 16:04:31 UTC (rev 2982) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009-2010 Ifremer, Code Lutin + * Copyright (C) 2009 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -18,8 +18,6 @@ package fr.ifremer.isisfish.simulator.sensitivity.domain; -import java.io.Serializable; - import fr.ifremer.isisfish.simulator.sensitivity.Domain; import fr.ifremer.isisfish.simulator.sensitivity.visitor.DomainVisitor; @@ -27,9 +25,6 @@ * Domaine continu. * * Composé d'une borne min et max et d'une cardinalité. - * - * @param <E> type des valeurs gérées par le domaine - * @param <F> type des labels * * @author chatellier * @version $Revision: 1.0 $ @@ -37,7 +32,7 @@ * Last update : $Date: 24 févr. 2009 $ * By : $Author: chatellier $ */ -public class ContinuousDomain<E, F extends Serializable> implements Domain<E, F> { +public class ContinuousDomain implements Domain { /** serialVersionUID. */ private static final long serialVersionUID = -2037768174807839046L; @@ -103,9 +98,8 @@ * * In continuous domain, just return identifier */ - public E getValueForIdentifier(F identifier) { - // FIXME test cast - return (E)identifier; + public Object getValueForIdentifier(Object identifier) { + return identifier; } /** @@ -137,11 +131,13 @@ } @Override - public ContinuousDomain<E,F> clone() { - ContinuousDomain<E,F> cloned = new ContinuousDomain<E,F>(); - cloned.setCardinality(this.cardinality); - cloned.setMaxBound(this.maxBound); - cloned.setMinBound(this.minBound); + public ContinuousDomain clone() { + ContinuousDomain cloned = null; + try { + cloned = (ContinuousDomain)super.clone(); + } catch (CloneNotSupportedException e) { + throw new RuntimeException("Error on clone()", e); + } return cloned; } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java 2010-02-04 15:51:08 UTC (rev 2981) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java 2010-02-04 16:04:31 UTC (rev 2982) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009-2010 Ifremer, Code Lutin + * Copyright (C) 2009 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -18,7 +18,6 @@ package fr.ifremer.isisfish.simulator.sensitivity.domain; -import java.io.Serializable; import java.util.Map; import java.util.SortedMap; import java.util.TreeMap; @@ -30,9 +29,6 @@ * Domain discret. * * Ensemble de valeurs. - * - * @param <E> type des valeurs gérées par le domaine - * @param <F> type des labels * * @author chatellier * @version $Revision: 1.0 $ @@ -40,23 +36,21 @@ * Last update : $Date: 24 févr. 2009 $ * By : $Author: chatellier $ */ -public class DiscreteDomain<E, F extends Serializable> implements Domain<E, F> { +public class DiscreteDomain implements Domain { /** serialVersionUID. */ private static final long serialVersionUID = -192647757737396585L; /** * Value for this domain. - * - * Each "E" values is identified by a {@link Serializable} identifier. */ - protected SortedMap<F, E> values; + protected SortedMap<Object, Object> values; /** * Constructor. */ public DiscreteDomain() { - values = new TreeMap<F, E>(); + values = new TreeMap<Object, Object>(); } /** @@ -64,7 +58,7 @@ * * @return the values */ - public SortedMap<F, E> getValues() { + public SortedMap<Object, Object> getValues() { return values; } @@ -73,7 +67,7 @@ * * @param values the values */ - public void setValues(SortedMap<F, E> values) { + public void setValues(SortedMap<Object, Object> values) { this.values = values; } @@ -82,7 +76,7 @@ * * @throws IllegalArgumentException if identifier is not a valid key */ - public E getValueForIdentifier(F identifier) + public Object getValueForIdentifier(Object identifier) throws IllegalArgumentException { if (values == null || !values.containsKey(identifier)) { @@ -100,16 +94,22 @@ */ public void accept(DomainVisitor visitor) { visitor.start(this); - for (Map.Entry<F, E> value : values.entrySet()) { + for (Map.Entry<Object, Object> value : values.entrySet()) { visitor.visit(this, value.getKey(), value.getValue()); } visitor.end(this); } @Override - public DiscreteDomain<E, F> clone() { - DiscreteDomain<E, F> cloned = new DiscreteDomain<E, F>(); - cloned.setValues(this.values); + public DiscreteDomain clone() { + DiscreteDomain cloned = null; + try { + cloned = (DiscreteDomain)super.clone(); + // special copy for values + cloned.setValues(new TreeMap<Object, Object>(this.values)); + } catch (CloneNotSupportedException e) { + throw new RuntimeException("Error on clone()", e); + } return cloned; } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java 2010-02-04 15:51:08 UTC (rev 2981) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java 2010-02-04 16:04:31 UTC (rev 2982) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -29,8 +29,7 @@ * * Last update : $Date: 24 févr. 2009 $ By : $Author: chatellier $ */ -public class EquationContinuousDomain extends - ContinuousDomain<Double,Double> { +public class EquationContinuousDomain extends ContinuousDomain { /** serialVersionUID. */ private static final long serialVersionUID = -2037768174807839046L; @@ -51,21 +50,6 @@ protected Double value; /** - * Empty constructor. - */ - public EquationContinuousDomain() { - - } - - @Override - public String toString() { - String result = "variableName=" + variableName + " operator=" + operator + - " coefficient=" + coefficient + " referenceValue=" + referenceValue + - " value=" + value; - return result; - } - - /** * Get variable name. * * @return the variableName @@ -159,13 +143,18 @@ return 1; } + @Override + public Object getValueForIdentifier(Object identifier) { + return getValueForIdentifier((Double)identifier); + } + /** - * {@inheritDoc}. - * * In equation continuous domain, value appear in continuous domain values * only. Here : return identifier. + * + * @param identifier identifier + * @return ? */ - @Override public Double getValueForIdentifier(Double identifier) { this.value = identifier; @@ -181,7 +170,7 @@ } return identifier; } - + /** * Get value used to create the equation. * @@ -201,8 +190,9 @@ this.value = value; } - public EquationContinuousDomain clone(){ - EquationContinuousDomain cloned = new EquationContinuousDomain(); + @Override + public EquationContinuousDomain clone() { + EquationContinuousDomain cloned = (EquationContinuousDomain)super.clone(); cloned.setCardinality(this.cardinality); cloned.setMaxBound(this.maxBound); cloned.setMinBound(this.minBound); @@ -214,4 +204,11 @@ return cloned; } + @Override + public String toString() { + String result = "variableName=" + variableName + " operator=" + operator + + " coefficient=" + coefficient + " referenceValue=" + referenceValue + + " value=" + value; + return result; + } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java 2010-02-04 15:51:08 UTC (rev 2981) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java 2010-02-04 16:04:31 UTC (rev 2982) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009-2010 Ifremer, Code Lutin + * Copyright (C) 2009 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -31,7 +31,7 @@ * * Last update : $Date: 24 févr. 2009 $ By : $Author: chatellier $ */ -public class MatrixContinuousDomain extends ContinuousDomain<MatrixND, Double> { +public class MatrixContinuousDomain extends ContinuousDomain { /** serialVersionUID. */ private static final long serialVersionUID = -2037768174807839046L; @@ -49,13 +49,6 @@ protected double value; /** - * Empty constructor. - */ - public MatrixContinuousDomain() { - - } - - /** * Get matrix. * * @return the matrix @@ -67,8 +60,7 @@ /** * Set matrix. * - * @param matrix - * the matrix to set + * @param matrix the matrix to set */ public void setMatrix(MatrixND matrix) { this.matrix = matrix; @@ -82,8 +74,7 @@ } /** - * @param coefficient - * the coefficient to set + * @param coefficient the coefficient to set */ public void setCoefficient(double coefficient) { this.coefficient = coefficient; @@ -101,8 +92,7 @@ /** * Set operator. * - * @param operator - * the operator to set + * @param operator the operator to set */ public void setOperator(String operator) { this.operator = operator; @@ -128,13 +118,20 @@ return 1; } + @Override + public Object getValueForIdentifier(Object identifier) { + return getValueForIdentifier((Double)identifier); + } + /** - * {@inheritDoc}. + * In matrix continuous domain, return a new matrix. * - * In continuous domain, just return identifier + * @param identifier identifier + * @return a new computed matrix */ - public MatrixND getValueForIdentifier(final Double identifier) { - this.value = identifier; + public MatrixND getValueForIdentifier(Double identifier) { + + this.value = (Double)identifier; MatrixND temp = this.matrix.copy(); if (operator.equals("+")) { temp.map(new MapFunction() { @@ -176,28 +173,28 @@ /** * Set value used to create the matrix. * - * @param value - * the value to set + * @param value the value to set */ public void setValue(Double value) { this.value = value; } + @Override public MatrixContinuousDomain clone() { - MatrixContinuousDomain cloned = new MatrixContinuousDomain(); - cloned.setCardinality(this.cardinality); + MatrixContinuousDomain cloned = (MatrixContinuousDomain)super.clone(); + /*cloned.setCardinality(this.cardinality); cloned.setMaxBound(this.maxBound); cloned.setMinBound(this.minBound); cloned.setCoefficient(this.coefficient); cloned.setMatrix(this.matrix); cloned.setOperator(this.operator); - cloned.setValue(this.value); + cloned.setValue(this.value);*/ return cloned; } /** * Get the minimum bound of the coefficient used to create the matrix. As - * the getMinBound for use in R always return 0. + * the {@link #getMinBound()} for use in R always return 0. * * @return the real minimum bound */ @@ -217,7 +214,7 @@ /** * Get the maximal bound of the coefficient used to create the matrix. As - * the getMaxBound for use in R always return 1. + * the {@link #getMaxBound()} for use in R always return 1. * * @return the real maximum bound */ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DesignPlanVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DesignPlanVisitor.java 2010-02-04 15:51:08 UTC (rev 2981) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DesignPlanVisitor.java 2010-02-04 16:04:31 UTC (rev 2982) @@ -45,7 +45,7 @@ * @param designPlan design plan * @param factor factor */ - void visit(DesignPlan designPlan, Factor<?, ?> factor); + void visit(DesignPlan designPlan, Factor factor); /** * End. Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DomainVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DomainVisitor.java 2010-02-04 15:51:08 UTC (rev 2981) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DomainVisitor.java 2010-02-04 16:04:31 UTC (rev 2982) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009-2010 Ifremer, Code Lutin + * Copyright (C) 2009 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -18,8 +18,6 @@ package fr.ifremer.isisfish.simulator.sensitivity.visitor; -import java.io.Serializable; - import fr.ifremer.isisfish.simulator.sensitivity.Domain; /** @@ -38,24 +36,21 @@ * * @param domain domain */ - void start(Domain<?, ?> domain); + void start(Domain domain); /** * Visit domain value or property. * - * @param <E> domain element type - * @param <F> label element type - * * @param domain domain * @param label value label or property name * @param value value */ - <E, F extends Serializable> void visit(Domain<E, F> domain, F label, E value); + void visit(Domain domain, Object label, Object value); /** * End. * * @param domain domain */ - void end(Domain<?, ?> domain); + void end(Domain domain); } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/FactorVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/FactorVisitor.java 2010-02-04 15:51:08 UTC (rev 2981) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/FactorVisitor.java 2010-02-04 16:04:31 UTC (rev 2982) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009-2010 Ifremer, Code Lutin + * Copyright (C) 2009 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -18,8 +18,6 @@ package fr.ifremer.isisfish.simulator.sensitivity.visitor; -import java.io.Serializable; - import fr.ifremer.isisfish.simulator.sensitivity.Domain; import fr.ifremer.isisfish.simulator.sensitivity.Factor; @@ -39,7 +37,7 @@ * * @param factor factor */ - void start(Factor<?, ?> factor); + void start(Factor factor); /** * Visit domain. @@ -47,7 +45,7 @@ * @param factor factor * @param domain domain */ - <E, F extends Serializable> void visit(Factor<E, F> factor, Domain<E, F> domain); + void visit(Factor factor, Domain domain); /** * End. Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/ScenarioVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/ScenarioVisitor.java 2010-02-04 15:51:08 UTC (rev 2981) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/ScenarioVisitor.java 2010-02-04 16:04:31 UTC (rev 2982) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -18,8 +18,6 @@ package fr.ifremer.isisfish.simulator.sensitivity.visitor; -import java.io.Serializable; - import fr.ifremer.isisfish.simulator.sensitivity.Factor; import fr.ifremer.isisfish.simulator.sensitivity.Scenario; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/SensitivityScenariosVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/SensitivityScenariosVisitor.java 2010-02-04 15:51:08 UTC (rev 2981) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/SensitivityScenariosVisitor.java 2010-02-04 16:04:31 UTC (rev 2982) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2010-02-04 15:51:08 UTC (rev 2981) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2010-02-04 16:04:31 UTC (rev 2982) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009-2010 Ifremer, Code Lutin, Chatellier Eric + * Copyright (C) 2009 - 2010 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 @@ -41,10 +41,10 @@ * Test for MexicoHelper class. * * @author chatellier - * @version $Revision: 1526 $ + * @version $Revision$ * - * Last update: $Date: 2008-10-07 18:46:13 +0200 (mar 07 oct 2008) $ by : - * $Author: tchemit $ + * Last update: $Date$ by : + * $Author$ */ public class MexicoHelperTest extends AbstractIsisFishTest { @@ -70,16 +70,16 @@ matrix1.setValue(new int[] { 2, 1 }, -1); // factor 1 - Factor<Double, Double> factorContinuous = new Factor<Double, Double>("factor 1 (double continuous)"); - ContinuousDomain<Double, Double> domain1 = new ContinuousDomain<Double, Double>(); + Factor factorContinuous = new Factor("factor 1 (double continuous)"); + ContinuousDomain domain1 = new ContinuousDomain(); domain1.setMinBound(0.0); domain1.setMaxBound(50.0); factorContinuous.setDomain(domain1); factorContinuous.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521013#0.1715620681984218#maxLength"); // factor 2 - Factor<Double, Double> factorDiscrete = new Factor<Double, Double>("factor 2 (double discrete)"); - DiscreteDomain<Double, Double> domain2 = new DiscreteDomain<Double, Double>(); + Factor factorDiscrete = new Factor("factor 2 (double discrete)"); + DiscreteDomain domain2 = new DiscreteDomain(); domain2.getValues().put(0.0, 12.3); domain2.getValues().put(1.0, 70.9); domain2.getValues().put(2.0, 21.0); @@ -90,8 +90,8 @@ factorDiscrete.setValue(3.0); // factor 3 - Factor<Integer, Double> factorContinuous2 = new Factor<Integer, Double>("factor 3 (integer discrete)"); - DiscreteDomain<Integer, Double> domain3 = new DiscreteDomain<Integer, Double>(); + Factor factorContinuous2 = new Factor("factor 3 (integer discrete)"); + DiscreteDomain domain3 = new DiscreteDomain(); domain3.getValues().put(0.0, 13); domain3.getValues().put(1.0, 14); domain3.getValues().put(2.0, 45); @@ -99,7 +99,7 @@ factorContinuous2.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#minLength"); // factor 4 - Factor<MatrixND, Double> factorMatrixContinuous = new Factor<MatrixND, Double>("factor 4 (MatrixContinuous)"); + Factor factorMatrixContinuous = new Factor("factor 4 (MatrixContinuous)"); MatrixContinuousDomain domain4 = new MatrixContinuousDomain(); domain4.setCoefficient(0.799); domain4.setMatrix(matrix1); @@ -108,7 +108,7 @@ factorMatrixContinuous.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#minLength"); // factor 5 - Factor<Double, Double> factorEquationContinuous = new Factor<Double, Double>("factor 5 (EquationContinuous)"); + Factor factorEquationContinuous = new Factor("factor 5 (EquationContinuous)"); EquationContinuousDomain domain5 = new EquationContinuousDomain(); domain5.setCoefficient(0.1); domain5.setReferenceValue(45.0); @@ -117,11 +117,11 @@ factorEquationContinuous.setDomain(domain5); factorEquationContinuous.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#maxLength"); - designPlan.getFactors().add(factorContinuous); - designPlan.getFactors().add(factorDiscrete); - designPlan.getFactors().add(factorContinuous2); - designPlan.getFactors().add(factorMatrixContinuous); - designPlan.getFactors().add(factorEquationContinuous); + designPlan.add(factorContinuous); + designPlan.add(factorDiscrete); + designPlan.add(factorContinuous2); + designPlan.add(factorMatrixContinuous); + designPlan.add(factorEquationContinuous); return designPlan; } Property changes on: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/export/RegionExplorerTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/export/RegionExplorerTest.java 2010-02-04 15:51:08 UTC (rev 2981) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/export/RegionExplorerTest.java 2010-02-04 16:04:31 UTC (rev 2982) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009-2010 Ifremer, Code Lutin, Chatellier Eric + * Copyright (C) 2009 - 2010 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 Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationParameterTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationParameterTest.java 2010-02-04 15:51:08 UTC (rev 2981) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationParameterTest.java 2010-02-04 16:04:31 UTC (rev 2982) @@ -36,10 +36,10 @@ * Simulation parameter test class. * * @author chatellier - * @version $Revision: 1.0 $ + * @version $Revision$ * - * Last update : $Date: 19 mars 2009 $ - * By : $Author: chatellier $ + * Last update : $Date$ + * By : $Author$ */ public class SimulationParameterTest extends AbstractIsisFishTest { Property changes on: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationParameterTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java 2010-02-04 15:51:08 UTC (rev 2981) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java 2010-02-04 16:04:31 UTC (rev 2982) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009-2010 Ifremer - Code Lutin + * Copyright (C) 2009 - 2010 Ifremer - Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -71,10 +71,10 @@ * Le prescript doit la changer en m2. * * @author chatellier - * @version $Revision: 1.0 $ + * @version $Revision$ * - * Last update : $Date: 24 févr. 2009 $ - * By : $Author: chatellier $ + * Last update : $Date$ + * By : $Author$ */ public class SimulationPreScriptTest extends AbstractIsisFishTest { @@ -129,8 +129,8 @@ childStorageContext.commitTransaction(); // factor - Factor<Integer,Integer> factor = new Factor<Integer,Integer>("testint"); - ContinuousDomain<Integer,Integer> domain = new ContinuousDomain<Integer,Integer>(); + Factor factor = new Factor("testint"); + ContinuousDomain domain = new ContinuousDomain(); domain.setMinBound(0); domain.setMaxBound(50); factor.setDomain(domain); @@ -229,16 +229,16 @@ childStorageContext.commitTransaction(); // factor - Factor<MatrixND,String> factor1 = new Factor<MatrixND,String>("testmatrix"); - DiscreteDomain<MatrixND,String> domain1 = new DiscreteDomain<MatrixND,String>(); + Factor factor1 = new Factor("testmatrix"); + DiscreteDomain domain1 = new DiscreteDomain(); domain1.getValues().put("m1", matrix1); factor1.setDomain(domain1); factor1.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim"); factor1.setValueForIdentifier("m1"); // factor - Factor<MatrixND,String> factor2 = new Factor<MatrixND,String>("testmatrix"); - DiscreteDomain<MatrixND,String> domain2 = new DiscreteDomain<MatrixND,String>(); + Factor factor2 = new Factor("testmatrix"); + DiscreteDomain domain2 = new DiscreteDomain(); domain2.getValues().put("m2", matrix1); factor2.setDomain(domain2); factor2.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim"); @@ -293,7 +293,7 @@ public void testFactorPreScriptEquation() throws IOException, TemplateException, StorageException, TopiaException { // factor - Factor<Double,Double> factorEquation = new Factor<Double,Double>("test.equation.name"); + Factor factorEquation = new Factor("test.equation.name"); EquationContinuousDomain domain1 = new EquationContinuousDomain(); domain1.setReferenceValue(3.0); domain1.setOperator("-"); Property changes on: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitorTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitorTest.java 2010-02-04 15:51:08 UTC (rev 2981) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitorTest.java 2010-02-04 16:04:31 UTC (rev 2982) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceIT.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceIT.java 2010-02-04 15:51:08 UTC (rev 2981) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceIT.java 2010-02-04 16:04:31 UTC (rev 2982) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Ifremer - Code Lutin + * Copyright (C) 2009 - 2010 Ifremer - Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2010-02-04 15:51:08 UTC (rev 2981) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2010-02-04 16:04:31 UTC (rev 2982) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Ifremer - Code Lutin + * Copyright (C) 2009 - 2010 Ifremer - Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -47,9 +47,9 @@ * Test for {@link SimulationService}. * * @author chatellier - * @version $Revision: 1.0 $ + * @version $Revision$ * - * Last update : $Date: 24 févr. 2009 $ By : $Author: chatellier $ + * Last update : $Date$ By : $Author$ */ public class SimulationServiceTest extends AbstractIsisFishTest { @@ -72,8 +72,8 @@ DesignPlan designPlan = new DesignPlan(); // factor 1 - Factor<Double,Double> factor1 = new Factor<Double,Double>("factor 1 (double)"); - ContinuousDomain<Double,Double> domain1 = new ContinuousDomain<Double,Double>(); + Factor factor1 = new Factor("factor 1 (double)"); + ContinuousDomain domain1 = new ContinuousDomain(); domain1.setMinBound(0.0); domain1.setMaxBound(50.0); domain1.setCardinality(4); @@ -92,17 +92,17 @@ factor2.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521064#0.022976136053553198#minLength");*/ // factor 3 - Factor<Double,Double> factor3 = new Factor<Double,Double>("factor 3 (double)"); - ContinuousDomain<Double,Double> domain3 = new ContinuousDomain<Double,Double>(); + Factor factor3 = new Factor("factor 3 (double)"); + ContinuousDomain domain3 = new ContinuousDomain(); domain3.setMinBound(12.0); domain3.setMaxBound(99.0); domain3.setCardinality(4); factor3.setDomain(domain3); factor3.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#minLength"); - designPlan.getFactors().add(factor1); - //designPlan.getFactors().add(factor2); - designPlan.getFactors().add(factor3); + designPlan.add(factor1); + //designPlan.add(factor2); + designPlan.add(factor3); return designPlan; } @@ -136,8 +136,8 @@ matrix2.setValue(new int[] { 2, 1 }, -1); // factor 1 - Factor<MatrixND,Double> factor1 = new Factor<MatrixND,Double>("factor 1 (matrixND)"); - DiscreteDomain<MatrixND,Double> domain1 = new DiscreteDomain<MatrixND,Double>(); + Factor factor1 = new Factor("factor 1 (matrixND)"); + DiscreteDomain domain1 = new DiscreteDomain(); domain1.getValues().put(0.0, matrix1); domain1.getValues().put(1.0, matrix2); factor1.setDomain(domain1); Property changes on: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java 2010-02-04 15:51:08 UTC (rev 2981) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java 2010-02-04 16:04:31 UTC (rev 2982) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2008 - 2009 Ifremer - Code Lutin + * Copyright (C) 2008 - 2010 Ifremer - Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -34,10 +34,10 @@ * simulation au travers de SSH. * * @author chatellier - * @version $Revision: 1.0 $ + * @version $Revision$ * - * Last update : $Date: 22 janv. 2009 $ - * By : $Author: chatellier $ + * Last update : $Date$ + * By : $Author$ */ public class SshSimulatorLauncherTest extends AbstractIsisFishTest { Property changes on: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculatorRandomMock.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculatorRandomMock.java 2010-02-04 15:51:08 UTC (rev 2981) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculatorRandomMock.java 2010-02-04 16:04:31 UTC (rev 2982) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Ifremer - Code Lutin + * Copyright (C) 2009 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -85,7 +85,7 @@ // return result SensitivityScenarios sensitivityScenarios = new SensitivityScenarios(); - List<Factor<?, ?>> factors = plan.getFactors(); + List<Factor> factors = plan.getFactors(); for (int i = 0; i < factors.size() * 2; ++i) { Scenario scenario = new Scenario(); @@ -122,8 +122,8 @@ factor.setValueForIdentifier(maxValue); scenario.addFactor(factor); } else { - DiscreteDomain<? extends Serializable,? extends Serializable> dDomain = (DiscreteDomain) domain; - for (Serializable sValue : dDomain.getValues().keySet()) { + DiscreteDomain dDomain = (DiscreteDomain) domain; + for (Object sValue : dDomain.getValues().keySet()) { factor.setValueForIdentifier(sValue); scenario.addFactor(factor); } Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/types/MonthTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/types/MonthTest.java 2010-02-04 15:51:08 UTC (rev 2981) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/types/MonthTest.java 2010-02-04 16:04:31 UTC (rev 2982) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -29,7 +29,7 @@ import org.junit.Test; /** - * TODO add comment here. + * Test on {@link Month}. * * @author chatellier * @version $Revision$ Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelperTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelperTest.java 2010-02-04 15:51:08 UTC (rev 2981) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelperTest.java 2010-02-04 16:04:31 UTC (rev 2982) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin, Chatellier Eric + * Copyright (C) 2009 - 2010 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 Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java 2010-02-04 15:51:08 UTC (rev 2981) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java 2010-02-04 16:04:31 UTC (rev 2982) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Ifremer, Code Lutin + * Copyright (C) 2009 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -21,9 +21,6 @@ import static org.nuiton.i18n.I18n._; import java.awt.HeadlessException; -import java.util.ArrayList; -import java.util.List; - import javax.swing.JDialog; import javax.swing.JOptionPane; import javax.swing.JTree; @@ -31,14 +28,17 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.junit.Test; import org.nuiton.math.matrix.MatrixFactory; import org.nuiton.math.matrix.MatrixND; -import org.junit.Test; import fr.ifremer.isisfish.AbstractIsisFishTest; import fr.ifremer.isisfish.simulator.sensitivity.Factor; import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; +import fr.ifremer.isisfish.simulator.sensitivity.group.FactorGroup; +import fr.ifremer.isisfish.ui.sensitivity.model.FactorTreeCellRenderer; +import fr.ifremer.isisfish.ui.sensitivity.model.FactorTreeModel; /** * Sensitivity tree model test. @@ -61,11 +61,11 @@ * * @return la liste des facteur */ - protected List<Factor<?,?>> getFactors() { - - Factor<Integer, Integer> factor1 = new Factor<Integer, Integer>( + protected FactorGroup getFactorGroup() { + + Factor factor1 = new Factor( "testint"); - ContinuousDomain<Integer, Integer> domain1 = new ContinuousDomain<Integer, Integer>(); + ContinuousDomain domain1 = new ContinuousDomain(); domain1.setMinBound(0); domain1.setMaxBound(50); factor1.setDomain(domain1); @@ -93,20 +93,20 @@ matrix2.setValue(new int[] { 1, 2 }, -13000); // factor - Factor<MatrixND, String> factor2 = new Factor<MatrixND, String>( + Factor factor2 = new Factor( "testmatrix"); - DiscreteDomain<MatrixND, String> domain2 = new DiscreteDomain<MatrixND, String>(); + DiscreteDomain domain2 = new DiscreteDomain(); domain2.getValues().put("m1", matrix1); domain2.getValues().put("m2", matrix2); factor2.setDomain(domain2); factor2.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim"); factor2.setValueForIdentifier("m2"); - List<Factor<?,?>> factors1 = new ArrayList<Factor<?,?>>(); - factors1.add(factor1); - factors1.add(factor2); + FactorGroup factorGroup = new FactorGroup("test", true); + factorGroup.addFactor(factor1); + factorGroup.addFactor(factor2); - return factors1; + return factorGroup; } /* @@ -117,7 +117,7 @@ final JTree tree = new JTree(); tree.setRootVisible(true); - FactorTreeModel model = new FactorTreeModel(getFactors()); + FactorTreeModel model = new FactorTreeModel(getFactorGroup()); tree.setModel(model); tree.setCellRenderer(new FactorTreeCellRenderer()); Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUtilsTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUtilsTest.java 2010-02-04 15:51:08 UTC (rev 2981) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUtilsTest.java 2010-02-04 16:04:31 UTC (rev 2982) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin, Chatellier Eric + * Copyright (C) 2009 - 2010 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
participants (1)
-
chatellier＠users.labs.libre-entreprise.org