diff artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineCalculation.java @ 9246:c08d5cfa4981

some hibernate queries on bedheigts for salix
author gernotbelger
date Thu, 12 Jul 2018 11:15:42 +0200
parents b9505aa78cdd
children 600e1ac42049
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineCalculation.java	Wed Jul 11 14:45:01 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineCalculation.java	Thu Jul 12 11:15:42 2018 +0200
@@ -83,7 +83,7 @@
             result = new SalixLineCalculationNoScenarioResult("Ergebnis 1", null, rows);
         } else {
 
-            if (scenario.equals("scenarioType.option1")) {
+            if (scenario.equals("scenarioType.option1")) { // REGIONAL
 
                 final int[] scenarios = accessSalix.getRegionalScenarioIntegers();
                 final List<SalixScenario> list = new ArrayList<>();
@@ -93,8 +93,8 @@
                 row1.putValue(UInfoResultType.customMultiRowColSalixRegionalValue_Dwspl, list);//
                 rows.add(row1);
                 result = new SalixLineCalculationRegionalResult("Ergebnis 1 regional test", null, rows, scenarios);
-            } else if (scenario.equals("scenarioType.option2")) {
-                // SupraRegional
+
+            } else if (scenario.equals("scenarioType.option2")) { // SUPRA-REGIONAL
 
                 final String supraRegional = accessSalix.getSupraRegionalString();
                 final List<SalixZone> list = SalixZone.parse(supraRegional);
@@ -112,9 +112,9 @@
                     rangeScenarioMap.put(zonerange, salixscen);
                 }
 
-                // make calculation (replace
+                // make calculation
                 double currentKm = range.getMinimumDouble();
-                final double step = 0.1;
+                final double step = 0.1; // TODO: get from global setting?
                 while (currentKm < range.getMaximumDouble()) {
                     final ResultRow rowSupraRegional = ResultRow.create(). //
                             putValue(GeneralResultType.station, currentKm).//
@@ -123,7 +123,7 @@
 
                     final SalixScenario scenarioCurrentKm = findScenarioByKm(currentKm, rangeScenarioMap);
 
-                    if (scenarioCurrentKm != null) { // should not happen, scenarioCurrentKm == 0 -> BUG
+                    if (scenarioCurrentKm != null) { // should not happen, scenarioCurrentKm == null -> BUG
                         rowSupraRegional.putValue(UInfoResultType.salix_line_scenario, scenarioCurrentKm.getSalixValue());
                         rowSupraRegional.putValue(UInfoResultType.salix_line_scenario_dwspl, scenarioCurrentKm.getDwspl());
                     }
@@ -134,16 +134,12 @@
 
                 result = new SalixLineCalculationSupraRegionalResult("Ergebnis 1 supra regional test", null, rows);
 
-            } else if (scenario.equals("scenarioType.option3")) {
-                // historisch
+            } else if (scenario.equals("scenarioType.option3")) { // HISTORICAL
                 row1.putValue(UInfoResultType.salixlinehist, 2).//
                         putValue(UInfoResultType.salixlinescen, 82);
             }
-
         }
-
         results.addResult(result, problems);
-
         return new CalculationResult(results, problems);
     }
 
@@ -157,5 +153,4 @@
         }
         return null;
     }
-
 }
\ No newline at end of file

http://dive4elements.wald.intevation.org