Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Parameters.java @ 2729:a441be7f1589
Added Fix calculation.
flys-artifacts/trunk@4462 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
---|---|
date | Tue, 22 May 2012 17:09:27 +0000 |
parents | ae0742f92cd5 |
children | c1f2e792704a |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Parameters.java Tue May 22 15:29:54 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Parameters.java Tue May 22 17:09:27 2012 +0000 @@ -2,43 +2,11 @@ import gnu.trove.TDoubleArrayList; -import java.util.Map; - import java.io.Serializable; public class Parameters implements Serializable { - public static class Parameter - implements Serializable - { - public String name; - public double value; - - public Parameter() { - } - - public Parameter(String name, double value) { - this.name = name; - this.value = value; - } - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public double getValue() { - return value; - } - - public void setValue(double value) { - this.value = value; - } - } // Parameter - protected String [] columnNames; protected TDoubleArrayList [] columns; @@ -65,23 +33,7 @@ return -1; } - public void add(Parameter [] parameters) { - - int N = columns[0].size(); - - for (int i = 0; i < columns.length; ++i) { - columns[i].add(Double.NaN); - } - - for (Parameter parameter: parameters) { - int index = columnIndex(parameter.getName()); - if (index >= 0) { - columns[index].setQuick(N, parameter.getValue()); - } - } - } - - public void add(Map<String, Double> parameters) { + public int newRow() { int N = columns[0].size(); @@ -89,31 +41,7 @@ columns[i].add(Double.NaN); } - for (Map.Entry<String, Double> entry: parameters.entrySet()) { - int index = columnIndex(entry.getKey()); - Double v = entry.getValue(); - if (index >= 0 && v != null) { - columns[index].setQuick(N, v); - } - } - } - - public Parameter [] get(int i) { - Parameter [] parameters = new Parameter[columns.length]; - for (int j = 0; i < parameters.length; ++j) { - parameters[j] = new Parameter(columnNames[j], Double.NaN); - } - return get(i, parameters); - } - - public Parameter [] get(int i, Parameter [] parameters) { - for (Parameter parameter: parameters) { - int index = columnIndex(parameter.getName()); - if (index >= 0) { - parameter.setValue(columns[index].getQuick(i)); - } - } - return parameters; + return N; } public double get(int i, int index) { @@ -127,6 +55,13 @@ : Double.NaN; } + public void set(int i, String columnName, double value) { + int idx = columnIndex(columnName); + if (idx >= 0) { + columns[i].setQuick(idx, value); + } + } + public int size() { return columns[0].size(); }