From ad3c36aa9aa3d1f46bec4610690ff56674006e01 Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Thu, 26 Sep 2024 13:21:53 +0200 Subject: [PATCH] fixup 2 --- ortools/sat/go/cpmodel/cp_model.go | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/ortools/sat/go/cpmodel/cp_model.go b/ortools/sat/go/cpmodel/cp_model.go index 195aa110cc..3eb77ecb93 100644 --- a/ortools/sat/go/cpmodel/cp_model.go +++ b/ortools/sat/go/cpmodel/cp_model.go @@ -897,24 +897,21 @@ func (cp *Builder) AddNoOverlap(vars ...IntervalVar) Constraint { // AddNoOverlap2D adds a no_overlap2D constraint that prevents a set of boxes from overlapping. func (cp *Builder) AddNoOverlap2D() NoOverlap2DConstraint { return NoOverlap2DConstraint{cp.appendConstraint(&cmpb.ConstraintProto{ - Constraint: &cmpb.ConstraintProto_NoOverlap_2D{&cmpb.NoOverlap2DConstraintProto{}, - }})} + Constraint: &cmpb.ConstraintProto_NoOverlap_2D{&cmpb.NoOverlap2DConstraintProto{}}})} } // AddCircuitConstraint adds a circuit constraint to the model. The circuit constraint is // defined on a graph where the arcs are present if the corresponding literals are set to true. func (cp *Builder) AddCircuitConstraint() CircuitConstraint { return CircuitConstraint{cp.appendConstraint(&cmpb.ConstraintProto{ - Constraint: &cmpb.ConstraintProto_Circuit{&cmpb.CircuitConstraintProto{}, - }})} + Constraint: &cmpb.ConstraintProto_Circuit{&cmpb.CircuitConstraintProto{}}})} } // AddMultipleCircuitConstraint adds a multiple circuit constraint to the model, aka the "VRP" // (Vehicle Routing Problem) constraint. func (cp *Builder) AddMultipleCircuitConstraint() MultipleCircuitConstraint { return MultipleCircuitConstraint{cp.appendConstraint(&cmpb.ConstraintProto{ - Constraint: &cmpb.ConstraintProto_Routes{&cmpb.RoutesConstraintProto{}, - }})} + Constraint: &cmpb.ConstraintProto_Routes{&cmpb.RoutesConstraintProto{}}})} } // AddAllowedAssignments adds an allowed assignments constraint to the model. When all variables @@ -927,8 +924,7 @@ func (cp *Builder) AddAllowedAssignments(vars ...IntVar) TableConstraint { } return TableConstraint{cp.appendConstraint(&cmpb.ConstraintProto{ - Constraint: &cmpb.ConstraintProto_Table{&cmpb.TableConstraintProto{Vars: varsInd}, - }})} + Constraint: &cmpb.ConstraintProto_Table{&cmpb.TableConstraintProto{Vars: varsInd}}})} } // AddReservoirConstraint adds a reservoir constraint with optional refill/emptying events. @@ -1126,7 +1122,7 @@ func (cp *Builder) AddDecisionStrategy(vars []IntVar, vs cmpb.DecisionStrategyPr Variables: indices, VariableSelectionStrategy: vs, DomainReductionStrategy: ds, - }) + }) } // Model returns the built CP model proto. The proto returned is a pointer to the proto in Builder,