Author: chatellier Date: 2011-05-12 10:41:06 +0000 (Thu, 12 May 2011) New Revision: 3320 Log: Remove operator from factor's domain (now operator is always *) Removed: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/OperatorComboModel.java 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/DomXMLParser.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/MatrixContinuousDomainXMLVisitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.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/domain/ContinuousDomain.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/ui/sensitivity/DefaultContinuousPanelUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.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/simulator/launcher/SimulationServiceTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomainTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomainTest.java 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 2011-05-12 09:42:22 UTC (rev 3319) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java 2011-05-12 10:41:06 UTC (rev 3320) @@ -51,9 +51,8 @@ xmlBuffer.append(" cardinality=\"" + cDomain.getCardinality() + "\">"); // facteur continue pourcentage - if (cDomain.getOperator() != null) { + if (cDomain.getCoefficient() != null || cDomain.getReferenceValue() != null) { xmlBuffer.append("<percentage coefficient=\"" + cDomain.getCoefficient() + "\""); - xmlBuffer.append(" operator=\"" + cDomain.getOperator() + "\""); xmlBuffer.append(" reference=\"" + cDomain.getReferenceValue() + "\" />"); } else { 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 2011-05-12 09:42:22 UTC (rev 3319) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java 2011-05-12 10:41:06 UTC (rev 3320) @@ -122,7 +122,6 @@ MatrixContinuousDomain mdomain = new MatrixContinuousDomain(); Element coefficientElement = fixedElement.element("coefficient"); mdomain.setCoefficient(Double.valueOf(coefficientElement.attributeValue("value"))); - mdomain.setOperator(coefficientElement.attributeValue("operator")); // <mx name="test1" step="0">... Element matrixElement = fixedElement.element("mx"); @@ -136,7 +135,6 @@ EquationContinuousDomain edomain = new EquationContinuousDomain(); Element coefficientElement = fixedElement.element("coefficient"); edomain.setCoefficient(Double.valueOf(coefficientElement.attributeValue("value"))); - edomain.setOperator(coefficientElement.attributeValue("operator")); Element equationElement = fixedElement.element("equation"); edomain.setReferenceValue(Double.valueOf(equationElement.attributeValue("reference"))); @@ -151,7 +149,6 @@ Element percentageElement = fixedElement.element("percentage"); if (percentageElement != null) { domain.setCoefficient(Double.valueOf(percentageElement.attributeValue("coefficient"))); - domain.setOperator(percentageElement.attributeValue("operator")); domain.setReferenceValue(Double.valueOf(percentageElement.attributeValue("reference"))); } else { @@ -191,7 +188,6 @@ Element coefficientElement = fixedElement.element("coefficient"); mdomain.setCoefficient(Double.valueOf(coefficientElement.attributeValue("value"))); - mdomain.setOperator(coefficientElement.attributeValue("operator")); // matrix specific Element matrixElement = fixedElement.element("mx"); @@ -207,7 +203,6 @@ Element coefficientElement = fixedElement.element("coefficient"); edomain.setCoefficient(Double.valueOf(coefficientElement.attributeValue("value"))); - edomain.setOperator(coefficientElement.attributeValue("operator")); Element equationElement = fixedElement.element("equation"); edomain.setReferenceValue(Double.valueOf(equationElement.attributeValue("reference"))); @@ -222,7 +217,6 @@ Element percentageElement = fixedElement.element("percentage"); if (percentageElement != null) { domain.setCoefficient(Double.valueOf(percentageElement.attributeValue("coefficient"))); - domain.setOperator(percentageElement.attributeValue("operator")); domain.setReferenceValue(Double.valueOf(percentageElement.attributeValue("reference"))); } else { 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 2011-05-12 09:42:22 UTC (rev 3319) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationContinuousDomainXMLVisitor.java 2011-05-12 10:41:06 UTC (rev 3320) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 1999 - 2010 Ifremer, CodeLutin, Chatellier Eric + * Copyright (C) 1999 - 2011 Ifremer, CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -48,7 +48,7 @@ EquationContinuousDomain eDomain = (EquationContinuousDomain)domain; // since 3.3.0.0 coefficient element is outside equation element - xmlBuffer.append("<coefficient value=\"" + eDomain.getCoefficient() + "\" operator=\"" + eDomain.getOperator() + "\" />"); + xmlBuffer.append("<coefficient value=\"" + eDomain.getCoefficient() + "\" />"); xmlBuffer.append("<equation variable=\"" + eDomain.getVariableName()+ "\""); xmlBuffer.append(" reference=\"" + eDomain.getReferenceValue() + "\" />"); } 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 2011-05-12 09:42:22 UTC (rev 3319) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/MatrixContinuousDomainXMLVisitor.java 2011-05-12 10:41:06 UTC (rev 3320) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 Ifremer, CodeLutin, CHatellier Eric + * Copyright (C) 2009 - 2011 Ifremer, CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -49,7 +49,7 @@ MatrixContinuousDomain mDomain = (MatrixContinuousDomain)domain; // since 3.3.0.0 coefficient element is outside matrix element - xmlBuffer.append("<coefficient value=\"" + mDomain.getCoefficient() + "\" operator=\"" + mDomain.getOperator() + "\" />"); + xmlBuffer.append("<coefficient value=\"" + mDomain.getCoefficient() + "\" />"); xmlBuffer.append(MexicoHelper.getMatrixAsXML(mDomain.getMatrix())); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java 2011-05-12 09:42:22 UTC (rev 3319) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java 2011-05-12 10:41:06 UTC (rev 3320) @@ -79,8 +79,6 @@ /** Context value used in equation. */ protected Map<String, Double> contextEquationValue = new HashMap<String, Double>(); - /** Operator used in equation values */ - protected Map<String, String> contextEquationOperator = new HashMap<String, String>(); private static ThreadLocal<SimulationContext> simulationContext = new ThreadLocal<SimulationContext>() { protected synchronized SimulationContext initialValue() { @@ -329,15 +327,13 @@ } /** - * Add value/key pair into context. + * Add value/key pair into context (computed value). * * @param key key * @param value value - * @param operator operator */ - public void setValue(String key, Double value, String operator) { + public void setComputeValue(String key, Double value) { contextEquationValue.put(key, value); - contextEquationOperator.put(key, operator); } /** @@ -351,30 +347,16 @@ double result = defaultValue; - if (contextEquationValue.containsKey(key) && contextEquationOperator.containsKey(key)) { + if (contextEquationValue.containsKey(key)) { Double value = contextEquationValue.get(key); - String operator = contextEquationOperator.get(key); if (log.isTraceEnabled()) { log.trace("Found key '" + key + "' current value = " + value); } - - if ("+".equals(operator)) { - result = value + defaultValue; - } - else if ("-".equals(operator)) { - result = value - defaultValue; - } - else if ("*".equals(operator)) { - result = value * defaultValue; - } - else if ("/".equals(operator)) { - result = value / defaultValue; - } - else { - throw new IllegalArgumentException("Unknown operator '" + operator + "'"); - } + + // since 3.4.0.0, operator is always * + result = value * defaultValue; } else { if (log.isTraceEnabled()) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-05-12 09:42:22 UTC (rev 3319) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-05-12 10:41:06 UTC (rev 3320) @@ -597,10 +597,8 @@ } // cas special 3 : equation else if (factor.getDomain() instanceof EquationContinuousDomain) { - EquationContinuousDomain domain = (EquationContinuousDomain)factor.getDomain(); - buffer.append("context.setValue(\"").append(factor.getName()); - buffer.append("\",").append(factor.getValue()).append(",\""); - buffer.append(domain.getOperator()).append("\");\n"); + buffer.append("context.setComputeValue(\"").append(factor.getName()); + buffer.append("\",").append(factor.getValue()).append(");\n"); } // cas pas si special else { 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 2011-05-12 09:42:22 UTC (rev 3319) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java 2011-05-12 10:41:06 UTC (rev 3320) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 Ifremer, CodeLutin + * Copyright (C) 2009 - 2011 Ifremer, CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as 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 2011-05-12 09:42:22 UTC (rev 3319) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2011-05-12 10:41:06 UTC (rev 3320) @@ -50,9 +50,6 @@ /** Borne supérieure. */ protected double maxBound; - /** Operation. (=,+,-,/) */ - protected String operator; - /** Coefficient in percent */ protected Double coefficient; @@ -110,24 +107,6 @@ } /** - * Get operator. - * - * @return the operator - */ - public String getOperator() { - return operator; - } - - /** - * Set operator. - * - * @param operator the operator to set - */ - public void setOperator(String operator) { - this.operator = operator; - } - - /** * Get coefficient. * * @return the coefficient 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 2011-05-12 09:42:22 UTC (rev 3319) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java 2011-05-12 10:41:06 UTC (rev 3320) @@ -46,7 +46,8 @@ /** * Value used to create the factor. - * @deprecated since 20110421 : on ne fait rien de la value ? + * + * Only used by sensitivity analysis scripts. */ protected Double value; @@ -104,17 +105,10 @@ public Double getValueForIdentifier(Double identifier) { this.value = identifier; - - if (operator.equals("+")) { - return ((Double) (referenceValue + ((referenceValue + coefficient) * ((2 * value - 1))))); - } else if (operator.equals("-")) { - return ((Double) (referenceValue + ((referenceValue - coefficient) * ((2 * value - 1))))); - } else if (operator.equals("*")) { - return ((Double) (referenceValue + ((referenceValue * coefficient) * ((2 * value - 1))))); - } else if (operator.equals("/")) { - return ((Double) (referenceValue + ((referenceValue / coefficient) * ((2 * value - 1))))); - } - return identifier; + + // since 3.4.0.0, operator is always * + Double result = ((Double) (referenceValue + ((referenceValue * coefficient) * ((2 * value - 1))))); + return result; } /* @@ -129,7 +123,6 @@ * Get value used to create the equation. * * @return the value - * @deprecated since 20110421, on n'en fait rien de la value. */ public Double getValue() { return this.value; @@ -139,7 +132,6 @@ * Set value used to create the equation. * * @param value the value to set - * @deprecated since 20110421, on n'en fait rien de la value. */ public void setValue(Double value) { this.value = value; @@ -152,7 +144,6 @@ cloned.setMaxBound(this.maxBound); cloned.setMinBound(this.minBound); cloned.setCoefficient(this.coefficient); - cloned.setOperator(this.operator); cloned.setValue(this.value); cloned.setReferenceValue(this.referenceValue); cloned.setVariableName(this.variableName); @@ -161,7 +152,7 @@ @Override public String toString() { - String result = "variableName=" + variableName + " operator=" + operator + + String result = "variableName=" + variableName + " 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 2011-05-12 09:42:22 UTC (rev 3319) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java 2011-05-12 10:41:06 UTC (rev 3320) @@ -48,7 +48,8 @@ /** * Value used to create the matrix - * @deprecated since 20110421, on n'en fait rien de la value. + * + * Only used by sensitivity analysis scripts. */ protected double value; @@ -105,31 +106,13 @@ this.value = (Double)identifier; MatrixND temp = this.matrix.copy(); - if (operator.equals("+")) { - temp.map(new MapFunction() { - public double apply(double val) { - return (val + ((val + coefficient) * ((2 * value - 1)))); - } - }); - } else if (operator.equals("-")) { - temp.map(new MapFunction() { - public double apply(double val) { - return (val + ((val - coefficient) * ((2 * value - 1)))); - } - }); - } else if (operator.equals("*")) { - temp.map(new MapFunction() { - public double apply(double val) { - return (val + ((val * coefficient) * ((2 * value - 1)))); - } - }); - } else if (operator.equals("/")) { - temp.map(new MapFunction() { - public double apply(double val) { - return (val + ((val / coefficient) * ((2 * value - 1)))); - } - }); - } + + // since 3.4.0.0, operator is always * + temp.map(new MapFunction() { + public double apply(double val) { + return (val + ((val * coefficient) * ((2 * value - 1)))); + } + }); return temp; } @@ -145,7 +128,6 @@ * Get value used to create the matrix. * * @return the value - * @deprecated since 20110421, on n'en fait rien de la value. */ public Double getValue() { return this.value; @@ -155,7 +137,6 @@ * Set value used to create the matrix. * * @param value the value to set - * @deprecated since 20110421, on n'en fait rien de la value. */ public void setValue(Double value) { this.value = value; @@ -174,17 +155,9 @@ * @return the real minimum bound */ public Double getRealMinBound() { - if (operator.equals("+")) { - return (1.0 + ((1.0 + coefficient) * ((2 * 0.0 - 1)))); - } else if (operator.equals("-")) { - return (1.0 + ((1.0 - coefficient) * ((2 * 0.0 - 1)))); - } else if (operator.equals("*")) { - return (1.0 + ((1.0 * coefficient) * ((2 * 0.0 - 1)))); - } else if (operator.equals("/")) { - return (1.0 + ((1.0 / coefficient) * ((2 * 0.0 - 1)))); - } else { - return null; - } + // since 3.4.0.0, operator is always * + Double result = (1.0 + ((1.0 * coefficient) * ((2 * 0.0 - 1)))); + return result; } /** @@ -194,16 +167,9 @@ * @return the real maximum bound */ public Double getRealMaxBound() { - if (operator.equals("+")) { - return (1.0 + ((1.0 + coefficient) * ((2 * 1.0 - 1)))); - } else if (operator.equals("-")) { - return (1.0 + ((1.0 - coefficient) * ((2 * 1.0 - 1)))); - } else if (operator.equals("*")) { - return (1.0 + ((1.0 * coefficient) * ((2 * 1.0 - 1)))); - } else if (operator.equals("/")) { - return (1.0 + ((1.0 / coefficient) * ((2 * 1.0 - 1)))); - } else { - return null; - } + // since 3.4.0.0, operator is always * + Double result = (1.0 + ((1.0 * coefficient) * ((2 * 1.0 - 1)))); + return result; + } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanelUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanelUI.jaxx 2011-05-12 09:42:22 UTC (rev 3319) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanelUI.jaxx 2011-05-12 10:41:06 UTC (rev 3320) @@ -34,17 +34,16 @@ </import> <script><![CDATA[ -public void init(String min, String max, String referenceValue, String coefficient, String operator) { +public void init(String min, String max, String referenceValue, String coefficient) { continueMin.setText(min); continueMax.setText(max); referenceValueField.setText(referenceValue); coefficientField.setText(coefficient); - operatorField.setSelectedItem(operator); } -public void initExisting(String min, String max, String referenceValue, String coefficient, String operator) { - init(min, max, referenceValue, coefficient, operator); - setPercentageTypeFactor(StringUtils.isNotBlank(operator)); +public void initExisting(String min, String max, String referenceValue, String coefficient) { + init(min, max, referenceValue, coefficient); + setPercentageTypeFactor(StringUtils.isNotBlank(referenceValue) || StringUtils.isNotBlank(coefficient)); } @Override @@ -56,10 +55,8 @@ if (percentageTypeFactor) { Double coefficient = Double.parseDouble(coefficientField.getText().trim()); Double referenceValue = Double.parseDouble(referenceValueField.getText().trim()); - String operator = (String)operatorField.getSelectedItem(); valid = coefficient != null && - referenceValue != null && - operator != null; + referenceValue != null; } else { Double minValue = Double.parseDouble(continueMin.getText().trim()); @@ -112,17 +109,6 @@ enabled='{isContinueSelected() && isPercentageTypeFactor()}'/> </cell> </row> - <row> - <cell fill='horizontal'> - <JLabel text='isisfish.sensitivity.operator' visible='{isContinuePossible()}' - enabled='{isContinueSelected() && isPercentageTypeFactor()}'/> - </cell> - <cell fill='horizontal' weightx='0.5'> - <JComboBox id='operatorField' visible='{isContinuePossible()}' - enabled='{isContinueSelected() && isPercentageTypeFactor()}' - model="{new OperatorComboModel()}"/> - </cell> - </row> </Table> </JPanel> </cell> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx 2011-05-12 09:42:22 UTC (rev 3319) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx 2011-05-12 10:41:06 UTC (rev 3320) @@ -58,10 +58,8 @@ _("isisfish.sensitivity.equation.variable.name"), _("isisfish.sensitivity.equation.variable.value"), _("isisfish.sensitivity.equation.variable.coefficient"), - _("isisfish.sensitivity.equation.variable.operator"), _("isisfish.sensitivity.equation.variable.action")}; protected List<EquationContinuousDomain> domains = new ArrayList<EquationContinuousDomain>(); -protected List<JComboBox> operateurs = new ArrayList<JComboBox>(); protected List<JButton> actions = new ArrayList<JButton>(); public List<EquationContinuousDomain> getDomains() { @@ -107,8 +105,6 @@ Double result = domains.get(rowIndex).getCoefficient() * 100; return result; } else if (columnIndex == 3) { - return domains.get(rowIndex).getOperator(); - } else if (columnIndex == 4) { return _("isisfish.sensitivity.validDiscretNumber"); } return null; @@ -124,8 +120,6 @@ domains.get(rowIndex).setReferenceValue(Double.parseDouble((String)aValue)); } else if (columnIndex == 2) { domains.get(rowIndex).setCoefficient(Double.parseDouble((String)aValue) / 100); - } else if (columnIndex == 3) { - domains.get(rowIndex).setOperator((String)aValue); } } } @@ -140,22 +134,6 @@ return model; } -protected JComboBox getOperateur() { - JComboBox result = new JComboBox(new OperatorComboModel()); - operateurs.add(result); - result.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - JComboBox source = (JComboBox)e.getSource(); - int i = operateurs.indexOf(source); - if (domains.size() < i) { - domains.get(i).setOperator((String)source.getSelectedItem()); - } - } - }); - return result; -} - protected void newButton() { JButton result = new JButton(); result.setText(_("isisfish.sensitivity.validDiscretNumber")); @@ -192,8 +170,7 @@ protected void setTable() { params.setModel(getTableModel()); - params.getColumnModel().getColumn(3).setCellEditor(new DefaultCellEditor(getOperateur())); - params.getColumnModel().getColumn(4).setCellEditor(new TableCellEditor() { + params.getColumnModel().getColumn(3).setCellEditor(new TableCellEditor() { @Override public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { @@ -245,7 +222,6 @@ protected void removeVariable() { int selectedRow = params.getSelectedRow(); domains.remove(selectedRow); - operateurs.remove(selectedRow); actions.remove(selectedRow); setTable(); } @@ -259,7 +235,6 @@ || domain.getCoefficient() == null || domain.getCoefficient() > 100 || domain.getCoefficient() <= 0 - || domain.getOperator() == null || domain.getVariableName() == null) { } else { valid = false; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx 2011-05-12 09:42:22 UTC (rev 3319) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx 2011-05-12 10:41:06 UTC (rev 3320) @@ -32,9 +32,7 @@ boolean valid = false; Double coefficient = Double.parseDouble(coef.getText().trim()); - String selectedOperator = (String)operator.getSelectedItem(); - valid = coefficient != null && - selectedOperator != null; + valid = coefficient != null; return valid; } @@ -59,15 +57,6 @@ <JTextField id='coef' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> </cell> </row> - <row> - <cell fill='horizontal'> - <JLabel text='isisfish.sensitivity.operator' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> - </cell> - <cell fill='horizontal' weightx='1' columns='3'> - <JComboBox id='operator' visible='{isContinuePossible()}' enabled='{isContinueSelected()}' - model="{new OperatorComboModel()}"/> - </cell> - </row> </Table> </JPanel> </ContinuousPanelContainerUI> \ No newline at end of file Deleted: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/OperatorComboModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/OperatorComboModel.java 2011-05-12 09:42:22 UTC (rev 3319) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/OperatorComboModel.java 2011-05-12 10:41:06 UTC (rev 3320) @@ -1,65 +0,0 @@ -/* - * #%L - * - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -package fr.ifremer.isisfish.ui.sensitivity; - -import java.util.ArrayList; -import java.util.List; - -import javax.swing.DefaultComboBoxModel; - -/** - * Modèle de combo box pour les operateurs des facteurs. - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public class OperatorComboModel extends DefaultComboBoxModel { - - /** serialVersionUID. */ - private static final long serialVersionUID = -1880800720890228942L; - - protected static final List<String> OPERATORS = new ArrayList<String>(); - - static { - OPERATORS.add("+"); - OPERATORS.add("-"); - OPERATORS.add("*"); - OPERATORS.add("/"); - } - - @Override - public int getSize() { - return OPERATORS.size(); - } - - @Override - public Object getElementAt(int index) { - return OPERATORS.get(index); - } -} Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2011-05-12 09:42:22 UTC (rev 3319) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2011-05-12 10:41:06 UTC (rev 3320) @@ -613,7 +613,7 @@ max = values.substring(first + 1); } } - ui.init(min, max, min, null, null); + ui.init(min, max, min, null); result = ui; } else if (value instanceof Equation) { @@ -635,7 +635,7 @@ result = matrixPanel; } else { DefaultContinuousPanelUI ui = new DefaultContinuousPanelUI(); - ui.init(String.valueOf(value), String.valueOf(value), String.valueOf(value), null, null); + ui.init(String.valueOf(value), String.valueOf(value), String.valueOf(value), null); result = ui; } @@ -698,21 +698,19 @@ if (matrix != null) { panel.setMatrix(matrix.clone()); } - panel.getOperator().setSelectedItem(matrixDomain.getOperator()); panel.getCoef().setText(String.valueOf(matrixDomain.getCoefficient() * 100)); result = panel; } else { DefaultContinuousPanelUI continuousPanel = new DefaultContinuousPanelUI(); // factor numerique continue (percentage) - if (domain.getOperator() != null) { + if (domain.getReferenceValue() != null || domain.getCoefficient() != null) { // il y a bien 3 fois domain.getReferenceValue() pas d'erreur continuousPanel.initExisting( String.valueOf(domain.getReferenceValue()), String.valueOf(domain.getReferenceValue()), String.valueOf(domain.getReferenceValue()), - String.valueOf(domain.getCoefficient()), - String.valueOf(domain.getOperator())); + String.valueOf(domain.getCoefficient())); } else { // factor numerique continue (min/max) @@ -721,8 +719,7 @@ String.valueOf(domain.getMinBound()), String.valueOf(domain.getMaxBound()), String.valueOf(domain.getMinBound()), - "", - null); + ""); } result = continuousPanel; } @@ -886,9 +883,7 @@ Double coef = Double.valueOf(matrixPanel.getCoef().getText()) / 100; //MatrixND matrix = matrixPanel.getMatrix(); // always null MatrixND matrix = matrixPanel.getComponentPanel().getMatrix(); - String operateur = (String)matrixPanel.getOperator().getSelectedItem(); - action.addContinuousMatrixFactor(name, comment, path, coef, matrix, - operateur, exist); + action.addContinuousMatrixFactor(name, comment, path, coef, matrix, exist); } else if (panel instanceof EquationContinuousPanelUI) { try { @@ -916,9 +911,8 @@ if (defaultPanel.isPercentageTypeFactor()) { Double referenceValue = Double.valueOf(defaultPanel.getReferenceValueField().getText()); Double coefficient = Double.valueOf(defaultPanel.getCoefficientField().getText()); - String operator = (String)defaultPanel.getOperatorField().getSelectedItem(); - action.addContinuousFactor(name, comment, path, - referenceValue, coefficient, operator, exist); + action.addContinuousPercentageFactor(name, comment, path, + referenceValue, coefficient, exist); } else { double minBound = Double.parseDouble(defaultPanel.getContinueMin().getText()); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2011-05-12 09:42:22 UTC (rev 3319) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2011-05-12 10:41:06 UTC (rev 3320) @@ -923,16 +923,14 @@ * @param path * @param referenceValue * @param coefficient - * @param operator * @param exist */ - public void addContinuousFactor(String name, String comment, String path, Double referenceValue, - Double coefficient, String operator, boolean exist) { + public void addContinuousPercentageFactor(String name, String comment, String path, Double referenceValue, + Double coefficient, boolean exist) { Factor f = new Factor(name); ContinuousDomain domain = new ContinuousDomain(); domain.setReferenceValue(referenceValue); domain.setCoefficient(coefficient); - domain.setOperator(operator); f.setDomain(domain); f.setComment(comment); f.setPath(path); @@ -989,12 +987,10 @@ } public void addContinuousMatrixFactor(String name, String comment, String path, - Double coef, MatrixND matrix, - String operateur, boolean exist) { + Double coef, MatrixND matrix, boolean exist) { Factor f = new Factor(name); MatrixContinuousDomain domain = new MatrixContinuousDomain(); domain.setMatrix(matrix); - domain.setOperator(operateur); domain.setCoefficient(coef); f.setComment(comment); f.setDomain(domain); 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 2011-05-12 09:42:22 UTC (rev 3319) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2011-05-12 10:41:06 UTC (rev 3320) @@ -146,7 +146,6 @@ MatrixContinuousDomain domain4 = new MatrixContinuousDomain(); domain4.setCoefficient(0.799); domain4.setMatrix(matrix1); - domain4.setOperator("-"); factorMatrixContinuous.setDomain(domain4); factorMatrixContinuous.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#minLength"); @@ -156,7 +155,6 @@ domain5.setCoefficient(0.1); domain5.setReferenceValue(45.0); domain5.setVariableName("L1"); - domain5.setOperator("-"); factorEquationContinuous.setDomain(domain5); factorEquationContinuous.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#maxLength"); @@ -165,7 +163,6 @@ ContinuousDomain domain6 = new ContinuousDomain(); domain6.setCoefficient(5.0); domain6.setReferenceValue(14.0); - domain6.setOperator("*"); domain6.setCardinality(5); factorContinuousPercentage.setDomain(domain6); factorContinuousPercentage.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1142003453434#0.223499349929004#size"); @@ -267,9 +264,9 @@ // assert on continuous factor (percentage, non percentage) (3.4.0.0) ContinuousDomain domain1 = (ContinuousDomain)factors.get(0).getDomain(); - Assert.assertNull(domain1.getOperator()); + Assert.assertNull(domain1.getCoefficient()); ContinuousDomain domain6 = (ContinuousDomain)factors.get(5).getDomain(); - Assert.assertNotNull(domain6.getOperator()); + Assert.assertNotNull(domain6.getCoefficient()); } /** 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 2011-05-12 09:42:22 UTC (rev 3319) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2011-05-12 10:41:06 UTC (rev 3320) @@ -330,7 +330,6 @@ Factor factorEquation = new Factor("test.equation.name.K1"); EquationContinuousDomain domain1 = new EquationContinuousDomain(); domain1.setReferenceValue(10.0); - domain1.setOperator("-"); domain1.setCoefficient(0.1); domain1.setVariableName("K1"); factorEquation.setDomain(domain1); @@ -350,7 +349,7 @@ // le nom de la valeur de la variable n'apparait pas "en elle meme" // dans le prescript, il y a seulement le nom // du facteur. Charge à l'UI de savoir comment l'afficher - Assert.assertTrue(scriptContent.contains("\"test.equation.name.K1\",8.02,\"-\"")); + Assert.assertTrue(scriptContent.contains("context.setComputeValue(\"test.equation.name.K1\",9.8)")); } /** Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java 2011-05-12 09:42:22 UTC (rev 3319) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java 2011-05-12 10:41:06 UTC (rev 3320) @@ -153,7 +153,6 @@ MatrixContinuousDomain domain = new MatrixContinuousDomain (); domain.setMatrix(matrix1); domain.setCoefficient(0.1); - domain.setOperator("*"); factor.setDomain(domain); factor.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim"); factor.setValueForIdentifier(0.1); @@ -179,13 +178,12 @@ MatrixContinuousDomain domain2 = new MatrixContinuousDomain(); domain2.setMatrix(matrix2); domain2.setCoefficient(0.1); - domain2.setOperator("/"); factor2.setDomain(domain2); factor2.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim"); - factor2.setValueForIdentifier(0.1); + factor2.setValueForIdentifier(0.2); - Assert.assertEquals(-7.0, ((MatrixND)factor2.getValue()).getValue(new int[] { 0, 0 }),0.0000001); - Assert.assertEquals(-21.0, ((MatrixND)factor2.getValue()).getValue(new int[] { 2, 0 }),0.0000001); + Assert.assertEquals(0.94, ((MatrixND)factor2.getValue()).getValue(new int[] { 0, 0 }),0.0000001); + Assert.assertEquals(2.82, ((MatrixND)factor2.getValue()).getValue(new int[] { 2, 0 }),0.0000001); Assert.assertEquals(0,((ContinuousDomain)factor.getDomain()).getMinBound(),0); Assert.assertEquals(1,((ContinuousDomain)factor.getDomain()).getMaxBound(),0); @@ -203,14 +201,13 @@ Factor factor3 = new Factor("testmatrix"); MatrixContinuousDomain domain3 = new MatrixContinuousDomain(); domain3.setMatrix(matrix3); - domain3.setCoefficient(0.1); - domain3.setOperator("-"); + domain3.setCoefficient(0.2); factor3.setDomain(domain3); factor3.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim"); factor3.setValueForIdentifier(0.1); - Assert.assertEquals(0.28, ((MatrixND)factor3.getValue()).getValue(new int[] { 0, 0 }),0.0000001); - Assert.assertEquals(0.68, ((MatrixND)factor3.getValue()).getValue(new int[] { 2, 0 }),0.0000001); + Assert.assertEquals(0.84, ((MatrixND)factor3.getValue()).getValue(new int[] { 0, 0 }),0.0000001); + Assert.assertEquals(2.52, ((MatrixND)factor3.getValue()).getValue(new int[] { 2, 0 }),0.0000001); Assert.assertEquals(0,((ContinuousDomain)factor.getDomain()).getMinBound(),0); Assert.assertEquals(1,((ContinuousDomain)factor.getDomain()).getMaxBound(),0); @@ -228,14 +225,13 @@ Factor factor4 = new Factor("testmatrix"); MatrixContinuousDomain domain4 = new MatrixContinuousDomain(); domain4.setMatrix(matrix4); - domain4.setCoefficient(0.1); - domain4.setOperator("+"); + domain4.setCoefficient(0.3); factor4.setDomain(domain4); factor4.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim"); - factor4.setValueForIdentifier(0.1); + factor4.setValueForIdentifier(0.4); - Assert.assertEquals(0.12, ((MatrixND)factor4.getValue()).getValue(new int[] { 0, 0 }),0.0000001); - Assert.assertEquals(0.52, ((MatrixND)factor4.getValue()).getValue(new int[] { 2, 0 }),0.0000001); + Assert.assertEquals(0.94, ((MatrixND)factor4.getValue()).getValue(new int[] { 0, 0 }),0.0000001); + Assert.assertEquals(2.82, ((MatrixND)factor4.getValue()).getValue(new int[] { 2, 0 }),0.0000001); Assert.assertEquals(0,((ContinuousDomain)factor.getDomain()).getMinBound(),0); Assert.assertEquals(1,((ContinuousDomain)factor.getDomain()).getMaxBound(),0); @@ -256,7 +252,6 @@ Factor factor = new Factor("testequation"); EquationContinuousDomain domain = new EquationContinuousDomain(); domain.setCoefficient(0.1); - domain.setOperator("*"); domain.setVariableName("Linf"); domain.setReferenceValue(3.0); factor.setDomain(domain); @@ -272,14 +267,13 @@ Factor factor2 = new Factor("testequation"); EquationContinuousDomain domain2 = new EquationContinuousDomain(); domain2.setCoefficient(0.1); - domain2.setOperator("/"); domain2.setVariableName("Linf"); domain2.setReferenceValue(3.0); factor2.setDomain(domain2); factor2.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim"); factor2.setValueForIdentifier(0.1); - Assert.assertEquals(-21.0, (Double)factor2.getValue(),0.0000001); + Assert.assertEquals(2.76, (Double)factor2.getValue(),0.0000001); Assert.assertEquals(0,((ContinuousDomain)factor.getDomain()).getMinBound(),0); Assert.assertEquals(1,((ContinuousDomain)factor.getDomain()).getMaxBound(),0); @@ -287,29 +281,27 @@ Factor factor3 = new Factor("testequation"); EquationContinuousDomain domain3 = new EquationContinuousDomain(); domain3.setCoefficient(0.1); - domain3.setOperator("+"); domain3.setVariableName("Linf"); domain3.setReferenceValue(3.0); factor3.setDomain(domain3); factor3.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim"); - factor3.setValueForIdentifier(0.1); + factor3.setValueForIdentifier(0.2); - Assert.assertEquals(0.52, (Double)factor3.getValue(),0.0000001); + Assert.assertEquals(2.82, (Double)factor3.getValue(),0.0000001); Assert.assertEquals(0,((ContinuousDomain)factor.getDomain()).getMinBound(),0); Assert.assertEquals(1,((ContinuousDomain)factor.getDomain()).getMaxBound(),0); // factor 4 Factor factor4 = new Factor("testequation"); EquationContinuousDomain domain4 = new EquationContinuousDomain(); - domain4.setCoefficient(0.1); - domain4.setOperator("-"); + domain4.setCoefficient(0.05); domain4.setVariableName("Linf"); domain4.setReferenceValue(3.0); factor4.setDomain(domain4); factor4.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim"); factor4.setValueForIdentifier(0.1); - Assert.assertEquals(0.68, (Double)factor4.getValue(),0.0000001); + Assert.assertEquals(2.88, (Double)factor4.getValue(),0.0000001); Assert.assertEquals(0,((ContinuousDomain)factor.getDomain()).getMinBound(),0); Assert.assertEquals(1,((ContinuousDomain)factor.getDomain()).getMaxBound(),0); Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomainTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomainTest.java 2011-05-12 09:42:22 UTC (rev 3319) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomainTest.java 2011-05-12 10:41:06 UTC (rev 3320) @@ -52,7 +52,6 @@ domain.setCardinality(5); // child domain.setVariableName("varname"); - domain.setOperator("/"); domain.setCoefficient(0.05); domain.setReferenceValue(90.0); domain.setValue(89.5); @@ -65,7 +64,6 @@ Assert.assertEquals(0.74, clone.maxBound); // getter return 1.0 Assert.assertEquals(5, clone.getCardinality()); Assert.assertEquals("varname", clone.getVariableName()); - Assert.assertEquals("/", clone.getOperator()); Assert.assertEquals(0.05, clone.getCoefficient()); Assert.assertEquals(90.0, clone.getReferenceValue()); Assert.assertEquals(89.5, clone.getValue()); Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomainTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomainTest.java 2011-05-12 09:42:22 UTC (rev 3319) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomainTest.java 2011-05-12 10:41:06 UTC (rev 3320) @@ -59,7 +59,6 @@ domain.setCardinality(5); // child domain.setMatrix(matrix); - domain.setOperator("/"); domain.setCoefficient(0.05); domain.setValue(89.5); @@ -71,7 +70,6 @@ Assert.assertEquals(0.74, clone.maxBound); // getter return 1.0 Assert.assertEquals(5, clone.getCardinality()); Assert.assertEquals(matrix, clone.getMatrix()); - Assert.assertEquals("/", clone.getOperator()); Assert.assertEquals(0.05, clone.getCoefficient()); Assert.assertEquals(89.5, clone.getValue()); }