aboutsummaryrefslogtreecommitdiff
path: root/src/openvic-simulation/scripts/ConditionalWeight.hpp
diff options
context:
space:
mode:
author zaaarf <80046572+zaaarf@users.noreply.github.com>2024-01-07 23:51:06 +0100
committer GitHub <noreply@github.com>2024-01-07 23:51:06 +0100
commit79b8b73304753fedab822e6aa859fa15673f52cc (patch)
treecb25cfb89f8b06fc34f5c906e658a1b322120089 /src/openvic-simulation/scripts/ConditionalWeight.hpp
parent400469f08f10ffd044d9948c3f0db340c8a60db0 (diff)
parent6f07de81a6ca430c522527958e05440d67b04937 (diff)
Merge pull request #111 from OpenVicProject/conditions-checking
Condition definition checking/loading
Diffstat (limited to 'src/openvic-simulation/scripts/ConditionalWeight.hpp')
-rw-r--r--src/openvic-simulation/scripts/ConditionalWeight.hpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/openvic-simulation/scripts/ConditionalWeight.hpp b/src/openvic-simulation/scripts/ConditionalWeight.hpp
index a965ae1..7453fe9 100644
--- a/src/openvic-simulation/scripts/ConditionalWeight.hpp
+++ b/src/openvic-simulation/scripts/ConditionalWeight.hpp
@@ -21,11 +21,14 @@ namespace OpenVic {
private:
fixed_point_t PROPERTY(base);
std::vector<condition_weight_item_t> PROPERTY(condition_weight_items);
+ scope_t PROPERTY(initial_scope);
+ scope_t PROPERTY(this_scope);
+ scope_t PROPERTY(from_scope);
struct parse_scripts_visitor_t;
public:
- ConditionalWeight() = default;
+ ConditionalWeight(scope_t new_initial_scope, scope_t new_this_scope, scope_t new_from_scope);
ConditionalWeight(ConditionalWeight&&) = default;
static constexpr std::string_view base_key_to_string(base_key_t base_key) {