Commit 5d951933 authored by  tawada's avatar tawada

Update

parent 7c2dc08f
...@@ -999,4 +999,3 @@ LINE#996 (37,1,8) (36,2,8) ...@@ -999,4 +999,3 @@ LINE#996 (37,1,8) (36,2,8)
LINE#997 (47,42,4) (46,44,4) LINE#997 (47,42,4) (46,44,4)
LINE#998 (6,23,3) (5,28,3) LINE#998 (6,23,3) (5,28,3)
LINE#999 (62,45,6) (63,45,5) LINE#999 (62,45,6) (63,45,5)
...@@ -825,4 +825,3 @@ LINE#822 (42,28,2) (42,28,1) ...@@ -825,4 +825,3 @@ LINE#822 (42,28,2) (42,28,1)
LINE#823 (25,16,1) (25,15,1) LINE#823 (25,16,1) (25,15,1)
LINE#824 (40,39,4) (41,39,4) LINE#824 (40,39,4) (41,39,4)
LINE#825 (9,1,4) (9,2,4) LINE#825 (9,1,4) (9,2,4)
...@@ -8,4 +8,3 @@ LINE#5 (0,1,3) (71,1,1) ...@@ -8,4 +8,3 @@ LINE#5 (0,1,3) (71,1,1)
LINE#6 (0,2,1) (71,0,3) LINE#6 (0,2,1) (71,0,3)
LINE#7 (0,2,2) (71,0,2) LINE#7 (0,2,2) (71,0,2)
LINE#8 (0,2,3) (71,0,1) LINE#8 (0,2,3) (71,0,1)
problem x y z lines occupation avelength solved made by length corner parallel length (resolved) corner (resolved) parallel (resolved)
1 24 24 4 60 41.796875 16.05 o 0 952 164 216
2 15 15 2 12 48 18 o 1 222 41 156
3 20 20 8 29 11.25 12.413793 o 4 375 55 8
4 72 72 8 8 2.083333 108 O 3 606 15 0
5 8 8 4 20 53.515625 6.85 o 5 130 26 15
6 48 36 8 101 8.738426 11.960396 o 2 1224 247 140
7 72 72 8 8 2.517361 130.5 O 0 587 16 0
8 70 70 8 999 26.007653 10.205205 X 0
9 15 15 2 47 60.222222 5.765957 o 0 262 80 19
10 23 12 6 49 39.673913 13.408163 o 0 610 124 127
11 8 4 8 17 50.78125 7.647059 o 5 128 24 0
12 36 19 4 71 34.027778 13.112676 o 2 828 126 302
13 72 72 8 52 1.31414 10.480769 o 3 200 19 0
14 10 10 2 22 72.5 6.590909 o 0 131 48 5
15 60 36 8 102 9.675926 16.392157 O 4 1666 198 41
16 15 15 4 81 46.555556 5.17284 o 0 411 98 10
17 50 50 4 825 50.64 6.138182 X 0
18 20 35 8 22 8.5 21.636364 o 4 472 51 19
19 36 24 1 96 90.162037 8.114583 x 1 780 156 90
20 30 30 3 210 47.962963 6.166667 O 0 1248 342 51
21 72 72 5 73 22.071759 78.369863 X 0 5472 141 5318
22 72 72 2 2 3.587963 186 o 2 288 5 0
23 40 40 3 123 99.75 38.926829 X 0 4798 621 4054
24 60 60 4 999 48.923611 7.052052 X 0
25 40 40 4 212 99.8125 30.132075 X 0 6400 416 5574
26 15 15 3 56 46.222222 5.571429 o 0 323 79 30
27 72 72 8 8 2.194252 113.75 O 3 616 34 35
28 3 3 3 6 100 4.5 o 0 26 10 0
29 72 72 1 85 100 60.988235 x 0 5184 468 4666
30 72 72 1 160 100 32.4 x 0 5184 629 4443
31 16 20 5 272 100 5.882353 x 1 1600 336 1050
32 40 40 3 425 53.416667 6.032941 O 0 2591 673 146
33 40 40 2 150 99.875 21.306667 X 0 3200 356 2730
34 40 40 3 80 99.75 59.85 X 0 4800 1560 3120
...@@ -12,6 +12,9 @@ run: $(TARGET) ...@@ -12,6 +12,9 @@ run: $(TARGET)
test:$(TARGET) test:$(TARGET)
for i in `seq 1 34`; do ./$(TARGET) `printf "../../ADC2017_Q_A/all/Q/Q%02d.txt" $$i` `printf "../../ADC2017_Q_A/all/A/A%02d.txt" $$i` -r -o `printf "RESOLV_A%02d.txt" $$i`; done for i in `seq 1 34`; do ./$(TARGET) `printf "../../ADC2017_Q_A/all/Q/Q%02d.txt" $$i` `printf "../../ADC2017_Q_A/all/A/A%02d.txt" $$i` -r -o `printf "RESOLV_A%02d.txt" $$i`; done
check:
for i in `seq 1 34`; do python2.7 ../../../conmgr/adc2018/server/nlcheck.py -i `printf "../../ADC2017_Q_A/all/Q/Q%02d.txt" $$i` -t `printf "RESOLV_A%02d.txt" $$i` -v; done
$(TARGET): $(OBJS) $(TARGET): $(OBJS)
$(CXX) -o $@ $(OBJS) $(CXX) -o $@ $(OBJS)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment