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

Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20

Browse source
This commit is contained in:
Henry Dugmore 2020-04-28 15:41:31 +01:00
commit ded93411a1
1 changed files with 23 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -15,34 +15,29 @@ import java.util.ArrayList;
*/ */
public class Question { public class Question {
public int correctAnswer = 0; public int correctAnswers = 0;
public int wrongAnswer =0; public int wrongAnswers =0;
/** /**
* Constructor for *
* WordEnterQuestion that takes a WelshDictionary object that is being tested on as the parameter. * @param listOfCorrectQuestions
* @param correctAnswer * @param listOfAnswers
* @param isEnglish
*/ */
public void wordEnterQuestion(DictionaryEntry correctAnswer){
}
public void checkAnswer(ArrayList<DictionaryEntry> listOfCorrectQuestions, ArrayList<String>listOfAnswers, boolean isEnglish){ public void checkAnswer(ArrayList<DictionaryEntry> listOfCorrectQuestions, ArrayList<String>listOfAnswers, boolean isEnglish){
if(isEnglish){ if(isEnglish){
for(int i=0; i<listOfCorrectQuestions.size();i++){ for(int i=0; i<listOfCorrectQuestions.size();i++){
if(listOfCorrectQuestions.get(i).getWelsh().equals(listOfAnswers.get(i))){ if(listOfCorrectQuestions.get(i).getWelsh().equals(listOfAnswers.get(i))){
correctAnswer++; correctAnswers++;
}else wrongAnswer++; }else wrongAnswers++;
} }
}else{ }else{
for(int i=0; i<listOfCorrectQuestions.size();i++){ for(int i=0; i<listOfCorrectQuestions.size();i++){
if(listOfCorrectQuestions.get(i).getEnglish().equals(listOfAnswers.get(i))){ if(listOfCorrectQuestions.get(i).getEnglish().equals(listOfAnswers.get(i))){
correctAnswer++; correctAnswers++;
}else wrongAnswer++; }else wrongAnswers++;
} }
} }
} }
} }