diff artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/Measurements.java @ 8280:e8283197d889

Added new fraction to sq relation. * New diagram with "Geschiebetransport gesamt(Sohlhöhenrelevant)" * Added the new fraction to overview diagram.
author Raimund Renkert <rrenkert@intevation.de>
date Wed, 17 Sep 2014 09:01:27 +0200
parents b8f94e865875
children 84929f882fa2
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/Measurements.java	Tue Sep 16 14:57:55 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/Measurements.java	Wed Sep 17 09:01:27 2014 +0200
@@ -63,6 +63,13 @@
         }
     };
 
+    public static final SExtractor S_BL2_EXTRACTOR = new SExtractor() {
+        @Override
+        public double getS(Measurement measument) {
+            return measument.S_BL_2();
+        }
+    };
+
     protected List<Measurement> measuments;
     protected List<Measurement> accumulated;
 
@@ -131,6 +138,10 @@
         return extractSQ(accumulated, S_BL_EXTRACTOR);
     }
 
+    public List<SQ> S_BL2() {
+        return extractSQ(accumulated, S_BL2_EXTRACTOR);
+    }
+
     public List<SQ> getSQs(int index) {
         switch (index) {
             case 0: return S_SF();
@@ -139,6 +150,7 @@
             case 3: return S_BL_FG();
             case 4: return S_BL_CG();
             case 5: return S_BL();
+            case 6: return S_BL2();
         }
         log.error("THIS SHOULD NOT HAPPEN: Tried to access SQ[" + index + "]");
         return new ArrayList<SQ>(0);

http://dive4elements.wald.intevation.org