All done!

Co-authored-by: sigonasr2 <sigonasr2@gmail.com>

ChallengeLeaguePointSolver/ChampionsLeaguePointSolver.cpp

@@ -53,25 +53,40 @@ class ChampionsLeaguePointSolver : public olc::PixelGameEngine
     std::vector<std::pair<int,int>>player1Score,player2Score,player3Score;
     std::vector<TestCase>cases;
     std::vector<SongCombinations> bestComboA,bestComboB;
-        int calculationStep=0;
+    int calculationStep=0;
     void Evaluate(int caseInd,bool ASet){
-        auto ChooseSong = [](SongCombinations&combinations,std::vector<ScoreData>&dat,int index){
+        auto ChooseSong = [&](SongCombinations&combinations,std::vector<ScoreData>&dat,int index){
             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;
+                if(ASet){
-                combinations.p1.push_back(std::pair<int,int>{index,dat[index].ex1});
+                    combinations.totalEX+=player1Score[index].first;
+                    combinations.p1.push_back(std::pair<int,int>{index,player1Score[index].first});
+                }else{
+                    combinations.totalEX+=player1Score[index].second;
+                    combinations.p1.push_back(std::pair<int,int>{index,player1Score[index].second});
+                }
                 combinations.p1Picked.insert(index);
             }else
             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;
+                if(ASet){
-                combinations.p2.push_back(std::pair<int,int>{index,dat[index].ex2});
+                    combinations.totalEX+=player2Score[index].first;
+                    combinations.p1.push_back(std::pair<int,int>{index,player2Score[index].first});
+                }else{
+                    combinations.totalEX+=player2Score[index].second;
+                    combinations.p1.push_back(std::pair<int,int>{index,player2Score[index].second});
+                }
                 combinations.p2Picked.insert(index);
             }else
             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;
+                if(ASet){
-                combinations.p3.push_back(std::pair<int,int>{index,dat[index].ex3});
+                    combinations.totalEX+=player3Score[index].first;
+                    combinations.p1.push_back(std::pair<int,int>{index,player3Score[index].first});
+                }else{
+                    combinations.totalEX+=player3Score[index].second;
+                    combinations.p1.push_back(std::pair<int,int>{index,player3Score[index].second});
+                }
                 combinations.p3Picked.insert(index);
             }
         };
@@ -172,6 +187,7 @@ class ChampionsLeaguePointSolver : public olc::PixelGameEngine
         calculationStep++;
     }
     public:
+        int highestEX=0;
         struct SongElement{
             SongElement(QuickGUI::Manager&manager,std::string songName,vf2d pos){
                 label=new QuickGUI::Label(manager,songName,pos,{164,12});
@@ -228,9 +244,9 @@ class ChampionsLeaguePointSolver : public olc::PixelGameEngine
                     stoi(GetNext(marker,line)),
                     stoi(GetNext(marker,line)),
                     stoi(GetNext(marker,line))};
-                player1Score.push_back(std::pair<int,int>{dat.ex1,0});
+                player1Score.push_back(std::pair<int,int>{0,0});
-                player2Score.push_back(std::pair<int,int>{dat.ex2,0});
+                player2Score.push_back(std::pair<int,int>{0,0});
-                player3Score.push_back(std::pair<int,int>{dat.ex3,0});
+                player3Score.push_back(std::pair<int,int>{0,0});
                 dataA.push_back(dat);
                 songs.push_back(SongElement{gui,dat.song.substr(0,dat.song.find(',')),{4.f,2.f+12*i+16}});
             }
@@ -247,9 +263,9 @@ class ChampionsLeaguePointSolver : public olc::PixelGameEngine
                     stoi(GetNext(marker,line)),
                     stoi(GetNext(marker,line)),
                     stoi(GetNext(marker,line))};
-                player1Score[i].second=dat.ex1;
+                player1Score[i].second=0;
-                player2Score[i].second=dat.ex2;
+                player2Score[i].second=0;
-                player3Score[i].second=dat.ex3;
+                player3Score[i].second=0;
                 dataB.push_back(dat);
                 songs.push_back(SongElement{gui,dat.song.substr(0,dat.song.find(',')),{4.f,2.f+12*(i+13)+16}});
             }
@@ -286,13 +302,24 @@ class ChampionsLeaguePointSolver : public olc::PixelGameEngine
 
             if(calculateButton->bPressed&&!calculating){
                 calculateButton->Enable(false);
+                int index=0;
                 for(SongElement&element:songs){
                     element.p1Score->Enable(false);
                     element.p2Score->Enable(false);
                     element.p3Score->Enable(false);
                     element.p1Score->bHasBackground=element.label->bHasBackground=false;
+                    if(index<12){
+                        player1Score[index].first=element.p1Score->sText.length()>0?stoi(element.p1Score->sText):0;
+                        player2Score[index].first=element.p2Score->sText.length()>0?stoi(element.p2Score->sText):0;
+                        player3Score[index].first=element.p3Score->sText.length()>0?stoi(element.p3Score->sText):0;
+                    }else{
+                        player1Score[index-12].second=element.p1Score->sText.length()>0?stoi(element.p1Score->sText):0;
+                        player2Score[index-12].second=element.p2Score->sText.length()>0?stoi(element.p2Score->sText):0;
+                        player3Score[index-12].second=element.p3Score->sText.length()>0?stoi(element.p3Score->sText):0;
+                    }
                     element.p2Score->bHasBackground=element.label->bHasBackground=false;
                     element.p3Score->bHasBackground=element.label->bHasBackground=false;
+                    index++;
                 }
                 calculating=true;
                 calculationStep=0;
@@ -302,6 +329,11 @@ class ChampionsLeaguePointSolver : public olc::PixelGameEngine
             }
             gui.Update(this);
             gui.Draw(this);
+
+            if(highestEX!=0){
+                DrawString({108,2},std::to_string(highestEX)+" EX",YELLOW);
+            }
+
             if(calculating){
                 if(calculationStep<cases.size()){
                     Evaluate(calculationStep,true);
@@ -314,7 +346,7 @@ class ChampionsLeaguePointSolver : public olc::PixelGameEngine
                 DrawRect({0,ScreenHeight()-12},{ScreenWidth(),12},BLACK);
 
                 if(calculationStep==totalCalculationSteps){
-                    int highestEX=0;
+                    highestEX=0;
                     SongCombinations picked1,picked2;
                     for(SongCombinations&A:bestComboA){
                         for(SongCombinations&B:bestComboB){

ChallengeLeaguePointSolver/olcPGEX_QuickGUI.h

@@ -646,7 +646,11 @@ namespace olc::QuickGUI
 		
 		// Draw Text
 		olc::vf2d vText = pge->GetTextSizeProp(sText);
-		pge->DrawStringProp(olc::vf2d(vPos.x + 2.0f, vPos.y + (vSize.y - vText.y) * 0.5f), sText, bHasBackground?olc::GREEN:m_manager.colText);
+		if(!m_bTextEdit&&sText.length()==0){
+			pge->DrawStringProp(olc::vf2d(vPos.x + 2.0f, vPos.y + (vSize.y - vText.y) * 0.5f), "0", bHasBackground?olc::GREEN:olc::DARK_GREY);
+		}else{
+			pge->DrawStringProp(olc::vf2d(vPos.x + 2.0f, vPos.y + (vSize.y - vText.y) * 0.5f), sText, bHasBackground?olc::GREEN:m_manager.colText);
+		}
 				
 	}