Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WQKms.java @ 678:19a3185822a4
Added error reporting to 'Wasserspiegellage' calculation.
flys-artifacts/trunk@2102 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
---|---|
date | Fri, 10 Jun 2011 15:59:47 +0000 |
parents | 8b0152363bdb |
children | eab5e5089d77 |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WQKms.java Fri Jun 10 14:24:15 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WQKms.java Fri Jun 10 15:59:47 2011 +0000 @@ -111,14 +111,6 @@ this.kms.add(kms); } - - public void add(double[] w, double[] q, double[] kms) { - this.w.add(w); - this.q.add(q); - this.kms.add(kms); - } - - /** * Returns the number of triples stored in this data pool. * @@ -172,37 +164,7 @@ public String toString() { double from = getKms(0); double to = getKms(size()-1); - return Double.toString(from) + " - " + Double.toString(to); - } - - - /** - * Merges the WQKms objects of an incoming 2dim array (table) where the - * objects of a column belong together. - * - * @param toMerge The objects that need to be merged. - * - * @return an array of merged WQKms objects. - */ - public static WQKms[] merge(WQKms[][] toMerge) { - int num = toMerge[0].length; - - // TODO IS THE LENGTH CORRECT? - WQKms[] merged = new WQKms[num]; - for (int i = 0; i < num; i++) { - merged[i] = new WQKms(); - } - - for (int i = 0; i < toMerge.length; i++) { - WQKms[] tmp = toMerge[i]; - - for (int j = 0; j < num; j++) { - WQKms toAdd = tmp[j]; - merged[j].add(toAdd.getWs(), toAdd.getQs(), toAdd.getKms()); - } - } - - return merged; + return from + " - " + to; } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :