Remove CalibratorAccumulate

metno · Feb 6, 2015 · 3248ee5 · 3248ee5
1 parent de38ad3
commit 3248ee5
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/src/Calibrator/Calibrator.cpp b/src/Calibrator/Calibrator.cpp
@@ -39,6 +39,7 @@ Calibrator* Calibrator::getScheme(std::string iName, const Options& iOptions) {
       CalibratorCloud* c = new CalibratorCloud(Variable::Precip, Variable::getType(variable));
       return c;
    }
+   /*
    else if(iName == "accumulate") {
       std::string variable;
       if(!iOptions.getValue("variable", variable)) {
@@ -47,6 +48,7 @@ Calibrator* Calibrator::getScheme(std::string iName, const Options& iOptions) {
       CalibratorAccumulate* c = new CalibratorAccumulate(Variable::getType(variable));
       return c;
    }
+   */
    else if(iName == "smooth") {
       std::string variable;
       if(!iOptions.getValue("variable", variable)) {

diff --git a/src/Calibrator/Calibrator.h b/src/Calibrator/Calibrator.h
@@ -32,7 +32,7 @@ class Calibrator {
 #include "Cloud.h"
 // #include "Wind.h"
 #include "Temperature.h"
-#include "Accumulate.h"
+// #include "Accumulate.h"
 #include "Smooth.h"
 #include "Phase.h"
 #include "WindDirection.h"

diff --git a/src/Calibrator/Accumulate.cpp → src/Calibrator/devel/Accumulate.cpp b/src/Calibrator/Accumulate.cpp → src/Calibrator/devel/Accumulate.cpp
diff --git a/src/Calibrator/Accumulate.h → src/Calibrator/devel/Accumulate.h b/src/Calibrator/Accumulate.h → src/Calibrator/devel/Accumulate.h
diff --git a/src/Driver/Gpp.cpp b/src/Driver/Gpp.cpp
@@ -49,7 +49,6 @@ int main(int argc, const char *argv[]) {
       std::cout << "Calibrators with options (and default values):" << std::endl;
       std::cout << CalibratorZaga::description();
       std::cout << CalibratorCloud::description();
-      std::cout << CalibratorAccumulate::description();
       std::cout << CalibratorWindDirection::description();
       std::cout << CalibratorSmooth::description();
       std::cout << CalibratorPhase::description();

diff --git a/src/Testing/Setup.cpp b/src/Testing/Setup.cpp
@@ -7,7 +7,7 @@ typedef Setup MetSetup;
 namespace {
 
    TEST(SetupTest, test1) {
-      MetSetup setup(Util::split("input output -v T -c zaga parameters=testing/files/parameters.txt -c accumulate -d smart searchRadius=11"));
+      MetSetup setup(Util::split("input output -v T -c zaga parameters=testing/files/parameters.txt -c smooth -d smart searchRadius=11"));
       EXPECT_EQ(1,           setup.variableConfigurations.size());
       EXPECT_EQ(2,           setup.variableConfigurations[0].calibrators.size());
       EXPECT_EQ(Variable::T, setup.variableConfigurations[0].variable);
@@ -40,14 +40,14 @@ namespace {
       EXPECT_EQ("nearestNeighbour", setup.variableConfigurations[0].downscaler->name());
    }
    TEST(SetupTest, complicated) {
-      MetSetup setup(Util::split("input output -v T -d nearestNeighbour -d smart -c smooth -c accumulate -c smooth -v Precip -c zaga parameters=testing/files/parameters.txt -d gradient"));
+      MetSetup setup(Util::split("input output -v T -d nearestNeighbour -d smart -c smooth -c cloud -c smooth -v Precip -c zaga parameters=testing/files/parameters.txt -d gradient"));
       ASSERT_EQ(2,            setup.variableConfigurations.size());
       VariableConfiguration varconf = setup.variableConfigurations[0];
       EXPECT_EQ(Variable::T,  varconf.variable);
       EXPECT_EQ("smart",      varconf.downscaler->name());
       ASSERT_EQ(3,            varconf.calibrators.size());
       EXPECT_EQ("smooth",     varconf.calibrators[0]->name());
-      EXPECT_EQ("accumulate", varconf.calibrators[1]->name());
+      EXPECT_EQ("cloud",      varconf.calibrators[1]->name());
       EXPECT_EQ("smooth",     varconf.calibrators[2]->name());
 
       EXPECT_EQ(Variable::Precip, setup.variableConfigurations[1].variable);
@@ -120,7 +120,7 @@ namespace {
       MetSetup setup3(Util::split("input output -v T -d smart -c smooth"));
       MetSetup setup4(Util::split("input output -v T -d smart -c smooth smooth"));
       MetSetup setup5(Util::split("input output -v T -d smart -c smooth smooth -v Precip -d smart"));
-      MetSetup setup6(Util::split("input output -v T -d nearestNeighbour -d smart -c smooth accumulate smooth -v Precip -d smart"));
+      MetSetup setup6(Util::split("input output -v T -d nearestNeighbour -d smart -c smooth cloud smooth -v Precip -d smart"));
       MetSetup setup7(Util::split("input output -v T -d nearestNeighbour -v Precip -d smart"));
       MetSetup setup8(Util::split("input output -v T -d smart numSmart=2 -c smooth -v Precip -d smart"));
       MetSetup setup9(Util::split("input output -v T -d smart numSmart=2 -v Precip -d smart"));