# HG changeset patch
# User Sascha L. Teichmann <sascha.teichmann@intevation.de>
# Date 1342717064 0
# Node ID 7f7ab030a4e3987dcae67bc61068c031c99719f2
# Parent  da7cf0e3ccaa56aa26dbf0c320ee7e0b1db4016b
FixA: Minor refactoring

flys-artifacts/trunk@5074 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r da7cf0e3ccaa -r 7f7ab030a4e3 flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Thu Jul 19 16:35:14 2012 +0000
+++ b/flys-artifacts/ChangeLog	Thu Jul 19 16:57:44 2012 +0000
@@ -1,3 +1,11 @@
+2012-07-19	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
+
+	* src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisCalculation.java:
+	  Some minor refactoring.
+
+	* src/main/java/de/intevation/flys/artifacts/model/fixings/FixRealizingCalculation.java:
+	  Call super constructor to retrieve the common data from the artifact.
+
 2012-07-19	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
 
 	* src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java:
diff -r da7cf0e3ccaa -r 7f7ab030a4e3 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisCalculation.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisCalculation.java	Thu Jul 19 16:35:14 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisCalculation.java	Thu Jul 19 16:57:44 2012 +0000
@@ -1,5 +1,7 @@
 package de.intevation.flys.artifacts.model.fixings;
 
+import de.intevation.artifacts.common.utils.StringUtils;
+
 import de.intevation.flys.artifacts.access.FixAnalysisAccess;
 
 import de.intevation.flys.artifacts.math.fitting.Function;
@@ -47,6 +49,11 @@
 
     public static final double EPSILON = 1e-4;
 
+    // TODO: Move to base class?
+    public static final String [] STANDARD_COLUMNS = {
+        "km", "chi_sqr", "max_q", "std-dev"
+    };
+
     protected DateRange    referencePeriod;
     protected DateRange [] analysisPeriods;
 
@@ -135,7 +142,8 @@
         String [] parameterNames = func.getParameterNames();
 
         Parameters results =
-            new Parameters(createColumnNames(parameterNames));
+            new Parameters(
+                StringUtils.join(STANDARD_COLUMNS, parameterNames));
 
         boolean invalid = false;
 
@@ -540,15 +548,5 @@
 
         return columns;
     }
-
-    protected static String [] createColumnNames(String [] parameters) {
-        String [] result = new String[parameters.length + 4];
-        result[0] = "km";
-        result[1] = "chi_sqr";
-        result[2] = "max_q";
-        result[3] = "std-dev";
-        System.arraycopy(parameters, 0, result, 4, parameters.length);
-        return result;
-    }
 }
 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
diff -r da7cf0e3ccaa -r 7f7ab030a4e3 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixRealizingCalculation.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixRealizingCalculation.java	Thu Jul 19 16:35:14 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixRealizingCalculation.java	Thu Jul 19 16:57:44 2012 +0000
@@ -22,6 +22,8 @@
     }
 
     public FixRealizingCalculation(FixRealizingAccess access) {
+        super(access);
+
         Boolean       isQ      = access.isQ();
         List<Segment> segments = access.getSegments();
 
@@ -42,8 +44,11 @@
     }
 
     public CalculationResult calculate() {
+        if (hasProblems()) {
+            return new CalculationResult(this);
+        }
         // TODO: Implement me!
-        return null;
+        return new CalculationResult(this);
     }
 }
 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :