do not create new expressions on no-op modifications

google · Jan 19, 2025 · e600bc3 · e600bc3
1 parent 98593da
commit e600bc3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/ortools/linear_solver/wrappers/model_builder_helper.cc b/ortools/linear_solver/wrappers/model_builder_helper.cc
@@ -1083,10 +1083,12 @@ void AffineExpr::Visit(ExprVisitor& lin, double c) {
 }
 
 std::shared_ptr<LinearExpr> AffineExpr::AddFloat(double cst) {
+  if (cst == 0.0) return shared_from_this();
   return LinearExpr::Affine(expr_, coeff_, offset_ + cst);
 }
 
 std::shared_ptr<LinearExpr> AffineExpr::SubFloat(double cst) {
+  if (cst == 0.0) return shared_from_this();
   return LinearExpr::Affine(expr_, coeff_, offset_ - cst);
 }
 
@@ -1095,6 +1097,8 @@ std::shared_ptr<LinearExpr> AffineExpr::RSubFloat(double cst) {
 }
 
 std::shared_ptr<LinearExpr> AffineExpr::MulFloat(double cst) {
+  if (cst == 0.0) return std::make_shared<FixedValue>(0);
+  if (cst == 1.0) return shared_from_this();
   return LinearExpr::Affine(expr_, coeff_ * cst, offset_ * cst);
 }
 

diff --git a/ortools/sat/python/linear_expr.cc b/ortools/sat/python/linear_expr.cc
@@ -611,10 +611,12 @@ std::string IntAffine::DebugString() const {
 }
 
 std::shared_ptr<LinearExpr> IntAffine::AddInt(int64_t cst) {
+  if (cst == 0) return shared_from_this();
   return LinearExpr::AffineInt(expr_, coeff_, offset_ + cst);
 }
 
 std::shared_ptr<LinearExpr> IntAffine::SubInt(int64_t cst) {
+  if (cst == 0) return shared_from_this();
   return LinearExpr::AffineInt(expr_, coeff_, offset_ - cst);
 }
 
@@ -623,6 +625,8 @@ std::shared_ptr<LinearExpr> IntAffine::RSubInt(int64_t cst) {
 }
 
 std::shared_ptr<LinearExpr> IntAffine::MulInt(int64_t cst) {
+  if (cst == 0) return std::make_shared<IntConstant>(0);
+  if (cst == 1) return shared_from_this();
   return LinearExpr::AffineInt(expr_, coeff_ * cst, offset_ * cst);
 }