diff --git a/ADC2017_Q_A/all/A/A01.txt b/ADC2017_Q_A/all/A/A01.txt index ba6ba9e96ea9e804b1902e6537e53e77cceb9481..9f63e44df7c38c1a131183e2a71e5f45b73daa7e 100644 --- a/ADC2017_Q_A/all/A/A01.txt +++ b/ADC2017_Q_A/all/A/A01.txt @@ -1,4 +1,3 @@ -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 diff --git a/ADC2017_Q_A/all/A/A02.txt b/ADC2017_Q_A/all/A/A02.txt index fa14a32c801d3e3a8d49995b0cb561ead1b077c1..7a26c8e79b0e7d858ac9eb27226460763232821a 100644 --- a/ADC2017_Q_A/all/A/A02.txt +++ b/ADC2017_Q_A/all/A/A02.txt @@ -1,4 +1,3 @@ -GET A2 SIZE 15X15X2 LAYER 1 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 diff --git a/ADC2017_Q_A/all/A/A03.txt b/ADC2017_Q_A/all/A/A03.txt index 118a0c08463f4df4ca72a26c138bc7ea2261f4bd..181ac6850163163aa1cc2b03550f0921109fe93a 100644 --- a/ADC2017_Q_A/all/A/A03.txt +++ b/ADC2017_Q_A/all/A/A03.txt @@ -1,4 +1,3 @@ -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 diff --git a/ADC2017_Q_A/all/A/A04.txt b/ADC2017_Q_A/all/A/A04.txt index 2e1b4e6210bd2132b0fa79701c8f87560d8b7456..462d335457e7a8b949be84549cde88421b2f5d91 100644 --- a/ADC2017_Q_A/all/A/A04.txt +++ b/ADC2017_Q_A/all/A/A04.txt @@ -1,4 +1,3 @@ -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 diff --git a/ADC2017_Q_A/all/A/A05.txt b/ADC2017_Q_A/all/A/A05.txt index 7192332c2fe53449e6e98a7544bcbdef4002bb61..774ca695ffa6adc2e9999547bed0c3bfdde5d19e 100644 --- a/ADC2017_Q_A/all/A/A05.txt +++ b/ADC2017_Q_A/all/A/A05.txt @@ -1,4 +1,3 @@ -GET A5 SIZE 8X8X4 LAYER 1 1,2,2,2,0,0,0,0 diff --git a/ADC2017_Q_A/all/A/A06.txt b/ADC2017_Q_A/all/A/A06.txt index 66d35b941d99adf84c5eeeba60a9aaf1fe49a487..c4534cff565ee37a7d4f23ab1837381a56f25998 100644 --- a/ADC2017_Q_A/all/A/A06.txt +++ b/ADC2017_Q_A/all/A/A06.txt @@ -1,4 +1,3 @@ -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 diff --git a/ADC2017_Q_A/all/A/A07.txt b/ADC2017_Q_A/all/A/A07.txt index 6bcf20157a51e0210699a6eb1baf0a1b8ee715a6..197c935f578ed730ce6f99bfd1d1056d6b126617 100644 --- a/ADC2017_Q_A/all/A/A07.txt +++ b/ADC2017_Q_A/all/A/A07.txt @@ -1,4 +1,3 @@ -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 diff --git a/ADC2017_Q_A/all/A/A08.txt b/ADC2017_Q_A/all/A/A08.txt index 2cb3f7d126b9efaac2c19aafc46b7d26dd635d2a..425184760ece59871184907e03dd47f71e151414 100644 --- a/ADC2017_Q_A/all/A/A08.txt +++ b/ADC2017_Q_A/all/A/A08.txt @@ -1,4 +1,3 @@ -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 diff --git a/ADC2017_Q_A/all/A/A09.txt b/ADC2017_Q_A/all/A/A09.txt index b2c56d564a74ed36c093ed7a230aef3b1917f251..31c926d3ecd56150276f6ec46faf7ba291f95e35 100644 --- a/ADC2017_Q_A/all/A/A09.txt +++ b/ADC2017_Q_A/all/A/A09.txt @@ -1,4 +1,3 @@ -GET A9 SIZE 15X15X2 LAYER 1 30,28,32,32,32,43,43,01,01,01,01,01,01,01,00 diff --git a/ADC2017_Q_A/all/A/A10.txt b/ADC2017_Q_A/all/A/A10.txt index d3beeff2346606c958c9f16bb12ced5e29dd14be..fdbf2cc5a5dc3bf71f2a946c89e4e26df0f3f334 100644 --- a/ADC2017_Q_A/all/A/A10.txt +++ b/ADC2017_Q_A/all/A/A10.txt @@ -1,4 +1,3 @@ -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 diff --git a/ADC2017_Q_A/all/A/A11.txt b/ADC2017_Q_A/all/A/A11.txt index 8d9a274081af43c4e069339fc97d67e7e3c88cf5..249d256531abacf1273cd4fed038f226de22be7f 100644 --- a/ADC2017_Q_A/all/A/A11.txt +++ b/ADC2017_Q_A/all/A/A11.txt @@ -1,4 +1,3 @@ -GET A11 SIZE 8X4X8 LAYER 1 1,2,2,2,0,0,0,0 diff --git a/ADC2017_Q_A/all/A/A12.txt b/ADC2017_Q_A/all/A/A12.txt index 049bf9d9be53f6ac0367f9ee8f18d5630654783e..3de0e6e85f3184f7fd9835324e3417de8db48d06 100644 --- a/ADC2017_Q_A/all/A/A12.txt +++ b/ADC2017_Q_A/all/A/A12.txt @@ -1,4 +1,3 @@ -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 diff --git a/ADC2017_Q_A/all/A/A13.txt b/ADC2017_Q_A/all/A/A13.txt index a0af02bb9ccfd8e7b8cab32d82357ce4638ed07d..5ea2e4ae49275ecb94b5d096f79f1c91f6801326 100644 --- a/ADC2017_Q_A/all/A/A13.txt +++ b/ADC2017_Q_A/all/A/A13.txt @@ -1,4 +1,3 @@ -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 diff --git a/ADC2017_Q_A/all/A/A14.txt b/ADC2017_Q_A/all/A/A14.txt index 5d8d4a979e2900272b4f4c18205bee05056cfffb..e87a9e011f7e2b4ad387f7ee4a50071e196a0130 100644 --- a/ADC2017_Q_A/all/A/A14.txt +++ b/ADC2017_Q_A/all/A/A14.txt @@ -1,4 +1,3 @@ -GET A14 SIZE 10X10X2 LAYER 1 06,06,00,00,04,04,04,04,04,04 diff --git a/ADC2017_Q_A/all/A/A15.txt b/ADC2017_Q_A/all/A/A15.txt index 5b2e4a7f058631cfed9ae7977acd57f981f2869a..aa6afbb7d9a4035635f2e2b742741d9ea5c4e2ca 100644 --- a/ADC2017_Q_A/all/A/A15.txt +++ b/ADC2017_Q_A/all/A/A15.txt @@ -1,4 +1,3 @@ -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 diff --git a/ADC2017_Q_A/all/A/A16.txt b/ADC2017_Q_A/all/A/A16.txt index dcc5221832e83a171bf5efba18a2be3beab8e220..7c3798cd9fd6ed6396451540df6e52fea9f18735 100644 --- a/ADC2017_Q_A/all/A/A16.txt +++ b/ADC2017_Q_A/all/A/A16.txt @@ -1,4 +1,3 @@ -GET A16 SIZE 15X15X4 LAYER 1 0,0,0,0,0,1,23,23,23,62,62,62,0,0,0 diff --git a/ADC2017_Q_A/all/A/A17.txt b/ADC2017_Q_A/all/A/A17.txt index 662346a264218b3401d7ea665cb4f7bc9c07cea1..79e6f93a89c5b2da7041d78b2f0c3b5e7580e0c9 100644 --- a/ADC2017_Q_A/all/A/A17.txt +++ b/ADC2017_Q_A/all/A/A17.txt @@ -1,4 +1,3 @@ -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 diff --git a/ADC2017_Q_A/all/A/A18.txt b/ADC2017_Q_A/all/A/A18.txt index 98cef50e4b5937d397e6c789af583dea51e80918..7f71dbfb4c763d6d255019be824a5118263f544b 100644 --- a/ADC2017_Q_A/all/A/A18.txt +++ b/ADC2017_Q_A/all/A/A18.txt @@ -1,4 +1,3 @@ -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 diff --git a/ADC2017_Q_A/all/A/A19.txt b/ADC2017_Q_A/all/A/A19.txt index 0ddd13e9202317874ec95ba12bea16aeeac444e5..ce5231521256629f3d0b58cdd9923f782350dc11 100644 --- a/ADC2017_Q_A/all/A/A19.txt +++ b/ADC2017_Q_A/all/A/A19.txt @@ -1,4 +1,3 @@ -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 diff --git a/ADC2017_Q_A/all/A/A20.txt b/ADC2017_Q_A/all/A/A20.txt index 2a564cf5a888c3e3e7027524aed605e5b47d7f9d..3e08d45ff5d24d6555e4a78dda8817bea14a6146 100644 --- a/ADC2017_Q_A/all/A/A20.txt +++ b/ADC2017_Q_A/all/A/A20.txt @@ -1,4 +1,3 @@ -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 diff --git a/ADC2017_Q_A/all/A/A21.txt b/ADC2017_Q_A/all/A/A21.txt index 93fc2183fbe2556d63e606fad15c6a4a3ae8f937..7d633c9a6e6d19a9b06186da19e73b664734c4e8 100644 --- a/ADC2017_Q_A/all/A/A21.txt +++ b/ADC2017_Q_A/all/A/A21.txt @@ -1,4 +1,3 @@ -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 diff --git a/ADC2017_Q_A/all/A/A22.txt b/ADC2017_Q_A/all/A/A22.txt index 43070f93e9996c3fd97ab799bbc5348c4acb890b..2474b4128e77e40993439c82773832105831acf7 100644 --- a/ADC2017_Q_A/all/A/A22.txt +++ b/ADC2017_Q_A/all/A/A22.txt @@ -1,4 +1,3 @@ -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 diff --git a/ADC2017_Q_A/all/A/A23.txt b/ADC2017_Q_A/all/A/A23.txt index e9956a850ffce7efb7a721144183a03ee529ba32..1d74ee1f63a898bb405b923f280fe4fbe6f3e33a 100644 --- a/ADC2017_Q_A/all/A/A23.txt +++ b/ADC2017_Q_A/all/A/A23.txt @@ -1,4 +1,3 @@ -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 diff --git a/ADC2017_Q_A/all/A/A24.txt b/ADC2017_Q_A/all/A/A24.txt index 934fa2fe8382513aa69ed8dfc962b19833856163..92bb55cf0fcaa24dfdcd5904c6dd02a05d5c8009 100644 --- a/ADC2017_Q_A/all/A/A24.txt +++ b/ADC2017_Q_A/all/A/A24.txt @@ -1,4 +1,3 @@ -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 diff --git a/ADC2017_Q_A/all/A/A25.txt b/ADC2017_Q_A/all/A/A25.txt index 9b173bc49ba1fa0b4ce88ae60f6c174bfaa0fe29..f421cc38777af7599324380260380893497c9126 100644 --- a/ADC2017_Q_A/all/A/A25.txt +++ b/ADC2017_Q_A/all/A/A25.txt @@ -1,4 +1,3 @@ -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 diff --git a/ADC2017_Q_A/all/A/A26.txt b/ADC2017_Q_A/all/A/A26.txt index 3e00fb7e0e43fec0b86d97a091db5e31fe2a713a..c8de9bca1b67bcf373fc8512e17945b2067bf594 100644 --- a/ADC2017_Q_A/all/A/A26.txt +++ b/ADC2017_Q_A/all/A/A26.txt @@ -1,4 +1,3 @@ -GET A26 SIZE 15X15X3 LAYER 1 0,0,7,26,0,43,0,0,0,0,0,0,10,0,0 diff --git a/ADC2017_Q_A/all/A/A27.txt b/ADC2017_Q_A/all/A/A27.txt index 1c03652f166f4fd9da67aefa1c9f6817ee417933..a5b60c9259633f9c8435ad78d5f0c295feec9b0d 100644 --- a/ADC2017_Q_A/all/A/A27.txt +++ b/ADC2017_Q_A/all/A/A27.txt @@ -1,4 +1,3 @@ -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 diff --git a/ADC2017_Q_A/all/A/A28.txt b/ADC2017_Q_A/all/A/A28.txt index 6499f897202212a67f5e2bc46071560c962e3aaa..6f7e317c7f02b4c954faebc6f66e748bc71a217e 100644 --- a/ADC2017_Q_A/all/A/A28.txt +++ b/ADC2017_Q_A/all/A/A28.txt @@ -1,4 +1,3 @@ -GET A28 SIZE 3X3X3 LAYER 1 1,2,3 diff --git a/ADC2017_Q_A/all/A/A29.txt b/ADC2017_Q_A/all/A/A29.txt index 9e52f986bf8bee72529bed02916f9b2be4381507..7365ae3af47966441d8037744c7d41f31934346c 100644 --- a/ADC2017_Q_A/all/A/A29.txt +++ b/ADC2017_Q_A/all/A/A29.txt @@ -1,4 +1,3 @@ -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 diff --git a/ADC2017_Q_A/all/A/A30.txt b/ADC2017_Q_A/all/A/A30.txt index c5b91eafa138f9d821c418e63b7ff16738fd112c..eeb8d4b3ae75196e99ef09531eb9063456b964e8 100644 --- a/ADC2017_Q_A/all/A/A30.txt +++ b/ADC2017_Q_A/all/A/A30.txt @@ -1,4 +1,3 @@ -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 diff --git a/ADC2017_Q_A/all/A/A31.txt b/ADC2017_Q_A/all/A/A31.txt index 56fc7d3c8f9e0fbc6d7cca70f640bf91927757f5..bed48a2ce8db510b006c15c8dccb5cc71c235d8c 100644 --- a/ADC2017_Q_A/all/A/A31.txt +++ b/ADC2017_Q_A/all/A/A31.txt @@ -1,4 +1,3 @@ -GET A31 SIZE 16X20X5 LAYER 1 005,022,039,056,073,090,107,124,141,158,175,192,209,226,243,260 diff --git a/ADC2017_Q_A/all/A/A32.txt b/ADC2017_Q_A/all/A/A32.txt index 0381b20fdf132d1b539388499124aca1e090e622..b641ba6fe452c97f815a52bcb1c78135c74769ac 100644 --- a/ADC2017_Q_A/all/A/A32.txt +++ b/ADC2017_Q_A/all/A/A32.txt @@ -1,4 +1,3 @@ -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 diff --git a/ADC2017_Q_A/all/A/A33.txt b/ADC2017_Q_A/all/A/A33.txt index ba28e58a4e1841a22606194647d956f86c5eeb91..14ccf8c4020b55ab63faa906d714c54276e9b86c 100644 --- a/ADC2017_Q_A/all/A/A33.txt +++ b/ADC2017_Q_A/all/A/A33.txt @@ -1,4 +1,3 @@ -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 diff --git a/ADC2017_Q_A/all/A/A34.txt b/ADC2017_Q_A/all/A/A34.txt index c85d47d3cde63480ccf7330071f29ed664aa5ad2..fa90413990bff120fca0b184c5851171459240b2 100644 --- a/ADC2017_Q_A/all/A/A34.txt +++ b/ADC2017_Q_A/all/A/A34.txt @@ -1,4 +1,3 @@ -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 diff --git a/resolver/cpp/Makefile b/resolver/cpp/Makefile index 5f6c134940ce876cbc8aee26e6141cd906c58ce7..7c27b60842a17ecbb4841c74506a2b170625054f 100644 --- 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)