change sat internal API; stop ignoring random seed in glop

This commit is contained in:
Laurent Perron
2018-05-16 13:43:29 +02:00
parent cb1fc93b94
commit 9402f58d1d
11 changed files with 131 additions and 86 deletions

View File

@@ -71,7 +71,7 @@ class WeddingChartPrinter(cp_model.CpSolverSolutionCallback):
return self.__solution_count
def main():
def BuildData():
#
# Data
#
@@ -128,6 +128,11 @@ def main():
"DeAnn (G)",
"Lori (G)"
]
return num_tables, table_capacity, min_known_neighbors, C, names
def SolveWithDiscreteModel():
num_tables, table_capacity, min_known_neighbors, C, names = BuildData()
num_guests = len(C)
@@ -214,5 +219,9 @@ def main():
print(' - num solutions: %i' % solution_printer.NumSolutions())
def main():
SolveWithDiscreteModel()
if __name__ == '__main__':
main()