Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WQCKms.java @ 2182:5ff481ab24a1
Refactored class hierachy to integrate model for W~W.
flys-artifacts/trunk@3786 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
---|---|
date | Fri, 27 Jan 2012 10:45:34 +0000 |
parents | 035c0095b427 |
children | 5642a83420f2 |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WQCKms.java Fri Jan 27 10:32:09 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WQCKms.java Fri Jan 27 10:45:34 2012 +0000 @@ -2,40 +2,39 @@ import gnu.trove.TDoubleArrayList; - /** * This class represents a pool of data triples that consists of 'W', 'Q' and * 'KM' data with corrected 'W' values computed by a BackJumpCorrector. * * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a> */ -public class WQCKms extends WQKms { - - protected TDoubleArrayList cw; +public class WQCKms +extends WQKms +{ + protected TDoubleArrayList cws; public WQCKms() { } public WQCKms(WQKms other, double [] cws) { - this.w = other.w; - this.q = other.q; + this.ws = other.ws; + this.qs = other.qs; this.kms = other.kms; - this.cw = new TDoubleArrayList(cws); + this.cws = new TDoubleArrayList(cws); } public WQCKms(double[] kms, double[] qs, double[] ws, double[] cws) { super(kms, qs, ws); - this.cw = new TDoubleArrayList(cws); + this.cws = new TDoubleArrayList(cws); } @Override public void removeNaNs() { - removeNaNs(new TDoubleArrayList [] { w, q, cw, kms }); + removeNaNs(new TDoubleArrayList [] { ws, qs, cws, kms }); } - /** * Adds a new row to this data pool with corrected W. * @@ -45,10 +44,14 @@ * @param cw The corrected W. */ public void add(double w, double q, double kms, double cw) { - add(w, q, kms); - this.cw.add(cw); + super.add(w, q, kms); + cws.add(cw); } + @Override + public double[] get(int idx) { + return get(idx, new double[4]); + } /** * This method returns a 4dim array of W, Q,Kms and corrected W. @@ -66,15 +69,15 @@ return dst; } - if (cw != null && cw.size() > idx) { - dst[3] = cw.getQuick(idx); + if (cws != null && cws.size() > idx) { + dst[3] = cws.getQuick(idx); } return dst; } public double getC(int idx) { - return cw.getQuick(idx); + return cws.getQuick(idx); } @@ -84,7 +87,7 @@ * @return the double array of corrected W values. */ public double[] getCWs() { - return cw.toNativeArray(); + return cws.toNativeArray(); } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :