Skip to content

Commit

Permalink
mars2grib: Fix not-found for lookup dict
Browse files Browse the repository at this point in the history
  • Loading branch information
@geier1993
geier1993 committed Jan 3, 2025
1 parent 3b172aa commit dc32ce3
Showing 1 changed file with 35 additions and 10 deletions.
45 changes: 35 additions & 10 deletions src/metkit/mars2grib/YAMLRule.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ std::string stringifyLogTrace(const LogTrace& logTrace) {
struct Mapping : Action {
virtual ~Mapping() = default;

Mapping(bool useInitialDict, bool nullIsDefault, bool notFoundIsDefault, const std::string& lookUpKey, std::unique_ptr<Action> defaultAction, MappedActions&& mappedActions) :
useInitialDict_{useInitialDict}, nullIsDefault_{nullIsDefault}, notFoundIsDefault_{notFoundIsDefault}, lookUpKey_{lookUpKey}, defaultAction_{std::move(defaultAction)}, mappedActions_{std::move(mappedActions)} {}
Mapping(bool useInitialDict, bool nullIsDefault, bool notFoundIsDefault, const std::string& lookUpKey, std::unique_ptr<Action> defaultAction, std::unique_ptr<Action> notFoundAction, MappedActions&& mappedActions) :
useInitialDict_{useInitialDict}, nullIsDefault_{nullIsDefault}, notFoundIsDefault_{notFoundIsDefault}, lookUpKey_{lookUpKey}, defaultAction_{std::move(defaultAction)}, notFoundAction_{std::move(notFoundAction)}, mappedActions_{std::move(mappedActions)} {}

void apply(LogTrace& logTrace, const eckit::ValueMap& initial, eckit::ValueMap& workDict, KeySetter& out) const override {
logTrace.push_back(Log{this, {}});
Expand All @@ -113,7 +113,10 @@ struct Mapping : Action {

auto searchLookUpKey = dict.find(lookUpKey_);
if (searchLookUpKey == dict.end()) {
if (notFoundIsDefault_ && defaultAction_) {
if (notFoundAction_) {
applyNext(*notFoundAction_.get());
return;
} else if (notFoundIsDefault_ && defaultAction_) {
applyNext(*defaultAction_.get());
return;
}
Expand Down Expand Up @@ -170,6 +173,7 @@ struct Mapping : Action {
std::string lookUpKey_;

std::unique_ptr<Action> defaultAction_; // Can be null
std::unique_ptr<Action> notFoundAction_; // Can be null
MappedActions mappedActions_;
};

Expand Down Expand Up @@ -326,6 +330,11 @@ std::unique_ptr<Action> buildAction(const eckit::LocalConfiguration& conf, LogTr
bool hasNullIsDefault = conf.has("null-is-default");
bool hasNotFoundIsDefault = conf.has("not-found-is-default");

// Allow separate action than default
bool hasNotFound = conf.has("not-found");




std::string key = conf.getString("key");
logTrace.push_back(Log{NULL, std::string("Build mapping action for key: ") + key});
Expand All @@ -339,6 +348,13 @@ std::unique_ptr<Action> buildAction(const eckit::LocalConfiguration& conf, LogTr
cpyLogTrace.push_back(Log{NULL, std::string("Building default action")});
defaultAction = buildAction(conf.getSubConfiguration("default"), cpyLogTrace);
}

std::unique_ptr<Action> notFoundAction;
if (hasNotFound) {
LogTrace cpyLogTrace{logTrace};
cpyLogTrace.push_back(Log{NULL, std::string("Building not-found action")});
notFoundAction = buildAction(conf.getSubConfiguration("not-found"), cpyLogTrace);
}

if (!hasValueMap) {
logTrace.push_back(Log{NULL, "Key \"value-map\" expected."});
Expand All @@ -357,7 +373,7 @@ std::unique_ptr<Action> buildAction(const eckit::LocalConfiguration& conf, LogTr
mappedActions.insert_or_assign(val, buildAction(valueMap.getSubConfiguration(val), cpyLogTrace));
}

return std::make_unique<Mapping>(useInitialDict, nullIsDefault, notFoundIsDefault, key, std::move(defaultAction), std::move(mappedActions));
return std::make_unique<Mapping>(useInitialDict, nullIsDefault, notFoundIsDefault, key, std::move(defaultAction), std::move(notFoundAction), std::move(mappedActions));
}

// Action is an output
Expand Down Expand Up @@ -414,8 +430,8 @@ std::unique_ptr<Action> buildAction(const eckit::LocalConfiguration& conf, const
struct DictValueLookUp : GenericValueLookUp {
virtual ~DictValueLookUp() = default;

DictValueLookUp(bool useInitialDict, bool nullIsDefault, bool notFoundIsDefault, const std::string& lookUpKey, std::optional<ValueLookUp> defaultValue = {}) :
useInitialDict_{useInitialDict}, nullIsDefault_{nullIsDefault}, notFoundIsDefault_{notFoundIsDefault}, lookUpKey_{lookUpKey}, default_{std::move(defaultValue)} {
DictValueLookUp(bool useInitialDict, bool nullIsDefault, bool notFoundIsDefault, const std::string& lookUpKey, std::optional<ValueLookUp> defaultValue = {}, std::optional<ValueLookUp> notFoundValue = {}) :
useInitialDict_{useInitialDict}, nullIsDefault_{nullIsDefault}, notFoundIsDefault_{notFoundIsDefault}, lookUpKey_{lookUpKey}, default_{std::move(defaultValue)}, notFound_{std::move(notFoundValue)} {
}


Expand Down Expand Up @@ -477,6 +493,7 @@ struct DictValueLookUp : GenericValueLookUp {
bool notFoundIsDefault_;
std::string lookUpKey_;
std::optional<ValueLookUp> default_;
std::optional<ValueLookUp> notFound_;
};


Expand Down Expand Up @@ -598,22 +615,30 @@ std::unique_ptr<GenericValueLookUp> buildLookUp(const eckit::LocalConfiguration&
bool hasDefault = conf.has("default");
bool hasNullIsDefault = conf.has("null-is-default");
bool hasNotFoundIsDefault = conf.has("not-found-is-default");


bool hasNotFound = conf.has("not-found");

std::string key = conf.getString("key");
logTrace.push_back(Log{NULL, std::string("Build dict lookup for key: ") + key});
bool useInitialDict = hasDict ? (conf.getString("dict") == "initial") : false;
bool nullIsDefault = hasNullIsDefault ? conf.getBool("null-is-default") : true;
bool notFoundIsDefault = hasNotFoundIsDefault ? conf.getBool("not-found-is-default") : true;

std::optional<ValueLookUp> defaultAction;
std::optional<ValueLookUp> defaultValue;
if (hasDefault) {
LogTrace cpyLogTrace{logTrace};
cpyLogTrace.push_back(Log{NULL, std::string("Building default lookup")});
defaultAction = parseValueLookUp(conf, "default", cpyLogTrace);
defaultValue = parseValueLookUp(conf, "default", cpyLogTrace);
}

std::optional<ValueLookUp> notFoundValue;
if (hasNotFound) {
LogTrace cpyLogTrace{logTrace};
cpyLogTrace.push_back(Log{NULL, std::string("Building not-found lookup")});
notFoundValue = parseValueLookUp(conf, "not-found", cpyLogTrace);
}

return std::make_unique<DictValueLookUp>(useInitialDict, nullIsDefault, notFoundIsDefault, key, std::move(defaultAction));
return std::make_unique<DictValueLookUp>(useInitialDict, nullIsDefault, notFoundIsDefault, key, std::move(defaultValue), std::move(notFoundValue));
}

if (conf.has("op")) {
Expand Down

0 comments on commit dc32ce3

Please sign in to comment.