Skip to content

Commit 016ca29

Browse files
committed
Manage Solvers: Solver Stats
- ensure Created date is populated after a restart (for a backed up solver) - the other stats: use best solution info when available, otherwise use the current solution info
1 parent 1ee2b86 commit 016ca29

2 files changed

Lines changed: 10 additions & 1 deletion

File tree

JavaSource/org/unitime/timetable/action/ManageSolversAction.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,9 @@ public String getSolverTable(SolverType type) {
586586
if (solver == null) continue;
587587
DataProperties properties = solver.getProperties();
588588
if (properties == null) continue;
589-
Map<String,String> info = solver.statusSolutionInfo();
589+
Map<String,String> info = solver.bestSolutionInfo();
590+
if (info == null)
591+
info = solver.currentSolutionInfo();
590592

591593
String bgColor = null;
592594
if (selectedId != null && selectedId.equals(solver.getUser()))

JavaSource/org/unitime/timetable/solver/AbstractSolver.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -477,6 +477,13 @@ public boolean restore(File folder, String puid, boolean removeFiles) {
477477
inXmlFile.delete();
478478
}
479479

480+
if (iLoadedDate == null) {
481+
List<Progress.Message> log = Progress.getInstance(currentSolution().getModel()).getLog();
482+
if (log!=null && !log.isEmpty()) {
483+
iLoadedDate = log.get(0).getDate();
484+
}
485+
}
486+
480487
return true;
481488
} catch (Exception e) {
482489
sLog.error(e.getMessage(),e);

0 commit comments

Comments
 (0)