diff --git a/ChallengeLeaguePointSolver/ChampionsLeaguePointSolver.cpp b/ChallengeLeaguePointSolver/ChampionsLeaguePointSolver.cpp index 961f072..42d42d5 100644 --- a/ChallengeLeaguePointSolver/ChampionsLeaguePointSolver.cpp +++ b/ChallengeLeaguePointSolver/ChampionsLeaguePointSolver.cpp @@ -107,19 +107,19 @@ int main(){ } auto ChooseSong = [](SongCombinations&combinations,std::vector&dat,int index){ - if(combinations.remainingA>0&&combinations.p1Picked.count(index)==0){ + if(combinations.remainingA>0&&combinations.p1Picked.count(index)==0&&combinations.p2Picked.count(index)==0&&combinations.p3Picked.count(index)==0){ combinations.remainingA--; combinations.totalEX+=dat[index].ex1; combinations.p1.emplace_back(std::pair{index,dat[index].ex1}); combinations.p1Picked.insert(index); }else - if(combinations.remainingB>0&&combinations.p2Picked.count(index)==0){ + if(combinations.remainingB>0&&combinations.p1Picked.count(index)==0&&combinations.p2Picked.count(index)==0&&combinations.p3Picked.count(index)==0){ combinations.remainingB--; combinations.totalEX+=dat[index].ex2; combinations.p2.emplace_back(std::pair{index,dat[index].ex2}); combinations.p2Picked.insert(index); }else - if(combinations.remainingC>0&&combinations.p3Picked.count(index)==0){ + if(combinations.remainingC>0&&combinations.p1Picked.count(index)==0&&combinations.p2Picked.count(index)==0&&combinations.p3Picked.count(index)==0){ combinations.remainingC--; combinations.totalEX+=dat[index].ex3; combinations.p3.emplace_back(std::pair{index,dat[index].ex3}); diff --git a/ChallengeLeaguePointSolver/team2 b/ChallengeLeaguePointSolver/team2 new file mode 100644 index 0000000..9458521 --- /dev/null +++ b/ChallengeLeaguePointSolver/team2 @@ -0,0 +1,28 @@ +"Scores due by September 24th, 23:59 PST",,,,,,, +Set A,,Total EX,NICONII,SALSA,YONCETAI,, +12,Sola,1287,1218,1155,980,,0 +13,Deadball de homerun,1323,1225,1047,994,,0 +13,Star Trail,1443,1339,1231,978,,0 +14,Draw the Savage,1425,1298,1294,1039,,0 +14,IMANOGUILTS,1719,1586,1336,993,,0 +15,Astrogazer,1782,1618,0,0,,0 +15,Kouen,1905,1772,0,0,,0 +16,The World Ends Now,1917,1730,0,0,,0 +16,S!ck,2118,1790,1563,0,,0 +17,Magnetic,2193,1815,0,0,,0 +17,Mikansei no jouki kudou otome,2262,1885,0,0,,0 +18,Nageki no ki,2370,1978,0,0,,0 +,,,,,,,0 +Set B,,,,,,,0 +12,Towards the Tower,1104,1046,1023,879,,0 +13,Xenon,1158,1088,1042,913,,0 +13,DeStRuCtIvE FoRcE,1299,1218,1102,833,,0 +14,Diamond Night,1359,1258,1169,919,,0 +14,Nightbird lost wing,1539,1395,1220,674,,0 +15,Sand Blow,1668,1466,0,0,,0 +15,SILVER DREAM,1668,1500,1242,0,,0 +16,Another Phase,1767,1547,0,0,,0 +16,Blew My Mind,1803,1464,0,0,,0 +17,Emera,1851,1531,0,0,,0 +17,JOMANDA,2004,1556,0,0,,0 +18,PARANOiA Revolution,2097,1582,0,0,,0 \ No newline at end of file