Allow specification of constraint with expr() method

Author: whart222

Diff for: lib/coek/coek/compact/constraint_sequence.cpp

@@ -29,6 +29,11 @@ class ConstraintSequenceRepn {
         : constraint_template(con), context(context_), name(name_)
     {
     }
+
+    ConstraintSequenceRepn(const std::string& name_, const SequenceContext& context_)
+        : context(context_), name(name_)
+    {
+    }
 };
 
 //
@@ -174,6 +179,17 @@ ConstraintSequence::ConstraintSequence(const std::string& name, const SequenceCo
     repn = std::make_shared<ConstraintSequenceRepn>(name, context_, expr);
 }
 
+ConstraintSequence::ConstraintSequence(const std::string& name, const SequenceContext& context_)
+{
+    repn = std::make_shared<ConstraintSequenceRepn>(name, context_);
+}
+
+ConstraintSequence& ConstraintSequence::expr(const Constraint& expr)
+{
+    repn->constraint_template = expr;
+    return *this;
+}
+
 ConstraintSeqIterator ConstraintSequence::begin()
 {
     return ConstraintSeqIterator(repn.get(), false);

Diff for: lib/coek/coek/compact/constraint_sequence.hpp

@@ -42,8 +42,10 @@ class ConstraintSequence {
    public:
     ConstraintSequence(const std::shared_ptr<ConstraintSequenceRepn>& _repn);
     ConstraintSequence(const SequenceContext& context, const Constraint& con);
-    ConstraintSequence(const std::string& name, const SequenceContext& context,
-                       const Constraint& con);
+    ConstraintSequence(const std::string& name, const SequenceContext& context, const Constraint& con);
+    ConstraintSequence(const std::string& name, const SequenceContext& context);
+
+    ConstraintSequence& expr(const Constraint& con);
 
     ConstraintSeqIterator begin();
     ConstraintSeqIterator end();
@@ -64,4 +66,10 @@ inline ConstraintSequence constraint(const std::string& name, const Constraint&
     return seq;
 }
 
+inline ConstraintSequence constraint(const std::string& name, const SequenceContext& context)
+{
+    ConstraintSequence seq(name, context);
+    return seq;
+}
+
 }  // namespace coek