noble/uni-group-project
noble/uni-group-project
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed Assessment Generator

Browse source 
Assessment would not run due to a logic error causing a null reference exception, this is now fixed.
This commit is contained in:
law39 2020-04-30 12:03:57 +01:00
parent 05b7c10014
commit 0d54e54d99
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/AssessmentGenerator.java
View file

@ -52,21 +52,20 @@ public class AssessmentGenerator {
case (0): //0 Means translation test. case (0): //0 Means translation test.
//wordToTranslatePlace = rand.nextInt(Application.practiseList.size()); //wordToTranslatePlace = rand.nextInt(Application.practiseList.size());
//wordToTranslate = Application.practiseList.get(wordToTranslatePlace); //wordToTranslate = Application.practiseList.get(wordToTranslatePlace);
if(!(listOfAssessment.getLast() == null) || (listOfAssessment.getLast() instanceof TranslationQuestion)){ if((listOfAssessment.isEmpty()) || !(listOfAssessment.getLast() instanceof TranslationQuestion)){
numberToGenerate--;
break;
}
generatedAssessment = generateTranslationTest(practiseList); generatedAssessment = generateTranslationTest(practiseList);
}else {
numberToGenerate--;
}
break; break;
case (1): //1 Means six meanings test. case (1): //1 Means six meanings test.
//wordToTranslatePlace = rand.nextInt(Application.practiseList.size()); //wordToTranslatePlace = rand.nextInt(Application.practiseList.size());
//wordToTranslate = Application.practiseList.get(wordToTranslatePlace); //wordToTranslate = Application.practiseList.get(wordToTranslatePlace);
if(!(listOfAssessment.getLast() == null) || (listOfAssessment.getLast() instanceof SixMeaningsQuestion)){ if(((listOfAssessment.isEmpty())) || !(listOfAssessment.getLast() instanceof SixMeaningsQuestion)){
numberToGenerate--;
break;
}
generatedAssessment = generateSixMeanings(practiseList); generatedAssessment = generateSixMeanings(practiseList);
}else {
numberToGenerate--;
}
break; break;
case (2): //2 Means match meanings test. case (2): //2 Means match meanings test.
// LinkedList<DictionaryEntry> wordsToTranslate = new LinkedList<>(); // LinkedList<DictionaryEntry> wordsToTranslate = new LinkedList<>();
@ -75,16 +74,17 @@ public class AssessmentGenerator {
// wordsToTranslate.add(Application.practiseList.get(wordToTranslatePlace)); // wordsToTranslate.add(Application.practiseList.get(wordToTranslatePlace));
// wordsToTranslate.toArray(); // wordsToTranslate.toArray();
// } // }
if(!(listOfAssessment.getLast() == null) || (listOfAssessment.getLast() instanceof MatchTheMeaningQuestion)){ if((listOfAssessment.isEmpty()) || !(listOfAssessment.getLast() instanceof MatchTheMeaningQuestion)){
numberToGenerate--;
break;
}
generatedAssessment = generateMatchMeaning(practiseList); generatedAssessment = generateMatchMeaning(practiseList);
}else {
numberToGenerate--;
}
break; break;
} }
if(generatedAssessment != null) {
listOfAssessment.add(generatedAssessment); listOfAssessment.add(generatedAssessment);
} }
}
AssessmentGenerator.listOfAssessment = listOfAssessment; AssessmentGenerator.listOfAssessment = listOfAssessment;
goToNextQuestion(); goToNextQuestion();
} }