Author: sletellier Date: 2009-03-23 14:33:34 +0000 (Mon, 23 Mar 2009) New Revision: 2026 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java Log: Using only Double for continuous factors Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java 2009-03-23 14:19:32 UTC (rev 2025) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java 2009-03-23 14:33:34 UTC (rev 2026) @@ -51,11 +51,11 @@ action.addContinuousFactor(name, path, getMin(defaultPanel), getMax(defaultPanel), cOrigine, exist); } } - protected static Serializable getMin(DefaultContinuousPanel defaultPanel){ - return (Serializable)Double.parseDouble(defaultPanel.getMin()); + protected static Double getMin(DefaultContinuousPanel defaultPanel){ + return Double.parseDouble(defaultPanel.getMin()); } - protected static Serializable getMax(DefaultContinuousPanel defaultPanel){ - return (Serializable)Double.parseDouble(defaultPanel.getMax()); + protected static Double getMax(DefaultContinuousPanel defaultPanel){ + return Double.parseDouble(defaultPanel.getMax()); } public static void saveDiscret(JComponent cOrigine, String name, String path, List<JComponent> components, SimulAction action, boolean exist){ List<Serializable> values = new ArrayList<Serializable>(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-03-23 14:19:32 UTC (rev 2025) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-03-23 14:33:34 UTC (rev 2026) @@ -836,8 +836,8 @@ return factors.get(name); } - public void addContinuousFactor(String name, String path, Serializable min, - Serializable max, JComponent c, boolean exist) { + public void addContinuousFactor(String name, String path, Double min, + Double max, JComponent c, boolean exist) { Factor f = new Factor(name); ContinuousDomain<Serializable> domain = new ContinuousDomain<Serializable>(); domain.setMinBound(min); @@ -881,7 +881,7 @@ } public void addContinuousMatrixFactor(String name, String path, - Serializable min, Serializable max, MatrixND matrix, + Double min, Double max, MatrixND matrix, String operateur, JComponent c, boolean exist) { Factor f = new Factor(name); MatrixContinuousDomain<Serializable> domain = new MatrixContinuousDomain<Serializable>();