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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
law39 2020-04-29 11:11:09 +01:00
commit 4a650ffd79
3 changed files with 7 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
docs/test_spec/TestSpecGroup20.pdf
View file

Binary file not shown.

BIN
docs/test_spec/src/Test_Specification.docx
View file

Binary file not shown.

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

@ -24,14 +24,6 @@ import uk.ac.aber.cs22120.group20.javafx.Application;
public class TranslationController extends Question { public class TranslationController extends Question {
ArrayList<DictionaryEntry> practiceList = new ArrayList<>(); ArrayList<DictionaryEntry> practiceList = new ArrayList<>();
/**
* Represents the words that have already been used, and are no longer to be generated.
*/
ArrayList<Integer> numbersUsed = new ArrayList<Integer>();
int correctGuessesInt = 0;
int incorrectGuessesInt = 0;
/** /**
* Represents the word that will be randomly chosen from the practiceList. * Represents the word that will be randomly chosen from the practiceList.
*/ */
@ -57,8 +49,6 @@ public class TranslationController extends Question {
Random rand = new Random(); Random rand = new Random();
boolean englishOrWelsh = false; // False means English to Welsh, true means Welsh to English
/** /**
* Loads the test for the first time, filling the practice list with words from the dictionary, * Loads the test for the first time, filling the practice list with words from the dictionary,
@ -70,22 +60,15 @@ public class TranslationController extends Question {
submitButton.setImage(new Image ("file:src/main/resources/assets/icons/black_icons/50px/right-50.png")); submitButton.setImage(new Image ("file:src/main/resources/assets/icons/black_icons/50px/right-50.png"));
for(DictionaryEntry entry : Application.dictionary){ practiceList.addAll(Application.practiseList);
if(entry.isPracticeWord()){
practiceList.add(entry);
}
}
chosenWord = (rand.nextInt(practiceList.size())); chosenWord = (rand.nextInt(practiceList.size()));
numbersUsed.add(chosenWord);
englishOrWelsh = rand.nextBoolean(); correctGuesses.setText("Correct Guesses: " + correctAnswers);
incorrectGuesses.setText("Incorrect Guesses: " + wrongAnswers);
correctGuesses.setText("Correct Guesses: 0"); if(AssessmentGenerator.isEnglish){
incorrectGuesses.setText("Incorrect Guesses: 0");
if(englishOrWelsh){
wordToTranslate.setText(practiceList.get(chosenWord).getWelsh()); wordToTranslate.setText(practiceList.get(chosenWord).getWelsh());
} }
else{ else{
@ -95,10 +78,8 @@ public class TranslationController extends Question {
/** /**
* Takes the word that the user has entered as their attempt at translate, compares * Takes the word the user inputs and compares it to the correct answer using
* it to the correct translation, and depending on if it is correct or not, increment how many * the checkAnswer function in the QuestionClass.
* right or wrong answers they have so far. After checking if the user got it right,
* it will generate a new word for the user to translate, provided they have words left to translate.
*/ */
@FXML @FXML
void translateWord() { void translateWord() {
@ -109,35 +90,8 @@ public class TranslationController extends Question {
ArrayList<DictionaryEntry> correctTranslation = new ArrayList<>(); ArrayList<DictionaryEntry> correctTranslation = new ArrayList<>();
correctTranslation.add(practiceList.get(chosenWord)); correctTranslation.add(practiceList.get(chosenWord));
checkAnswer(correctTranslation, usersInput, englishOrWelsh); checkAnswer(correctTranslation, usersInput, AssessmentGenerator.isEnglish);
correctGuesses.setText("Correct Guesses: " + correctAnswer);
incorrectGuesses.setText("Incorrect Guesses: " + wrongAnswer);
do{
chosenWord = (rand.nextInt(practiceList.size()));
}while((numbersUsed.contains(chosenWord)) && numbersUsed.size() < practiceList.size());
numbersUsed.add(chosenWord);
if(numbersUsed.size() > practiceList.size()){
wordToTranslate.setText("Test Complete");
submitButton.setVisible(false);
}
if(englishOrWelsh){
wordToTranslate.setText(practiceList.get(chosenWord).getWelsh());
}
else{
wordToTranslate.setText(practiceList.get(chosenWord).getEnglish());
}
} }
} }