diff --git a/MODFIRE-Prototype/Results/outputPairsSingle.csv b/MODFIRE-Prototype/Results/outputPairsSingle.csv index 6106bd3..e69de29 100644 --- a/MODFIRE-Prototype/Results/outputPairsSingle.csv +++ b/MODFIRE-Prototype/Results/outputPairsSingle.csv @@ -1,8 +0,0 @@ -9,700 -10,21 -11,503700 -12,3 -13,503 -14,3 -167,2 -451,514 diff --git a/MODFIRE-Prototype/Results/pairCriteria.csv b/MODFIRE-Prototype/Results/pairCriteria.csv index 5ca1ff3..e69de29 100644 --- a/MODFIRE-Prototype/Results/pairCriteria.csv +++ b/MODFIRE-Prototype/Results/pairCriteria.csv @@ -1,388 +0,0 @@ -The pareto front has 43 solutions : Crit0=38854,Crit1=-25287,end -UG_8=700, Crit0:1773,Crit1:-1333,end -UG_9=21, Crit0:15701,Crit1:-4460,end -UG_10=503, Crit0:890,Crit1:-1206,end -UG_11=3, Crit0:1181,Crit1:-3335,end -UG_12=503, Crit0:5566,Crit1:-880,end -UG_13=3, Crit0:6344,Crit1:-3175,end -UG_149=2, Crit0:6555,Crit1:-4002,end -UG_404=514, Crit0:844,Crit1:-6896,end -Crit0=38705,Crit1=-22157,end -UG_8=700, Crit0:1773,Crit1:-1333,end -UG_9=21, Crit0:15701,Crit1:-4460,end -UG_10=503, Crit0:890,Crit1:-1206,end -UG_11=3, Crit0:1181,Crit1:-3335,end -UG_12=503, Crit0:5566,Crit1:-880,end -UG_13=3, Crit0:6344,Crit1:-3175,end -UG_149=2, Crit0:6555,Crit1:-4002,end -UG_404=512700, Crit0:695,Crit1:-3766,end -Crit0=37841,Crit1=-20990,end -UG_8=700, Crit0:1773,Crit1:-1333,end -UG_9=21, Crit0:15701,Crit1:-4460,end -UG_10=503, Crit0:890,Crit1:-1206,end -UG_11=3700, Crit0:317,Crit1:-2168,end -UG_12=503, Crit0:5566,Crit1:-880,end -UG_13=3, Crit0:6344,Crit1:-3175,end -UG_149=2, Crit0:6555,Crit1:-4002,end -UG_404=512700, Crit0:695,Crit1:-3766,end -Crit0=33202,Crit1=-19879,end -UG_8=700, Crit0:1773,Crit1:-1333,end -UG_9=21, Crit0:15701,Crit1:-4460,end -UG_10=503, Crit0:890,Crit1:-1206,end -UG_11=3700, Crit0:317,Crit1:-2168,end -UG_12=503, Crit0:5566,Crit1:-880,end -UG_13=3700, Crit0:1705,Crit1:-2064,end -UG_149=2, Crit0:6555,Crit1:-4002,end -UG_404=512700, Crit0:695,Crit1:-3766,end -Crit0=33638,Crit1=-20481,end -UG_8=700, Crit0:1773,Crit1:-1333,end -UG_9=21, Crit0:15701,Crit1:-4460,end -UG_10=503, Crit0:890,Crit1:-1206,end -UG_11=3, Crit0:1181,Crit1:-3335,end -UG_12=503, Crit0:5566,Crit1:-880,end -UG_13=3, Crit0:6344,Crit1:-3175,end -UG_149=3700, Crit0:1488,Crit1:-2326,end -UG_404=512700, Crit0:695,Crit1:-3766,end -Crit0=33531,Crit1=-20422,end -UG_8=700, Crit0:1773,Crit1:-1333,end -UG_9=21, Crit0:15701,Crit1:-4460,end -UG_10=503, Crit0:890,Crit1:-1206,end -UG_11=3, Crit0:1181,Crit1:-3335,end -UG_12=503, Crit0:5566,Crit1:-880,end -UG_13=3, Crit0:6344,Crit1:-3175,end -UG_149=2700, Crit0:1381,Crit1:-2267,end -UG_404=512700, Crit0:695,Crit1:-3766,end -Crit0=33421,Crit1=-20348,end -UG_8=700, Crit0:1773,Crit1:-1333,end -UG_9=21, Crit0:15701,Crit1:-4460,end -UG_10=503, Crit0:890,Crit1:-1206,end -UG_11=3, Crit0:1181,Crit1:-3335,end -UG_12=503, Crit0:5566,Crit1:-880,end -UG_13=3, Crit0:6344,Crit1:-3175,end -UG_149=1700, Crit0:1271,Crit1:-2193,end -UG_404=512700, Crit0:695,Crit1:-3766,end -Crit0=32774,Crit1=-19314,end -UG_8=700, Crit0:1773,Crit1:-1333,end -UG_9=21, Crit0:15701,Crit1:-4460,end -UG_10=503, Crit0:890,Crit1:-1206,end -UG_11=3700, Crit0:317,Crit1:-2168,end -UG_12=503, Crit0:5566,Crit1:-880,end -UG_13=3, Crit0:6344,Crit1:-3175,end -UG_149=3700, Crit0:1488,Crit1:-2326,end -UG_404=512700, Crit0:695,Crit1:-3766,end -Crit0=28135,Crit1=-18203,end -UG_8=700, Crit0:1773,Crit1:-1333,end -UG_9=21, Crit0:15701,Crit1:-4460,end -UG_10=503, Crit0:890,Crit1:-1206,end -UG_11=3700, Crit0:317,Crit1:-2168,end -UG_12=503, Crit0:5566,Crit1:-880,end -UG_13=3700, Crit0:1705,Crit1:-2064,end -UG_149=3700, Crit0:1488,Crit1:-2326,end -UG_404=512700, Crit0:695,Crit1:-3766,end -Crit0=17313,Crit1=-16883,end -UG_8=700, Crit0:1773,Crit1:-1333,end -UG_9=19700, Crit0:4879,Crit1:-3140,end -UG_10=503, Crit0:890,Crit1:-1206,end -UG_11=3700, Crit0:317,Crit1:-2168,end -UG_12=503, Crit0:5566,Crit1:-880,end -UG_13=3700, Crit0:1705,Crit1:-2064,end -UG_149=3700, Crit0:1488,Crit1:-2326,end -UG_404=512700, Crit0:695,Crit1:-3766,end -Crit0=37815,Crit1=-20940,end -UG_8=700, Crit0:1773,Crit1:-1333,end -UG_9=21, Crit0:15701,Crit1:-4460,end -UG_10=503, Crit0:890,Crit1:-1206,end -UG_11=2700, Crit0:291,Crit1:-2118,end -UG_12=503, Crit0:5566,Crit1:-880,end -UG_13=3, Crit0:6344,Crit1:-3175,end -UG_149=2, Crit0:6555,Crit1:-4002,end -UG_404=512700, Crit0:695,Crit1:-3766,end -Crit0=36789,Crit1=-20842,end -UG_8=700, Crit0:1773,Crit1:-1333,end -UG_9=21, Crit0:15701,Crit1:-4460,end -UG_10=503, Crit0:890,Crit1:-1206,end -UG_11=2700, Crit0:291,Crit1:-2118,end -UG_12=503, Crit0:5566,Crit1:-880,end -UG_13=3, Crit0:6344,Crit1:-3175,end -UG_149=3, Crit0:5529,Crit1:-3904,end -UG_404=512700, Crit0:695,Crit1:-3766,end -Crit0=32748,Crit1=-19264,end -UG_8=700, Crit0:1773,Crit1:-1333,end -UG_9=21, Crit0:15701,Crit1:-4460,end -UG_10=503, Crit0:890,Crit1:-1206,end -UG_11=2700, Crit0:291,Crit1:-2118,end -UG_12=503, Crit0:5566,Crit1:-880,end -UG_13=3, Crit0:6344,Crit1:-3175,end -UG_149=3700, Crit0:1488,Crit1:-2326,end -UG_404=512700, Crit0:695,Crit1:-3766,end -Crit0=32641,Crit1=-19205,end -UG_8=700, Crit0:1773,Crit1:-1333,end -UG_9=21, Crit0:15701,Crit1:-4460,end -UG_10=503, Crit0:890,Crit1:-1206,end -UG_11=2700, Crit0:291,Crit1:-2118,end -UG_12=503, Crit0:5566,Crit1:-880,end -UG_13=3, Crit0:6344,Crit1:-3175,end -UG_149=2700, Crit0:1381,Crit1:-2267,end -UG_404=512700, Crit0:695,Crit1:-3766,end -Crit0=32531,Crit1=-19131,end -UG_8=700, Crit0:1773,Crit1:-1333,end -UG_9=21, Crit0:15701,Crit1:-4460,end -UG_10=503, Crit0:890,Crit1:-1206,end -UG_11=2700, Crit0:291,Crit1:-2118,end -UG_12=503, Crit0:5566,Crit1:-880,end -UG_13=3, Crit0:6344,Crit1:-3175,end -UG_149=1700, Crit0:1271,Crit1:-2193,end -UG_404=512700, Crit0:695,Crit1:-3766,end -Crit0=21709,Crit1=-17811,end -UG_8=700, Crit0:1773,Crit1:-1333,end -UG_9=19700, Crit0:4879,Crit1:-3140,end -UG_10=503, Crit0:890,Crit1:-1206,end -UG_11=2700, Crit0:291,Crit1:-2118,end -UG_12=503, Crit0:5566,Crit1:-880,end -UG_13=3, Crit0:6344,Crit1:-3175,end -UG_149=1700, Crit0:1271,Crit1:-2193,end -UG_404=512700, Crit0:695,Crit1:-3766,end -Crit0=33176,Crit1=-19829,end -UG_8=700, Crit0:1773,Crit1:-1333,end -UG_9=21, Crit0:15701,Crit1:-4460,end -UG_10=503, Crit0:890,Crit1:-1206,end -UG_11=2700, Crit0:291,Crit1:-2118,end -UG_12=503, Crit0:5566,Crit1:-880,end -UG_13=3700, Crit0:1705,Crit1:-2064,end -UG_149=2, Crit0:6555,Crit1:-4002,end -UG_404=512700, Crit0:695,Crit1:-3766,end -Crit0=27892,Crit1=-18020,end -UG_8=700, Crit0:1773,Crit1:-1333,end -UG_9=21, Crit0:15701,Crit1:-4460,end -UG_10=503, Crit0:890,Crit1:-1206,end -UG_11=2700, Crit0:291,Crit1:-2118,end -UG_12=503, Crit0:5566,Crit1:-880,end -UG_13=3700, Crit0:1705,Crit1:-2064,end -UG_149=1700, Crit0:1271,Crit1:-2193,end -UG_404=512700, Crit0:695,Crit1:-3766,end -Crit0=28002,Crit1=-18094,end -UG_8=700, Crit0:1773,Crit1:-1333,end -UG_9=21, Crit0:15701,Crit1:-4460,end -UG_10=503, Crit0:890,Crit1:-1206,end -UG_11=2700, Crit0:291,Crit1:-2118,end -UG_12=503, Crit0:5566,Crit1:-880,end -UG_13=3700, Crit0:1705,Crit1:-2064,end -UG_149=2700, Crit0:1381,Crit1:-2267,end -UG_404=512700, Crit0:695,Crit1:-3766,end -Crit0=28109,Crit1=-18153,end -UG_8=700, Crit0:1773,Crit1:-1333,end -UG_9=21, Crit0:15701,Crit1:-4460,end -UG_10=503, Crit0:890,Crit1:-1206,end -UG_11=2700, Crit0:291,Crit1:-2118,end -UG_12=503, Crit0:5566,Crit1:-880,end -UG_13=3700, Crit0:1705,Crit1:-2064,end -UG_149=3700, Crit0:1488,Crit1:-2326,end -UG_404=512700, Crit0:695,Crit1:-3766,end -Crit0=17287,Crit1=-16833,end -UG_8=700, Crit0:1773,Crit1:-1333,end -UG_9=19700, Crit0:4879,Crit1:-3140,end -UG_10=503, Crit0:890,Crit1:-1206,end -UG_11=2700, Crit0:291,Crit1:-2118,end -UG_12=503, Crit0:5566,Crit1:-880,end -UG_13=3700, Crit0:1705,Crit1:-2064,end -UG_149=3700, Crit0:1488,Crit1:-2326,end -UG_404=512700, Crit0:695,Crit1:-3766,end -Crit0=17180,Crit1=-16774,end -UG_8=700, Crit0:1773,Crit1:-1333,end -UG_9=19700, Crit0:4879,Crit1:-3140,end -UG_10=503, Crit0:890,Crit1:-1206,end -UG_11=2700, Crit0:291,Crit1:-2118,end -UG_12=503, Crit0:5566,Crit1:-880,end -UG_13=3700, Crit0:1705,Crit1:-2064,end -UG_149=2700, Crit0:1381,Crit1:-2267,end -UG_404=512700, Crit0:695,Crit1:-3766,end -Crit0=17070,Crit1=-16700,end -UG_8=700, Crit0:1773,Crit1:-1333,end -UG_9=19700, Crit0:4879,Crit1:-3140,end -UG_10=503, Crit0:890,Crit1:-1206,end -UG_11=2700, Crit0:291,Crit1:-2118,end -UG_12=503, Crit0:5566,Crit1:-880,end -UG_13=3700, Crit0:1705,Crit1:-2064,end -UG_149=1700, Crit0:1271,Crit1:-2193,end -UG_404=512700, Crit0:695,Crit1:-3766,end -Crit0=37789,Crit1=-20885,end -UG_8=700, Crit0:1773,Crit1:-1333,end -UG_9=21, Crit0:15701,Crit1:-4460,end -UG_10=503, Crit0:890,Crit1:-1206,end -UG_11=1700, Crit0:265,Crit1:-2063,end -UG_12=503, Crit0:5566,Crit1:-880,end -UG_13=3, Crit0:6344,Crit1:-3175,end -UG_149=2, Crit0:6555,Crit1:-4002,end -UG_404=512700, Crit0:695,Crit1:-3766,end -Crit0=36763,Crit1=-20787,end -UG_8=700, Crit0:1773,Crit1:-1333,end -UG_9=21, Crit0:15701,Crit1:-4460,end -UG_10=503, Crit0:890,Crit1:-1206,end -UG_11=1700, Crit0:265,Crit1:-2063,end -UG_12=503, Crit0:5566,Crit1:-880,end -UG_13=3, Crit0:6344,Crit1:-3175,end -UG_149=3, Crit0:5529,Crit1:-3904,end -UG_404=512700, Crit0:695,Crit1:-3766,end -Crit0=32722,Crit1=-19209,end -UG_8=700, Crit0:1773,Crit1:-1333,end -UG_9=21, Crit0:15701,Crit1:-4460,end -UG_10=503, Crit0:890,Crit1:-1206,end -UG_11=1700, Crit0:265,Crit1:-2063,end -UG_12=503, Crit0:5566,Crit1:-880,end -UG_13=3, Crit0:6344,Crit1:-3175,end -UG_149=3700, Crit0:1488,Crit1:-2326,end -UG_404=512700, Crit0:695,Crit1:-3766,end -Crit0=32615,Crit1=-19150,end -UG_8=700, Crit0:1773,Crit1:-1333,end -UG_9=21, Crit0:15701,Crit1:-4460,end -UG_10=503, Crit0:890,Crit1:-1206,end -UG_11=1700, Crit0:265,Crit1:-2063,end -UG_12=503, Crit0:5566,Crit1:-880,end -UG_13=3, Crit0:6344,Crit1:-3175,end -UG_149=2700, Crit0:1381,Crit1:-2267,end -UG_404=512700, Crit0:695,Crit1:-3766,end -Crit0=32505,Crit1=-19076,end -UG_8=700, Crit0:1773,Crit1:-1333,end -UG_9=21, Crit0:15701,Crit1:-4460,end -UG_10=503, Crit0:890,Crit1:-1206,end -UG_11=1700, Crit0:265,Crit1:-2063,end -UG_12=503, Crit0:5566,Crit1:-880,end -UG_13=3, Crit0:6344,Crit1:-3175,end -UG_149=1700, Crit0:1271,Crit1:-2193,end -UG_404=512700, Crit0:695,Crit1:-3766,end -Crit0=21793,Crit1=-17830,end -UG_8=700, Crit0:1773,Crit1:-1333,end -UG_9=19700, Crit0:4879,Crit1:-3140,end -UG_10=503, Crit0:890,Crit1:-1206,end -UG_11=1700, Crit0:265,Crit1:-2063,end -UG_12=503, Crit0:5566,Crit1:-880,end -UG_13=3, Crit0:6344,Crit1:-3175,end -UG_149=2700, Crit0:1381,Crit1:-2267,end -UG_404=512700, Crit0:695,Crit1:-3766,end -Crit0=21683,Crit1=-17756,end -UG_8=700, Crit0:1773,Crit1:-1333,end -UG_9=19700, Crit0:4879,Crit1:-3140,end -UG_10=503, Crit0:890,Crit1:-1206,end -UG_11=1700, Crit0:265,Crit1:-2063,end -UG_12=503, Crit0:5566,Crit1:-880,end -UG_13=3, Crit0:6344,Crit1:-3175,end -UG_149=1700, Crit0:1271,Crit1:-2193,end -UG_404=512700, Crit0:695,Crit1:-3766,end -Crit0=33150,Crit1=-19774,end -UG_8=700, Crit0:1773,Crit1:-1333,end -UG_9=21, Crit0:15701,Crit1:-4460,end -UG_10=503, Crit0:890,Crit1:-1206,end -UG_11=1700, Crit0:265,Crit1:-2063,end -UG_12=503, Crit0:5566,Crit1:-880,end -UG_13=3700, Crit0:1705,Crit1:-2064,end -UG_149=2, Crit0:6555,Crit1:-4002,end -UG_404=512700, Crit0:695,Crit1:-3766,end -Crit0=28083,Crit1=-18098,end -UG_8=700, Crit0:1773,Crit1:-1333,end -UG_9=21, Crit0:15701,Crit1:-4460,end -UG_10=503, Crit0:890,Crit1:-1206,end -UG_11=1700, Crit0:265,Crit1:-2063,end -UG_12=503, Crit0:5566,Crit1:-880,end -UG_13=3700, Crit0:1705,Crit1:-2064,end -UG_149=3700, Crit0:1488,Crit1:-2326,end -UG_404=512700, Crit0:695,Crit1:-3766,end -Crit0=27976,Crit1=-18039,end -UG_8=700, Crit0:1773,Crit1:-1333,end -UG_9=21, Crit0:15701,Crit1:-4460,end -UG_10=503, Crit0:890,Crit1:-1206,end -UG_11=1700, Crit0:265,Crit1:-2063,end -UG_12=503, Crit0:5566,Crit1:-880,end -UG_13=3700, Crit0:1705,Crit1:-2064,end -UG_149=2700, Crit0:1381,Crit1:-2267,end -UG_404=512700, Crit0:695,Crit1:-3766,end -Crit0=27866,Crit1=-17965,end -UG_8=700, Crit0:1773,Crit1:-1333,end -UG_9=21, Crit0:15701,Crit1:-4460,end -UG_10=503, Crit0:890,Crit1:-1206,end -UG_11=1700, Crit0:265,Crit1:-2063,end -UG_12=503, Crit0:5566,Crit1:-880,end -UG_13=3700, Crit0:1705,Crit1:-2064,end -UG_149=1700, Crit0:1271,Crit1:-2193,end -UG_404=512700, Crit0:695,Crit1:-3766,end -Crit0=17261,Crit1=-16778,end -UG_8=700, Crit0:1773,Crit1:-1333,end -UG_9=19700, Crit0:4879,Crit1:-3140,end -UG_10=503, Crit0:890,Crit1:-1206,end -UG_11=1700, Crit0:265,Crit1:-2063,end -UG_12=503, Crit0:5566,Crit1:-880,end -UG_13=3700, Crit0:1705,Crit1:-2064,end -UG_149=3700, Crit0:1488,Crit1:-2326,end -UG_404=512700, Crit0:695,Crit1:-3766,end -Crit0=17154,Crit1=-16719,end -UG_8=700, Crit0:1773,Crit1:-1333,end -UG_9=19700, Crit0:4879,Crit1:-3140,end -UG_10=503, Crit0:890,Crit1:-1206,end -UG_11=1700, Crit0:265,Crit1:-2063,end -UG_12=503, Crit0:5566,Crit1:-880,end -UG_13=3700, Crit0:1705,Crit1:-2064,end -UG_149=2700, Crit0:1381,Crit1:-2267,end -UG_404=512700, Crit0:695,Crit1:-3766,end -Crit0=17044,Crit1=-16645,end -UG_8=700, Crit0:1773,Crit1:-1333,end -UG_9=19700, Crit0:4879,Crit1:-3140,end -UG_10=503, Crit0:890,Crit1:-1206,end -UG_11=1700, Crit0:265,Crit1:-2063,end -UG_12=503, Crit0:5566,Crit1:-880,end -UG_13=3700, Crit0:1705,Crit1:-2064,end -UG_149=1700, Crit0:1271,Crit1:-2193,end -UG_404=512700, Crit0:695,Crit1:-3766,end -Crit0=33011,Crit1=-19727,end -UG_8=700, Crit0:1773,Crit1:-1333,end -UG_9=21, Crit0:15701,Crit1:-4460,end -UG_10=503, Crit0:890,Crit1:-1206,end -UG_11=1700, Crit0:265,Crit1:-2063,end -UG_12=503, Crit0:5566,Crit1:-880,end -UG_13=2700, Crit0:1566,Crit1:-2017,end -UG_149=2, Crit0:6555,Crit1:-4002,end -UG_404=512700, Crit0:695,Crit1:-3766,end -Crit0=27727,Crit1=-17918,end -UG_8=700, Crit0:1773,Crit1:-1333,end -UG_9=21, Crit0:15701,Crit1:-4460,end -UG_10=503, Crit0:890,Crit1:-1206,end -UG_11=1700, Crit0:265,Crit1:-2063,end -UG_12=503, Crit0:5566,Crit1:-880,end -UG_13=2700, Crit0:1566,Crit1:-2017,end -UG_149=1700, Crit0:1271,Crit1:-2193,end -UG_404=512700, Crit0:695,Crit1:-3766,end -Crit0=32871,Crit1=-19674,end -UG_8=700, Crit0:1773,Crit1:-1333,end -UG_9=21, Crit0:15701,Crit1:-4460,end -UG_10=503, Crit0:890,Crit1:-1206,end -UG_11=1700, Crit0:265,Crit1:-2063,end -UG_12=503, Crit0:5566,Crit1:-880,end -UG_13=1700, Crit0:1426,Crit1:-1964,end -UG_149=2, Crit0:6555,Crit1:-4002,end -UG_404=512700, Crit0:695,Crit1:-3766,end -Crit0=27587,Crit1=-17865,end -UG_8=700, Crit0:1773,Crit1:-1333,end -UG_9=21, Crit0:15701,Crit1:-4460,end -UG_10=503, Crit0:890,Crit1:-1206,end -UG_11=1700, Crit0:265,Crit1:-2063,end -UG_12=503, Crit0:5566,Crit1:-880,end -UG_13=1700, Crit0:1426,Crit1:-1964,end -UG_149=1700, Crit0:1271,Crit1:-2193,end -UG_404=512700, Crit0:695,Crit1:-3766,end -Crit0=16905,Crit1=-16598,end -UG_8=700, Crit0:1773,Crit1:-1333,end -UG_9=19700, Crit0:4879,Crit1:-3140,end -UG_10=503, Crit0:890,Crit1:-1206,end -UG_11=1700, Crit0:265,Crit1:-2063,end -UG_12=503, Crit0:5566,Crit1:-880,end -UG_13=2700, Crit0:1566,Crit1:-2017,end -UG_149=1700, Crit0:1271,Crit1:-2193,end -UG_404=512700, Crit0:695,Crit1:-3766,end -Crit0=16765,Crit1=-16545,end -UG_8=700, Crit0:1773,Crit1:-1333,end -UG_9=19700, Crit0:4879,Crit1:-3140,end -UG_10=503, Crit0:890,Crit1:-1206,end -UG_11=1700, Crit0:265,Crit1:-2063,end -UG_12=503, Crit0:5566,Crit1:-880,end -UG_13=1700, Crit0:1426,Crit1:-1964,end -UG_149=1700, Crit0:1271,Crit1:-2193,end -UG_404=512700, Crit0:695,Crit1:-3766,end -636 solutions \ No newline at end of file diff --git a/MODFIRE-Prototype/out/production/MODFIRE-Prototype/UG.class b/MODFIRE-Prototype/out/production/MODFIRE-Prototype/UG.class index c878e06..8d29415 100644 Binary files a/MODFIRE-Prototype/out/production/MODFIRE-Prototype/UG.class and b/MODFIRE-Prototype/out/production/MODFIRE-Prototype/UG.class differ diff --git a/MODFIRE-Prototype/outputPairs.csv b/MODFIRE-Prototype/outputPairs.csv new file mode 100644 index 0000000..c633458 --- /dev/null +++ b/MODFIRE-Prototype/outputPairs.csv @@ -0,0 +1,526 @@ +1,2313 +2,19 +6,19 +8,500 +9,700 +10,19 +11,500 +12,1 +13,500 +14,1 +15,2 +25,1 +27,1 +28,2 +30,1 +31,1 +32,500 +33,500 +35,500 +37,1 +38,1 +42,3 +43,500 +45,2 +48,1 +49,1 +50,3 +51,1 +52,1 +53,1 +54,1 +55,19 +56,1 +57,500 +58,500 +60,1 +61,500 +62,500 +67,1 +68,2 +69,500 +70,500 +71,500 +72,1 +73,500 +74,2 +77,500 +78,500 +79,1 +80,500 +81,500 +83,3 +84,1 +85,1 +86,312 +87,312 +88,1 +89,3 +94,1 +96,2 +107,1 +111,500 +112,316 +113,1 +114,1 +115,1 +116,2 +117,1 +118,35 +119,5 +120,1 +121,1 +122,1 +124,500 +125,500 +126,3 +127,500 +128,3 +129,1 +130,500 +131,500 +132,500 +133,500 +134,500 +140,1 +141,1 +142,500 +143,10 +145,1 +146,1 +147,1 +149,1 +150,1 +154,1 +155,2 +156,1 +157,500 +158,1 +159,1 +160,1 +161,500 +162,500 +165,1 +166,1 +167,1 +168,1 +169,1 +170,1 +171,1 +175,801 +176,1 +179,1 +182,3 +183,1 +185,1 +186,2 +188,1 +189,1 +190,500 +191,500 +192,500 +193,1 +198,500 +199,15 +200,34 +201,500 +202,500 +203,500 +204,500 +206,500 +207,1 +208,500 +209,500 +211,1 +212,1 +213,1 +214,1 +215,19 +217,1 +220,500 +221,1 +222,1 +223,1 +238,1 +239,500 +240,1 +242,1 +243,1 +244,1 +249,1 +252,1 +253,3 +254,1 +264,1 +265,1 +273,1 +279,500 +280,1 +281,1 +282,1 +284,1 +285,2 +286,3 +287,2 +288,1 +289,1 +290,1 +291,1 +292,500 +293,500 +294,1 +295,1 +296,1 +298,1 +299,1 +300,1 +302,1 +303,1 +304,1 +305,500 +306,500 +308,316 +310,500 +312,1 +313,316 +314,1 +315,1 +316,500 +317,500 +318,1 +319,1 +320,1 +321,1 +322,1700 +323,2 +324,1 +325,2 +326,1 +327,1 +328,1 +330,7 +331,1 +332,1700 +333,1 +334,1 +335,19 +336,500 +337,1 +338,1 +339,1 +340,3 +341,1 +342,19 +343,1 +344,2 +345,501 +346,1 +350,1 +351,1 +352,500 +354,2 +355,28 +356,1 +357,501 +358,1 +359,316 +360,500 +361,500 +366,1 +382,802 +383,500 +388,1 +389,1 +390,1 +393,1 +394,1 +395,1 +396,3 +397,1 +398,1 +399,3 +400,300 +401,1 +402,3 +403,1 +404,1 +405,1 +406,500 +407,500 +411,1 +412,1 +413,2300 +416,500 +417,501 +418,500 +419,500 +420,1 +421,500 +422,500 +423,3 +424,800 +426,2 +431,1 +432,1 +434,1 +435,1 +436,500 +437,1 +438,1 +439,1 +441,1 +442,1 +443,308 +444,501 +446,500 +447,1 +448,500 +449,1 +450,3 +451,512 +452,500 +454,1 +455,500 +456,304 +457,2 +462,1 +463,312 +466,1 +467,3 +468,1 +469,1 +471,500 +472,1 +473,1 +475,500 +476,2 +477,500 +478,1 +479,500 +480,500 +481,1 +482,2 +485,500 +486,2 +487,1 +488,500 +490,500 +491,1 +492,500 +493,1 +494,1 +495,1 +496,1 +497,2 +498,1 +499,1 +500,1 +506,500 +507,500 +508,500 +509,501 +510,1 +511,1 +514,2 +515,500 +516,500 +517,500 +518,500 +519,1 +520,3 +521,2 +523,1 +524,1 +525,1 +526,43 +527,1 +528,2 +529,2 +530,500 +531,19 +532,1 +534,500 +536,1 +537,312 +538,1 +539,1 +540,312 +541,1 +542,1 +543,500 +545,500 +546,500 +547,1 +549,801 +550,1 +551,2 +552,36 +553,3 +554,501 +561,1 +562,1 +563,2 +564,500 +565,2 +566,1 +568,500 +569,1 +570,500 +571,500 +572,500 +574,500 +575,20 +576,2 +577,3 +578,1 +579,500 +580,500 +581,500 +582,500 +583,500 +584,500 +585,500 +593,3 +594,2 +595,1 +596,2 +597,19 +598,1 +599,27 +600,5 +601,1 +602,2 +603,1 +604,3 +607,500 +608,500 +609,2 +610,700 +613,2 +620,1 +621,1 +622,13 +623,500 +624,1 +625,3 +626,2 +627,500 +628,312 +629,500 +630,501 +631,3 +632,1 +633,500 +634,1 +635,1 +636,500 +637,1 +638,1 +639,500 +640,500 +641,501 +643,501 +644,1 +645,308 +647,1 +648,1 +649,1 +650,1 +651,46 +652,500 +653,2 +654,2 +656,1 +657,1 +659,3 +660,1 +661,19700 +662,1 +663,1 +664,13 +665,304 +666,2 +667,1 +668,19 +669,3 +670,13 +671,500 +672,1 +673,2 +674,500 +676,1 +677,34 +680,1 +681,2 +683,501 +684,1 +685,1 +686,3 +687,1 +688,1 +689,1 +690,1 +691,2 +692,500 +693,1 +694,2 +695,1 +696,1 +697,1 +698,1 +699,500 +700,1 +701,1 +702,34 +703,500 +704,2 +705,500 +706,500 +707,500 +708,501 +709,500 +710,500 +711,1 +715,1 +716,500 +717,1 +718,1 +719,1 +720,1 +721,1 +722,1 +723,35 +724,2 +725,2 +726,1 +728,1 +729,1 +732,500 +733,500 +734,500 +738,3 +739,500 +740,308 +741,21 +744,1 +745,1 +750,502 +751,1 +752,1 +753,1 +758,1 +759,1 +760,1 +761,500 +765,20 +766,3 +768,19 +769,1 +770,19 +778,1 +779,18 +780,1 +781,500 +783,1 +784,500 +785,500 diff --git a/MODFIRE-Prototype/outputPairsSingle.csv b/MODFIRE-Prototype/outputPairsSingle.csv new file mode 100644 index 0000000..e8e28a4 --- /dev/null +++ b/MODFIRE-Prototype/outputPairsSingle.csv @@ -0,0 +1,526 @@ +1,3313 +2,20 +6,20 +8,503700 +9,700 +10,21 +11,503 +12,3 +13,503 +14,3 +15,2 +25,3 +27,1 +28,1 +30,2 +31,1 +32,503 +33,503 +35,503 +37,2 +38,3316 +42,1 +43,503 +45,3 +48,3 +49,2 +50,3 +51,2 +52,2 +53,2 +54,3 +55,21 +56,2 +57,503 +58,503 +60,1 +61,500 +62,503 +67,2 +68,3 +69,503 +70,503 +71,503700 +72,2 +73,503 +74,1 +77,503 +78,503 +79,2 +80,503 +81,503 +83,1 +84,3316 +85,2317 +86,503 +87,503 +88,1 +89,2 +94,3316 +96,3 +107,3 +111,503 +112,318 +113,1 +114,2 +115,2 +116,3 +117,1 +118,34 +119,3 +120,2 +121,3 +122,3 +124,503 +125,500 +126,6 +127,502 +128,3 +129,1 +130,503 +131,503 +132,503700 +133,503700 +134,503 +140,3316 +141,2 +142,503 +143,12 +145,2 +146,2 +147,1 +149,2 +150,1 +154,2 +155,1 +156,2 +157,503 +158,2 +159,2 +160,2 +161,503 +162,503 +165,2 +166,2 +167,2 +168,2 +169,1 +170,2 +171,2 +175,801 +176,2 +179,1 +182,3 +183,3316 +185,2 +186,1 +188,1 +189,2 +190,503 +191,500 +192,503 +193,2 +198,503 +199,15 +200,34 +201,503 +202,503 +203,503 +204,503 +206,503 +207,2 +208,503 +209,503 +211,2 +212,2 +213,2 +214,2 +215,21316 +217,2 +220,503 +221,2 +222,2 +223,3 +238,2 +239,503 +240,2 +242,2 +243,2 +244,2 +249,2 +252,2 +253,2 +254,2 +264,2 +265,1 +273,3 +279,503 +280,2 +281,2 +282,2 +284,3 +285,2 +286,2 +287,2 +288,1 +289,2 +290,2 +291,2 +292,503 +293,502 +294,2 +295,2 +296,3316 +298,1 +299,3 +300,3 +302,3 +303,1 +304,2 +305,1 +306,503 +308,318 +310,503 +312,1 +313,317 +314,1 +315,3316 +316,503 +317,503 +318,2 +319,3 +320,1 +321,2 +322,2 +323,1 +324,2 +325,1 +326,2 +327,2 +328,2 +330,9 +331,2 +332,2 +333,2 +334,3 +335,20 +336,503 +337,2 +338,2 +339,2 +340,503 +341,2 +342,20 +343,2 +344,1 +345,503 +346,3 +350,1 +351,2 +352,503 +354,2 +355,30 +356,2 +357,503 +358,2 +359,318 +360,503 +361,503 +366,2 +382,802 +383,503 +388,3 +389,2 +390,2 +393,2 +394,2 +395,3 +396,2 +397,2 +398,2 +399,3 +400,503 +401,2 +402,2 +403,3 +404,3 +405,2 +406,503 +407,503 +411,3 +412,1 +413,3301 +416,503 +417,502 +418,503 +419,503 +420,2 +421,503 +422,503 +423,2 +424,800 +426,3 +431,3316 +432,2 +434,2 +435,2 +436,503700 +437,2 +438,2 +439,2 +441,1 +442,3316 +443,503 +444,503 +446,501 +447,1 +448,503 +449,2 +450,2 +451,514 +452,503 +454,2 +455,503 +456,306 +457,3 +462,2 +463,503 +466,2 +467,2 +468,2 +469,2 +471,503 +472,1 +473,2 +475,503 +476,2 +477,503 +478,2 +479,503 +480,503 +481,2 +482,1 +485,502 +486,3 +487,2 +488,503 +490,503 +491,3 +492,502 +493,3 +494,2 +495,2 +496,2 +497,2 +498,3 +499,3 +500,2 +506,503 +507,503 +508,503 +509,503 +510,3 +511,2 +514,1 +515,502 +516,502 +517,502 +518,502 +519,3 +520,2 +521,3 +523,2 +524,2 +525,3 +526,44 +527,2 +528,3 +529,2 +530,503 +531,21 +532,2 +534,503 +536,2 +537,503 +538,3316 +539,3 +540,503 +541,2 +542,3 +543,503 +545,503 +546,502 +547,3316 +549,801 +550,2 +551,2 +552,34 +553,2 +554,503 +561,2 +562,2 +563,1 +564,503 +565,3 +566,2 +568,503 +569,3 +570,503 +571,503 +572,503 +574,503 +575,21 +576,2 +577,2 +578,2 +579,502 +580,503 +581,503 +582,503 +583,503 +584,503 +585,503 +593,2 +594,2 +595,2 +596,2 +597,21 +598,2 +599,27 +600,3 +601,2 +602,3 +603,2 +604,3 +607,503 +608,503 +609,1 +610,700 +613,3 +620,2 +621,2 +622,15 +623,503 +624,1 +625,2 +626,3 +627,503 +628,502 +629,502 +630,503 +631,2 +632,2 +633,503 +634,3 +635,3308 +636,502 +637,2 +638,2 +639,503 +640,503 +641,503 +643,502 +644,2 +645,503 +647,2 +648,2 +649,2 +650,1 +651,48 +652,503 +653,2 +654,1 +656,1 +657,2 +659,1 +660,3 +661,20 +662,3 +663,2 +664,15 +665,503 +666,3316 +667,2 +668,20 +669,3 +670,15 +671,503 +672,3 +673,3 +674,502 +676,2 +677,35 +680,2 +681,3 +683,502 +684,2 +685,2 +686,3 +687,1 +688,2 +689,2 +690,2 +691,1 +692,503 +693,1 +694,2 +695,2 +696,2 +697,2 +698,3 +699,503 +700,2 +701,2 +702,36 +703,503 +704,3 +705,503 +706,503 +707,503 +708,503 +709,503 +710,502 +711,1 +715,2 +716,503 +717,2 +718,1 +719,2 +720,3 +721,1 +722,1 +723,34 +724,3 +725,3 +726,1 +728,2 +729,2 +732,503 +733,502 +734,503 +738,3 +739,503 +740,503 +741,19312 +744,3 +745,2 +750,502 +751,2 +752,2 +753,2 +758,3 +759,1 +760,1 +761,503 +765,20 +766,3 +768,20 +769,2 +770,20 +778,3 +779,18 +780,2 +781,503 +783,2 +784,503700 +785,503 diff --git a/MODFIRE-Prototype/src/UG.java b/MODFIRE-Prototype/src/UG.java index 6cf083c..eb0cfef 100644 --- a/MODFIRE-Prototype/src/UG.java +++ b/MODFIRE-Prototype/src/UG.java @@ -185,6 +185,9 @@ public class UG { toInsert.crit10 = returnInsertable2(reader10); + if(toInsert.adj[0] == -1){ + toInsert.valid = false; + } array[index] = toInsert; index++; -- libgit2 0.21.2