Skip to content

Commit

Permalink
added to-by support for stepranges
Browse files Browse the repository at this point in the history
  • Loading branch information
@danovaro
danovaro committed Apr 8, 2024
1 parent 0fcf92b commit b1843f0
Show file tree
Hide file tree
Showing 6 changed files with 81 additions and 47 deletions.
2 changes: 1 addition & 1 deletion VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.11.9
1.11.10
3 changes: 2 additions & 1 deletion src/metkit/mars/StepRange.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@ void StepRange::print(std::ostream& s) const
eckit::Time t{static_cast<long>(to_*3600.), true};

TimeUnit unit = std::min(maxUnit(f), maxUnit(t));
s << canonical(f, unit) << '-' << canonical(t, unit);
// s << canonical(f, unit) << '-' << canonical(t, unit);
s << canonical(f) << '-' << canonical(t);
}
}

Expand Down
9 changes: 9 additions & 0 deletions src/metkit/mars/StepRange.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,12 @@ class StepRange {

operator std::string() const;

StepRange& operator+=(const eckit::Time& step) {
from_ += step/3600.;
to_ += step/3600.;
return *this;
}

bool operator==(const StepRange& other) const
{ return from_ == other.from_ && to_ == other.to_; }

Expand All @@ -69,6 +75,9 @@ class StepRange {
bool operator<(const StepRange& other) const
{ return (from_ != other.from_)?(from_<other.from_):(to_<other.to_); }

bool operator<=(const StepRange& other) const
{ return (from_ != other.from_)?(from_<=other.from_):(to_<=other.to_); }

bool operator>(const StepRange& other) const
{ return other < *this; }

Expand Down
25 changes: 14 additions & 11 deletions src/metkit/mars/TypeRange.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,14 @@ void TypeRange::print(std::ostream &out) const {
out << "TypeRange[name=" << name_ << "]";
}

bool TypeRange::expand(const MarsExpandContext& ctx, std::string& value) const {

StepRange TypeRange::parse(std::string& value) const {
eckit::Tokenizer parse("-");
std::vector<std::string> result;

parse(value, result);
switch (result.size()) {
case 1: {
value = StepRange(eckit::Time(result[0], true));
return true;
return StepRange(eckit::Time(result[0], true));
}
case 2: {
eckit::Time start = eckit::Time(result[0], true);
Expand All @@ -60,15 +58,20 @@ bool TypeRange::expand(const MarsExpandContext& ctx, std::string& value) const {
oss << name_ + ": initial value " << start << " cannot be greater that final value " << end;
throw eckit::BadValue(oss.str());
}
value = StepRange(start, end);
return true;
return StepRange(start, end);
}
default:
std::ostringstream oss;
oss << name_ + ": invalid value " << value << " " << result.size();
throw eckit::BadValue(oss.str());
}
return false;
}
}

bool TypeRange::expand(const MarsExpandContext& ctx, std::string& value) const {

value = parse(value);
return true;

}

void TypeRange::expand(const MarsExpandContext& ctx, std::vector<std::string>& values) const {
Expand All @@ -93,10 +96,10 @@ void TypeRange::expand(const MarsExpandContext& ctx, std::vector<std::string>& v
throw eckit::BadValue(oss.str());
}

eckit::Time from = eckit::Time(values[i - 1], true);
StepRange from = parse(values[i - 1]);
// unit = maxUnit(from);

eckit::Time to = eckit::Time(values[i + 1], true);
StepRange to = parse(values[i + 1]);
eckit::Time by = by_;

if (i+2 < values.size() && eckit::StringTools::lower(values[i + 2]) == "by") {
Expand All @@ -121,7 +124,7 @@ void TypeRange::expand(const MarsExpandContext& ctx, std::vector<std::string>& v
oss << name_ + ": 'by' value " << by << " must be a positive number";
throw eckit::BadValue(name_ + ": 'by' value must be a positive number");
}
eckit::Time j = from;
StepRange j = from;
j += by;
for (; j <= to; j += by) {
newval.emplace_back(StepRange(j));
Expand Down
5 changes: 5 additions & 0 deletions src/metkit/mars/TypeRange.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
namespace metkit {
namespace mars {

class StepRange;
//----------------------------------------------------------------------------------------------------------------------

class TypeRange : public Type {
Expand All @@ -36,6 +37,10 @@ class TypeRange : public Type {
virtual void expand(const MarsExpandContext& ctx,
std::vector<std::string>& values) const override;

StepRange parse(std::string& value) const;

private: // attributes

eckit::Time by_;

};
Expand Down
84 changes: 50 additions & 34 deletions tests/test_expand.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include "metkit/mars/Type.h"

#include "eckit/testing/Test.h"
#include "eckit/utils/Tokenizer.h"

using namespace eckit::testing;

Expand Down Expand Up @@ -233,44 +234,59 @@ CASE( "test_metkit_expand_12_time" ) {
void stepThrows(std::vector<std::string> values) {
expandKeyThrows("step", values);
}
void step(std::vector<std::string> values, std::vector<std::string> expected) {
void step(std::string valuesStr, std::string expectedStr) {
eckit::Tokenizer parse("/");
std::vector<std::string> values;
std::vector<std::string> expected;

parse(valuesStr, values);
parse(expectedStr, expected);

expandKey("step", values, expected);
}

CASE( "test_metkit_expand_13_step" ) {
step({"0"}, {"0"});
step({"1"}, {"1"});
step({"24"}, {"24"});
step({"144"}, {"144"});
step({"012"}, {"12"});
step({"12:30"}, {"12h30m"});
step({"1:00"}, {"1"});
step({"1:0:0"}, {"1"});
step({"1h"}, {"1"});
step({"60m"}, {"1"});
step({"1h60m"}, {"2"});
step({"0:5"}, {"5m"});
step({"0:05"}, {"5m"});
step({"0:05:0"}, {"5m"});
step({"0:06"}, {"6m"});
step({"0:10"}, {"10m"});
step({"0:12"}, {"12m"});
step({"0:15"}, {"15m"});
step({"0:20"}, {"20m"});
step({"0:25"}, {"25m"});
step({"0:30"}, {"30m"});
step({"0:35"}, {"35m"});
step({"0:40"}, {"40m"});
step({"0:45"}, {"45m"});
step({"0:50"}, {"50m"});
step({"0:55"}, {"55m"});
step({"0-24"}, {"0-24"});
step({"0-24s"}, {"0s-24s"});
step({"0-120s"}, {"0m-2m"});
step({"0s-120m"}, {"0-2"});
step({"1-2"}, {"1-2"});
step({"30m-1"}, {"30m-60m"});

step("0", "0");
step("1", "1");
step("24", "24");
step("144", "144");
step("012", "12");
step("12:30", "12h30m");
step("1:00", "1");
step("1:0:0", "1");
step("1h", "1");
step("60m", "1");
step("1h60m", "2");
step("0:5", "5m");
step("0:05", "5m");
step("0:05:0", "5m");
step("0:06", "6m");
step("0:10", "10m");
step("0:12", "12m");
step("0:15", "15m");
step("0:20", "20m");
step("0:25", "25m");
step("0:30", "30m");
step("0:35", "35m");
step("0:40", "40m");
step("0:45", "45m");
step("0:50", "50m");
step("0:55", "55m");
step("0-24", "0-24");
step("0-24s", "0-24s");
step("0-120s", "0-2m");
step("0s-120m", "0-2");
step("1-2", "1-2");
step("30m-1", "30m-1");
step("30m-90m", "30m-1h30m");

step("0/to/24/by/3", "0/3/6/9/12/15/18/21/24");
step("12/to/48/by/12", "12/24/36/48");
step("12/to/47/by/12", "12/24/36");
step("0/to/6/by/30m", "0/30m/1/1h30m/2/2h30m/3/3h30m/4/4h30m/5/5h30m/6");
step("0-6/to/18-24/by/6", "0-6/6-12/12-18/18-24");
step("0-24/to/48-72/by/24", "0-24/24-48/48-72");
step("0/to/24/by/3/0-6/to/18-24/by/6", "0/3/6/9/12/15/18/21/24/0-6/6-12/12-18/18-24");
}


Expand Down

0 comments on commit b1843f0

Please sign in to comment.