Skip to content

Commit 088b7bd

Browse files
committed
Changes to parse data integers correctly
1 parent 1c94076 commit 088b7bd

File tree

2 files changed

+74
-2
lines changed

2 files changed

+74
-2
lines changed

app.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,19 @@
99
import plotly
1010
import plotly.figure_factory as ff
1111
from flask import Flask, render_template, request
12-
12+
import re
1313
from flowshop import Flowshop, RandomFlowshop
1414

1515
app = Flask(__name__)
1616

1717

1818
def parse_problem_data(data):
19+
split_re = re.compile(r"\d+")
1920
data_splitted = data.split('\n')
2021
processing_t__ = []
2122
for line in data_splitted:
22-
temp = list(map(int, line.strip('\n').split(' ')))
23+
parsed_ints = re.findall(split_re, line)
24+
temp = list(map(int, list(parsed_ints)))
2325
processing_t__.append(temp)
2426
return processing_t__
2527

taillard_instances/ta20_5.txt

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
5
2+
20
3+
54 83 15 71 77 36 53 38 27 87 76 91 14 29 12 77 32 87 68 94
4+
79 3 11 99 56 70 99 60 5 56 3 61 73 75 47 14 21 86 5 77
5+
16 89 49 15 89 45 60 23 57 64 7 1 63 41 63 47 26 75 77 40
6+
66 58 31 68 78 91 13 59 49 85 85 9 39 41 56 40 54 77 51 31
7+
58 56 20 85 53 35 53 41 69 13 86 72 8 49 47 87 58 18 68 28
8+
5
9+
20
10+
26 38 27 88 95 55 54 63 23 45 86 43 43 40 37 54 35 59 43 50
11+
59 62 44 10 23 64 47 68 54 9 30 31 92 7 14 95 76 82 91 37
12+
78 90 64 49 47 20 61 93 36 47 70 54 87 13 40 34 55 13 11 5
13+
88 54 47 83 84 9 30 11 92 63 62 75 48 23 85 23 4 31 13 98
14+
69 30 61 35 53 98 94 33 77 31 54 71 78 9 79 51 76 56 80 72
15+
5
16+
20
17+
77 94 9 57 29 79 55 73 65 86 25 39 76 24 38 5 91 29 22 27
18+
39 31 46 18 93 58 85 58 97 10 79 93 2 87 17 18 10 50 8 26
19+
14 21 15 10 85 46 42 18 36 2 44 89 6 3 1 43 81 57 76 59
20+
11 2 36 30 89 10 88 22 31 9 43 91 26 3 75 99 63 83 70 84
21+
83 13 84 46 20 33 74 42 33 71 32 48 42 99 7 54 8 73 30 75
22+
5
23+
20
24+
53 19 99 62 88 93 34 72 42 65 39 79 9 26 72 29 36 48 57 95
25+
93 79 88 77 94 39 74 46 17 30 62 77 43 98 48 14 45 25 98 30
26+
90 92 35 13 75 55 80 67 3 93 54 67 25 77 38 98 96 20 15 36
27+
65 97 27 25 61 24 97 61 75 92 73 21 29 3 96 51 26 44 56 31
28+
64 38 44 46 66 31 48 27 82 51 90 63 85 36 69 67 81 18 81 72
29+
5
30+
20
31+
61 86 16 42 14 92 67 77 46 41 78 3 72 95 53 59 34 66 42 63
32+
27 92 8 65 34 6 42 39 2 7 85 32 14 74 59 95 48 37 59 4
33+
42 93 32 30 16 95 58 12 95 21 74 38 4 31 62 39 97 57 9 54
34+
13 47 6 70 19 97 41 1 57 60 62 14 90 76 12 89 37 35 91 69
35+
55 48 56 84 22 51 43 50 62 61 10 87 99 40 91 64 62 53 33 16
36+
5
37+
20
38+
71 27 55 90 11 18 42 64 73 95 22 53 32 5 94 12 41 85 75 38
39+
13 11 73 43 27 33 57 42 71 3 11 49 8 3 47 58 23 79 99 23
40+
61 25 52 72 89 75 60 28 94 95 18 73 40 61 68 75 37 13 65 7
41+
21 8 5 8 58 59 85 35 84 97 93 60 99 29 94 41 51 87 97 11
42+
91 13 7 95 20 69 45 44 29 32 94 84 60 49 49 65 85 52 8 58
43+
5
44+
20
45+
15 64 64 48 9 91 27 34 42 3 11 54 27 30 9 15 88 55 50 57
46+
28 4 43 93 1 81 77 69 52 28 28 77 42 53 46 49 15 43 65 41
47+
77 36 57 15 81 82 98 97 12 35 84 70 27 37 59 42 57 16 11 34
48+
1 59 95 49 90 78 3 69 99 41 73 28 99 13 59 47 8 92 87 62
49+
45 73 59 63 54 98 39 75 33 8 86 41 41 22 43 34 80 16 37 94
50+
5
51+
20
52+
34 20 57 47 62 40 74 94 9 62 86 13 78 46 83 52 13 70 40 60
53+
5 48 80 43 34 2 87 68 28 84 30 35 42 39 85 34 36 9 96 84
54+
86 35 5 93 74 12 40 95 80 6 92 14 83 49 36 38 43 89 94 33
55+
28 39 55 21 25 88 59 40 90 18 33 10 59 92 15 77 31 85 85 99
56+
8 91 45 55 75 18 59 86 45 89 11 54 38 41 64 98 83 36 61 19
57+
5
58+
20
59+
37 36 1 4 64 74 32 67 73 7 78 64 98 60 89 49 2 79 79 53
60+
59 16 90 3 76 74 22 30 89 61 39 15 69 57 9 13 71 2 34 49
61+
65 94 96 47 35 34 84 3 60 34 70 57 8 74 13 37 87 71 89 57
62+
70 3 43 14 26 83 26 65 47 94 75 30 1 71 46 87 78 76 75 55
63+
94 98 63 83 19 79 54 78 29 8 38 97 61 10 37 16 78 96 9 91
64+
5
65+
20
66+
27 92 75 94 18 41 37 58 56 20 2 39 91 81 33 14 88 22 36 65
67+
79 23 66 5 15 51 2 81 12 40 59 32 16 87 78 41 43 94 1 93
68+
22 93 62 53 30 34 27 30 54 77 24 47 39 66 41 46 24 23 68 50
69+
93 22 64 81 94 97 54 82 11 91 23 32 26 22 12 23 34 87 59 2
70+
38 84 62 10 11 93 57 81 10 40 62 49 90 34 11 81 51 21 39 27

0 commit comments

Comments
 (0)