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

AssessmentGenerator fixed merge conflict bug

Browse source
This commit is contained in:
law39 2020-05-01 14:54:25 +01:00
parent 1a8d956a7d
commit 5843e21591
1 changed files with 0 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -51,14 +51,7 @@ public class AssessmentGenerator {
reset(); reset();
<<<<<<< HEAD:src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/AssessmentGenerator.java
if (practiseList.size()<5){
=======
//int wordToTranslatePlace;
if (practiseList.size()==0){ if (practiseList.size()==0){
>>>>>>> f4a81a51ec9ef443efded0b3f4eb1ff41c105263:src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/AssessmentGenerator.java
Alert alert = new Alert(Alert.AlertType.ERROR); Alert alert = new Alert(Alert.AlertType.ERROR);
alert.setTitle("Error"); alert.setTitle("Error");
alert.setHeaderText("Not enough words in practice list"); alert.setHeaderText("Not enough words in practice list");
@ -86,24 +79,11 @@ public class AssessmentGenerator {
} }
break; break;
case (2): //2 Means match meanings test. case (2): //2 Means match meanings test.
<<<<<<< HEAD:src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/AssessmentGenerator.java
if((listOfAssessment.isEmpty()) || !(listOfAssessment.getLast() instanceof MatchTheMeaningQuestion)){
generatedAssessment = generateMatchMeaning(practiseList);
}else {
numberToGenerate--;
=======
// LinkedList<DictionaryEntry> wordsToTranslate = new LinkedList<>();
// for (int i = 0; i < 3; i++) {
// wordToTranslatePlace = rand.nextInt(Application.practiseList.size());
// wordsToTranslate.add(Application.practiseList.get(wordToTranslatePlace));
// wordsToTranslate.toArray();
// }
if(practiseList.size() > 3) { if(practiseList.size() > 3) {
if (((listOfAssessment.isEmpty()) || !(listOfAssessment.getLast() instanceof MatchTheMeaningQuestion))) { if (((listOfAssessment.isEmpty()) || !(listOfAssessment.getLast() instanceof MatchTheMeaningQuestion))) {
generatedAssessment = generateMatchMeaning(practiseList); generatedAssessment = generateMatchMeaning(practiseList);
break; break;
} }
>>>>>>> f4a81a51ec9ef443efded0b3f4eb1ff41c105263:src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/AssessmentGenerator.java
} }
numberToGenerate--; numberToGenerate--;
break; break;