added adhocInfo on problem generation (#259)

Co-authored-by: 3rdCore <tom.marty@polytec>
corail-research · Nov 1, 2022 · 3547765 · 3547765
1 parent fa1f87e
commit 3547765
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/src/datagen/coloring.jl b/src/datagen/coloring.jl
@@ -170,6 +170,7 @@ function fill_with_generator!(cpmodel::CPModel, gen::ClusterizedGraphColoringGen
     SeaPearl.addConstraint!(cpmodel, SeaPearl.MaximumConstraint(x, numberOfColors, cpmodel.trailer))
     SeaPearl.addObjective!(cpmodel, numberOfColors)
     cpmodel.knownObjective = k 
+    cpmodel.adhocInfo = nothing
     nothing
 end
 
@@ -207,6 +208,7 @@ function fill_with_generator!(cpmodel::CPModel, gen::BarabasiAlbertGraphGenerato
     SeaPearl.addVariable!(cpmodel, numberOfColors, branchable=false)
     SeaPearl.addConstraint!(cpmodel, SeaPearl.MaximumConstraint(vars, numberOfColors, cpmodel.trailer))
     SeaPearl.addObjective!(cpmodel, numberOfColors)
+    cpmodel.adhocInfo = graph
 
     nothing
 end
@@ -245,6 +247,7 @@ function fill_with_generator!(cpmodel::CPModel, gen::ErdosRenyiGraphGenerator; r
     SeaPearl.addVariable!(cpmodel, numberOfColors, branchable=false)
     SeaPearl.addConstraint!(cpmodel, SeaPearl.MaximumConstraint(vars, numberOfColors, cpmodel.trailer))
     SeaPearl.addObjective!(cpmodel, numberOfColors)
+    cpmodel.adhocInfo = graph
 
     nothing
 end
@@ -278,6 +281,7 @@ function fill_with_generator!(cpmodel::CPModel, gen::WattsStrogatzGraphGenerator
     SeaPearl.addVariable!(cpmodel, numberOfColors, branchable=false)
     SeaPearl.addConstraint!(cpmodel, SeaPearl.MaximumConstraint(vars, numberOfColors, cpmodel.trailer))
     SeaPearl.addObjective!(cpmodel, numberOfColors)
+    cpmodel.adhocInfo = graph
 
     nothing
 end
diff --git a/src/datagen/maxcut.jl b/src/datagen/maxcut.jl
@@ -32,5 +32,6 @@ function fill_with_generator!(cpmodel::CPModel, gen::MaxCutGenerator;  rng::Abst
     SeaPearl.addConstraint!(cpmodel, SeaPearl.SumToZero(edge_vars, cpmodel.trailer)) 
     SeaPearl.addObjective!(cpmodel,objective)
 
+    cpmodel.adhocInfo = graph
     nothing
 end
diff --git a/src/datagen/maximumindependentset.jl b/src/datagen/maximumindependentset.jl
@@ -26,6 +26,7 @@ function fill_with_generator!(cpmodel::CPModel, gen::MaximumIndependentSetGenera
     # sum(x[i]) + objective = 0 <=> objective = -sum(x[i]) 
     SeaPearl.addConstraint!(cpmodel, SeaPearl.SumToZero(vars, cpmodel.trailer)) 
     SeaPearl.addObjective!(cpmodel,objective)
+    cpmodel.adhocInfo = graph
 
     nothing
 end