Add handling of Active Constraints which Constraint Sets contain less…

… parameter constraints than Constraint Sets of Sender Caps

Development/nmos-cpp-node/node_implementation.cpp

@@ -1513,7 +1513,8 @@ nmos::experimental::details::streamcompatibility_active_constraints_put_handler
             if (!nmos::caps::meta::enabled(constraint_set)) continue;
             for (const auto& sender_caps_constraint_set : sender_capabilities.as_array())
             {
-                if (nmos::experimental::is_constraint_subset(sender_caps_constraint_set, constraint_set))
+                if (nmos::experimental::is_constraint_subset(sender_caps_constraint_set, constraint_set, true) || // the Constraint Set makes Sender Constraint Set's constraints narrower
+                    nmos::experimental::is_constraint_subset(constraint_set, sender_caps_constraint_set)) // the Constraint Set is wider than the Sender Constraint Set so the latter is always compliant
                 {
                     return true;
                 }
@@ -1722,6 +1723,7 @@ nmos::experimental::node_implementation make_node_implementation(nmos::node_mode
     {
         node_implementation
             .on_set_effective_edid(make_node_implementation_streamcompatibility_effective_edid_setter(model.streamcompatibility_resources, gate)); // may be omitted if not required
+
     }
 
     return node_implementation;

Development/nmos/constraints.cpp

@@ -93,12 +93,21 @@ namespace nmos
 
         // Constraint Set B is a subset of Constraint Set A if all Parameter Constraints of Constraint Set A are present in Constraint Set B, and for each Parameter Constraint
         // that is present in both, the Parameter Constraint of Constraint Set B is a subconstraint of the Parameter Constraint of Constraint Set A.
-        bool is_constraint_subset(const web::json::value& constraint_set, const web::json::value& constraint_subset)
+        bool is_constraint_subset(const web::json::value& constraint_set, const web::json::value& constraint_subset, bool merge)
         {
             using web::json::value;
 
             const auto& param_constraints_set = constraint_set.as_object();
-            const auto& param_constraints_subset = constraint_subset.as_object();
+            auto param_constraints_subset = constraint_subset.as_object();
+
+            if (merge)
+            {
+                param_constraints_subset = param_constraints_set;
+                std::for_each(constraint_subset.as_object().begin(), constraint_subset.as_object().end(), [&param_constraints_subset](const std::pair<utility::string_t, value>& subconstraint)
+                {
+                    param_constraints_subset[subconstraint.first] = subconstraint.second;
+                });
+            }
 
             return param_constraints_set.end() == std::find_if_not(param_constraints_set.begin(), param_constraints_set.end(), [&param_constraints_subset](const std::pair<utility::string_t, value>& constraint)
             {

Development/nmos/constraints.h

@@ -14,7 +14,7 @@ namespace nmos
     namespace experimental
     {
         bool is_subconstraint(const web::json::value& constraint, const web::json::value& subconstraint);
-        bool is_constraint_subset(const web::json::value& constraint_set, const web::json::value& constraint_subset);
+        bool is_constraint_subset(const web::json::value& constraint_set, const web::json::value& constraint_subset, bool merge = false);
     }
 }