Add more constructors

Author: metab0t

include/pyoptinterface/core.hpp

@@ -97,6 +97,11 @@ struct VariablePair
 
 	bool operator==(const VariablePair &x) const;
 	bool operator<(const VariablePair &x) const;
+
+	VariablePair() = default;
+	VariablePair(IndexT v1, IndexT v2) : var_1(v1), var_2(v2)
+	{
+	}
 };
 
 template <>
@@ -123,25 +128,25 @@ struct ExprBuilder
 	ExprBuilder(const ScalarAffineFunction &a);
 	ExprBuilder(const ScalarQuadraticFunction &q);
 
-	ExprBuilder& operator+=(CoeffT c);
-	ExprBuilder& operator+=(const VariableIndex &v);
-	ExprBuilder& operator+=(const ScalarAffineFunction &a);
-	ExprBuilder& operator+=(const ScalarQuadraticFunction &q);
-	ExprBuilder& operator+=(const ExprBuilder &t);
-
-	ExprBuilder& operator-=(CoeffT c);
-	ExprBuilder& operator-=(const VariableIndex &v);
-	ExprBuilder& operator-=(const ScalarAffineFunction &a);
-	ExprBuilder& operator-=(const ScalarQuadraticFunction &q);
-	ExprBuilder& operator-=(const ExprBuilder &t);
-
-	ExprBuilder& operator*=(CoeffT c);
-	ExprBuilder& operator*=(const VariableIndex &v);
-	ExprBuilder& operator*=(const ScalarAffineFunction &a);
-	ExprBuilder& operator*=(const ScalarQuadraticFunction &q);
-	ExprBuilder& operator*=(const ExprBuilder &t);
-
-	ExprBuilder& operator/=(CoeffT c);
+	ExprBuilder &operator+=(CoeffT c);
+	ExprBuilder &operator+=(const VariableIndex &v);
+	ExprBuilder &operator+=(const ScalarAffineFunction &a);
+	ExprBuilder &operator+=(const ScalarQuadraticFunction &q);
+	ExprBuilder &operator+=(const ExprBuilder &t);
+
+	ExprBuilder &operator-=(CoeffT c);
+	ExprBuilder &operator-=(const VariableIndex &v);
+	ExprBuilder &operator-=(const ScalarAffineFunction &a);
+	ExprBuilder &operator-=(const ScalarQuadraticFunction &q);
+	ExprBuilder &operator-=(const ExprBuilder &t);
+
+	ExprBuilder &operator*=(CoeffT c);
+	ExprBuilder &operator*=(const VariableIndex &v);
+	ExprBuilder &operator*=(const ScalarAffineFunction &a);
+	ExprBuilder &operator*=(const ScalarQuadraticFunction &q);
+	ExprBuilder &operator*=(const ExprBuilder &t);
+
+	ExprBuilder &operator/=(CoeffT c);
 
 	bool empty() const;
 	int degree() const;

include/pyoptinterface/nlcore.hpp

@@ -10,6 +10,9 @@ struct NLConstraintIndex
 	IndexT dim;
 
 	NLConstraintIndex() = default;
+	NLConstraintIndex(IndexT v, IndexT d) : index(v), dim(d)
+	{
+	}
 };
 
 static const std::string opt_options = "no_compare_op no_conditional_skip no_cumulative_sum_op";