From 447ba58b7eadfb35c1e4a18157c2a15c4876618b Mon Sep 17 00:00:00 2001 From: law39 Date: Wed, 29 Apr 2020 13:50:11 +0100 Subject: [PATCH] Current Assessment is now incremented in Assessment gen Current Assessment is now incremented in Assessment gen, so now the same test doesn't loop over and over --- .../cs22120/group20/selfassessment/AssessmentGenerator.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/AssessmentGenerator.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/AssessmentGenerator.java index f29ed8d..db16ccc 100644 --- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/AssessmentGenerator.java +++ b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/AssessmentGenerator.java @@ -67,6 +67,7 @@ public class AssessmentGenerator { listOfAssessment.add(generatedAssessment); } AssessmentGenerator.listOfAssessment = listOfAssessment; + goToNextQuestion(); return listOfAssessment; } @@ -130,7 +131,7 @@ public class AssessmentGenerator { Question currentQuestion = listOfAssessment.get(currentAssessment); if(currentQuestion instanceof MatchTheMeaningQuestion){ - MatchTheMeaningController.answer = (ArrayList) Arrays.asList(((MatchTheMeaningQuestion) currentQuestion).getCorrectAnswer()); + MatchTheMeaningController.answer = ((MatchTheMeaningQuestion) currentQuestion).getCorrectAnswer(); ScreenSwitch.swap(ScreenSwitch.SceneEnum.matchMeaningScene); }else if (currentQuestion instanceof SixMeaningsQuestion){ SixMeaningsController.allQuestions = ((SixMeaningsQuestion) currentQuestion).getCorrectAnswer(); @@ -143,6 +144,7 @@ public class AssessmentGenerator { System.err.println(currentQuestion); } + currentAssessment++; }