Hash PLConstraint

ampl · Oct 31, 2024 · 2532278 · 2532278
1 parent ad2c60f
commit 2532278
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 2 deletions.
diff --git a/include/mp/flat/constr_functional.h b/include/mp/flat/constr_functional.h
@@ -416,6 +416,10 @@ struct PLPoints {
         0.0 :
         (y_[i1]-y_[i0]) / (x_[i1]-x_[i0]);
   }
+
+  /// operator==
+  bool operator==(const PLPoints& plp) const
+  { return x_==plp.x_ && y_==plp.y_; }
 };
 
 
@@ -433,6 +437,9 @@ class PLConParams {
       plp_ = pls_;
     return plp_;
   }
+  /// operator==
+  bool operator==(const PLConParams& plcp) const
+  { return GetPLPoints() == plcp.GetPLPoints(); }
 
 private:
   PLSlopes pls_;

diff --git a/include/mp/flat/constr_hash.h b/include/mp/flat/constr_hash.h
@@ -15,7 +15,7 @@ namespace std {
 /// Specialize std::hash<> for various expressions and constraints.
 /// Remember we also need operator== for [std::reference_wrapper<> of]
 /// the compared types. Operator=='s are class memebrs, or
-/// defined in ``constraint_keeper.h``.
+/// defined in ``constr_keeper.h``.
 
 /// Partially specialize std::hash<> for CustomFunctionalConstraint<>
 ///
@@ -80,6 +80,35 @@ struct hash< mp::ArrayRef<Element> >
 };
 
 
+/// Specialize std::hash<> for mp::PLPoints
+template <>
+struct hash< mp::PLPoints >
+{
+  size_t operator()(
+      const mp::PLPoints& plp) const
+  {
+    mp::HashStreamer hs;
+    hs.Add(std::hash< std::vector<double> >{}(plp.x_));
+    hs.Add(std::hash< std::vector<double> >{}(plp.y_));
+    return hs.FinalizeHashValue();
+  }
+};
+
+
+/// Specialize std::hash<> for mp::PLConParams
+template <>
+struct hash< mp::PLConParams >
+{
+  size_t operator()(
+      const mp::PLConParams& plp) const
+  {
+    mp::HashStreamer hs;
+    hs.Add(std::hash<mp::PLPoints>{}(plp.GetPLPoints()));
+    return hs.FinalizeHashValue();
+  }
+};
+
+
 /// Partially specialize std::hash<> for ConditionalConstraint<>
 ///
 /// Assumes that std::hash<> is specialized

diff --git a/include/mp/flat/converter.h b/include/mp/flat/converter.h
@@ -1627,7 +1627,7 @@ class FlatConverter :
       IndicatorConstraintQuadEQ, "acc:indquadeq")
   STORE_CONSTRAINT_TYPE__NO_MAP(
       IndicatorConstraintQuadGE, "acc:indquadge")
-  STORE_CONSTRAINT_TYPE__NO_MAP(PLConstraint,
+  STORE_CONSTRAINT_TYPE__WITH_MAP(PLConstraint,
                                 "acc:pl acc:pwl acc:piecewise")
   STORE_CONSTRAINT_TYPE__NO_MAP(SOS1Constraint, "acc:sos1")
   STORE_CONSTRAINT_TYPE__NO_MAP(SOS2Constraint, "acc:sos2")