commit 89528a184e9d9e5ad29ebede3668ea6e7d7988c2 · dekker.one/on-restart-benchmarks

+7 -6

analyse_chuffed.py

···

       24
       24
        
           for line in contents:

     

       25
       25
        
               # match = re.match(r'%\sinit_area\s=\s(\d+)', line)

     

       26
       26
        
               # if match:

     

       27
       27
       -
               #     objectives.append(int(match[1]))

     

       27
       27
       +
               #     objectives.append(int(match.group(1)))

     

       28
       28
        
               #     continue

     

       29
       29
        
               match = re.match(r"objective\s=\s(\d+)", line)

     

       30
       30
        
               if match:

     

       31
       31
       -
                   objectives.append(int(match[1]))

     

       31
       31
       +
                   objectives.append(int(match.group(1)))

     

       32
       32
        
                   continue

     

       33
       33
        
               match = re.match(r"%\stime elapsed:\s(\d+)\sms", line)

     

       34
       34
        
               if match:

     

       35
       35
       -
                   times.append(int(match[1]))

     

       35
       35
       +
                   times.append(int(match.group(1)))

     

       36
       36
        
                   continue

     

       37
       37
        
           times.append(time)

     

       38
       38
        
       

     
···

       57
       57
        
                       contents = f.readlines()

     

       58
       58
        
       

     

       59
       59
        
                   statistics = {}

     

       60
       60
       +
                   print(contents)

     

       60
       61
        
                   for line in contents:

     

       61
       62
        
                       # Nodes

     

       62
       62
       -
                       match = re.search(r"nodes:\s+(\d+)", line)

     

       63
       63
       +
                       match = re.search(r"nodes=(\d+)", line)

     

       63
       64
        
                       if match:

     

       64
       65
        
                           statistics["nodes"] = int(match.group(1))

     

       65
       66
        
                           continue

     

       66
       67
        
                       # Solve time

     

       67
       67
       -
                       match = re.search(r"search time:\s+(\d+\.\d+)\s*seconds", line)

     

       68
       68
       +
                       match = re.search(r"solveTime=(\d+\.\d+)", line)

     

       68
       69
        
                       if match:

     

       69
       70
        
                           statistics["search_time"] = int(float(match.group(1)) * 1000)

     

       70
       71
        
                           continue

     
···

       78
       79
        
                       # Best objective

     

       79
       80
        
                       match = re.match(r"objective\s=\s(\d+)", line)

     

       80
       81
        
                       if match:

     

       81
       81
       -
                           statistics["objective"] = int(match[1])

     

       82
       82
       +
                           statistics["objective"] = int(match.group(1))

     

       82
       83
        
                           break

     

       83
       84
        
                   # Area

     

       84
       85
        
                   area = compute_area(contents, statistics["search_time"])

+10 -10

analyse_gecode.py

···

       28
       28
        
               #     continue

     

       29
       29
        
               match = re.match(r"objective\s=\s(\d+)", line)

     

       30
       30
        
               if match:

     

       31
       31
       -
                   objectives.append(int(match[1]))

     

       31
       31
       +
                   objectives.append(int(match.group(1)))

     

       32
       32
        
                   continue

     

       33
       33
       -
               match = re.match(r"%\stime elapsed:\s(\d+)\sms", line)

     

       33
       33
       +
               match = re.match(r"%\stime elapsed:\s(\d\.\d+)\ss", line)

     

       34
       34
        
               if match:

     

       35
       35
       -
                   times.append(int(match[1]))

     

       35
       35
       +
                   times.append(float(match.group(1)))

     

       36
       36
        
                   continue

     

       37
       37
       -
               match = re.search(r"solvetime:.*\((\d+).(\d+)\s+ms\)", line)

     

       37
       37
       +
               match = re.search(r"solveTime=(\d+(.\d+)?)", line)

     

       38
       38
        
               if match:

     

       39
       39
       -
                   times.append(int(match.group(1)))

     

       39
       39
       +
                   times.append(float(match.group(1)))

     

       40
       40
        
                   continue

     

       41
       41
        
       

     

       42
       42
        
           assert len(objectives) > 0

     
···

       47
       47
        
           return int(area)

     

       48
       48
        
       

     

       49
       49
        
       

     

       50
       50
       -
       foler = sys.argv[1]

     

       50
       50
       +
       folder = sys.argv[1]

     

       51
       51
        
       statistics = {}

     

       52
       52
        
       for root, dirs, files in os.walk(folder):

     

       53
       53
        
           for name in files:

     
···

       66
       66
        
                       # Best objective

     

       67
       67
        
                       match = re.match(r"objective\s=\s(\d+)", line)

     

       68
       68
        
                       if match:

     

       69
       69
       -
                           objective = int(match[1])

     

       69
       69
       +
                           objective = int(match.group(1))

     

       70
       70
        
                           break

     

       71
       71
        
       

     

       72
       72
        
                   nodes = -1

     
···

       79
       79
        
                           nodes = int(match.group(1))

     

       80
       80
        
                           continue

     

       81
       81
        
                       # Solve time

     

       82
       82
       -
                       match = re.search(r"solvetime:.*\((\d+).(\d+)\s+ms\)", line)

     

       82
       82
       +
                       match = re.search(r"solveTime=(\d+(.\d+)?)", line)

     

       83
       83
        
                       if match:

     

       84
       84
       -
                           solvetime = int(match.group(1))

     

       84
       84
       +
                           solvetime = float(match.group(1))

     

       85
       85
        
                           continue

     

       86
       86
        
                       # Restarts

     

       87
       87
       -
                       match = re.search(r"restarts:\s+(\d+)", line)

     

       87
       87
       +
                       match = re.search(r"restarts=(\d+)", line)

     

       88
       88
        
                       if match:

     

       89
       89
        
                           restarts = int(match.group(1))

     

       90
       90
        
                           continue