Update

01a96e05 · tawada · 579749b1 · 01a96e05 · 01a96e05 · 01a96e05
Commit 01a96e05 authored Aug 27, 2018 by tawada
35 changed files
--- a/ADC2017_Q_A/all/A/A01.txt
+++ b/ADC2017_Q_A/all/A/A01.txt
-GET A1
 SIZE 24X24X4
 LAYER 1
 55,32,32,32,32,32,32,32,32,32,32,32,32,32,00,00,00,00,00,00,00,00,00,00

--- a/ADC2017_Q_A/all/A/A02.txt
+++ b/ADC2017_Q_A/all/A/A02.txt
-GET A2
 SIZE 15X15X2
 LAYER 1
 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00

--- a/ADC2017_Q_A/all/A/A03.txt
+++ b/ADC2017_Q_A/all/A/A03.txt
-GET A3
 SIZE 20X20X8
 LAYER 1
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0

--- a/ADC2017_Q_A/all/A/A04.txt
+++ b/ADC2017_Q_A/all/A/A04.txt
-GET A4
 SIZE 72X72X8
 LAYER 1
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2

--- a/ADC2017_Q_A/all/A/A05.txt
+++ b/ADC2017_Q_A/all/A/A05.txt
-GET A5
 SIZE 8X8X4
 LAYER 1
 1,2,2,2,0,0,0,0

--- a/ADC2017_Q_A/all/A/A06.txt
+++ b/ADC2017_Q_A/all/A/A06.txt
-GET A6
 SIZE 48X36X8
 LAYER 1
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,27,27,27,27,27,27,27,27,0,0,55,0,0,0,53,0,0,0,55,0,54,54,78,78,0,0,0,0,0,0,0,0,0,77

--- a/ADC2017_Q_A/all/A/A07.txt
+++ b/ADC2017_Q_A/all/A/A07.txt
-GET A7
 SIZE 72X72X8
 LAYER 1
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0

--- a/ADC2017_Q_A/all/A/A08.txt
+++ b/ADC2017_Q_A/all/A/A08.txt
-GET A8
 SIZE 70X70X8
 LAYER 1
 00,00,03,755,755,00,00,00,00,00,00,00,00,00,00,00,00,593,593,593,593,593,593,00,00,00,00,56,56,03,03,03,03,03,03,00,00,72,72,72,00,00,00,00,00,00,00,00,00,422,422,315,00,00,00,802,00,00,00,00,00,00,00,00,00,00,00,00,00,00

--- a/ADC2017_Q_A/all/A/A09.txt
+++ b/ADC2017_Q_A/all/A/A09.txt
-GET A9
 SIZE 15X15X2
 LAYER 1
 30,28,32,32,32,43,43,01,01,01,01,01,01,01,00

--- a/ADC2017_Q_A/all/A/A10.txt
+++ b/ADC2017_Q_A/all/A/A10.txt
-GET A10
 SIZE 23X12X6
 LAYER 1
 36,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00

--- a/ADC2017_Q_A/all/A/A11.txt
+++ b/ADC2017_Q_A/all/A/A11.txt
-GET A11
 SIZE 8X4X8
 LAYER 1
 1,2,2,2,0,0,0,0

--- a/ADC2017_Q_A/all/A/A12.txt
+++ b/ADC2017_Q_A/all/A/A12.txt
-GET A12
 SIZE 36X19X4
 LAYER 1
 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00

--- a/ADC2017_Q_A/all/A/A13.txt
+++ b/ADC2017_Q_A/all/A/A13.txt
-GET A13
 SIZE 72X72X8
 LAYER 1
 1,0,0,0,0,0,0,0,0,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0

--- a/ADC2017_Q_A/all/A/A14.txt
+++ b/ADC2017_Q_A/all/A/A14.txt
-GET A14
 SIZE 10X10X2
 LAYER 1
 06,06,00,00,04,04,04,04,04,04

--- a/ADC2017_Q_A/all/A/A15.txt
+++ b/ADC2017_Q_A/all/A/A15.txt
-GET A15
 SIZE 60X36X8
 LAYER 1
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0

--- a/ADC2017_Q_A/all/A/A16.txt
+++ b/ADC2017_Q_A/all/A/A16.txt
-GET A16
 SIZE 15X15X4
 LAYER 1
 0,0,0,0,0,1,23,23,23,62,62,62,0,0,0

--- a/ADC2017_Q_A/all/A/A17.txt
+++ b/ADC2017_Q_A/all/A/A17.txt
-GET A17
 SIZE 50X50X4
 LAYER 1
 21,21,485,485,485,485,591,591,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00

--- a/ADC2017_Q_A/all/A/A18.txt
+++ b/ADC2017_Q_A/all/A/A18.txt
-GET A18
 SIZE 20X35X8
 LAYER 1
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0

--- a/ADC2017_Q_A/all/A/A19.txt
+++ b/ADC2017_Q_A/all/A/A19.txt
-GET A19
 SIZE 36X24X1
 LAYER 1
 01,01,01,02,02,02,05,05,05,05,05,05,17,17,17,18,18,18,21,21,21,21,21,21,33,33,33,34,34,34,37,37,37,37,37,37

--- a/ADC2017_Q_A/all/A/A20.txt
+++ b/ADC2017_Q_A/all/A/A20.txt
-GET A20
 SIZE 30X30X3
 LAYER 1
 82,82,82,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0

--- a/ADC2017_Q_A/all/A/A21.txt
+++ b/ADC2017_Q_A/all/A/A21.txt
-GET A21
 SIZE 72X72X5
 LAYER 1
 01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,72,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00

--- a/ADC2017_Q_A/all/A/A22.txt
+++ b/ADC2017_Q_A/all/A/A22.txt
-GET A22
 SIZE 72X72X2
 LAYER 1
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2

--- a/ADC2017_Q_A/all/A/A23.txt
+++ b/ADC2017_Q_A/all/A/A23.txt
-GET A23
 SIZE 40X40X3
 LAYER 1
 01,01,01,01,01,01,01,01,01,26,11,04,04,04,04,04,04,04,04,04,04,04,04,04,04,04,04,04,04,04,04,04,04,09,09,09,09,09,09,09

--- a/ADC2017_Q_A/all/A/A24.txt
+++ b/ADC2017_Q_A/all/A/A24.txt
-GET A24
 SIZE 60X60X4
 LAYER 1
 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,695,00,00,318,318,318,00,00,228,228,228,228,822,00,00,00,00,00,00,00,00,00,00,00,00,00,00,72,72,307,307,00,00,00

--- a/ADC2017_Q_A/all/A/A25.txt
+++ b/ADC2017_Q_A/all/A/A25.txt
-GET A25
 SIZE 40X40X4
 LAYER 1
 01,01,01,01,01,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,18,17,16,15,14,13,12,11,10,09,08,07,06,05,02

--- a/ADC2017_Q_A/all/A/A26.txt
+++ b/ADC2017_Q_A/all/A/A26.txt
-GET A26
 SIZE 15X15X3
 LAYER 1
 0,0,7,26,0,43,0,0,0,0,0,0,10,0,0

--- a/ADC2017_Q_A/all/A/A27.txt
+++ b/ADC2017_Q_A/all/A/A27.txt
-GET A27
 SIZE 72X72X8
 LAYER 1
 1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8

--- a/ADC2017_Q_A/all/A/A28.txt
+++ b/ADC2017_Q_A/all/A/A28.txt
-GET A28
 SIZE 3X3X3
 LAYER 1
 1,2,3

--- a/ADC2017_Q_A/all/A/A29.txt
+++ b/ADC2017_Q_A/all/A/A29.txt
-GET A29
 SIZE 72X72X1
 LAYER 1
 01,01,14,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03

--- a/ADC2017_Q_A/all/A/A30.txt
+++ b/ADC2017_Q_A/all/A/A30.txt
-GET A30
 SIZE 72X72X1
 LAYER 1
 01,01,01,01,01,10,10,10,10,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02

--- a/ADC2017_Q_A/all/A/A31.txt
+++ b/ADC2017_Q_A/all/A/A31.txt
-GET A31
 SIZE 16X20X5
 LAYER 1
 005,022,039,056,073,090,107,124,141,158,175,192,209,226,243,260

--- a/ADC2017_Q_A/all/A/A32.txt
+++ b/ADC2017_Q_A/all/A/A32.txt
-GET A32
 SIZE 40X40X3
 LAYER 1
 0,0,0,0,0,0,0,0,0,0,0,112,112,112,112,112,112,112,112,112,112,112,0,299,0,0,0,130,26,0,0,0,0,0,20,20,20,20,20,20

--- a/ADC2017_Q_A/all/A/A33.txt
+++ b/ADC2017_Q_A/all/A/A33.txt
-GET A33
 SIZE 40X40X2
 LAYER 1
 01,02,03,04,05,06,07,08,09,10,11,12,13,14,15,16,17,18,19,20,20,19,18,17,16,15,14,13,12,11,10,09,08,07,06,05,04,03,02,01

--- a/ADC2017_Q_A/all/A/A34.txt
+++ b/ADC2017_Q_A/all/A/A34.txt
-GET A34
 SIZE 40X40X3
 LAYER 1
 01,41,01,01,01,42,01,01,01,43,01,01,01,44,01,01,01,45,01,01,01,46,01,01,01,47,01,01,01,48,01,01,01,49,01,01,01,50,01,01

--- a/resolver/cpp/Makefile
+++ b/resolver/cpp/Makefile
@@ -10,7 +10,7 @@ run: $(TARGET)
 	./$(TARGET) ../dataQsample.txt ../dataAsample.txt -rp

 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` -o `printf "RESOLV_A%02d.txt" $$i` -r; 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


 $(TARGET): $(OBJS)