Merged master into wrapper and resolved all conflicts that were present (1a372572) · Commits · msdt / team1920-SpeechComparison · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

team1920-SpeechComparison
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

Admin message

Every first Monday of the month there will be maintenance on the server from 5 pm Due to maintenance, Gitlab will be unavailable for approximately 60 minutes

1a372572

Commit 1a372572 authored 5 years ago by Haak, R. (Romeo)

Downloads
- Plain Diff

Merged master into wrapper and resolved all conflicts that were present

parents 9580e0be f9c338dc

No related branches found

No related tags found

1 merge request!82Sc 129/wrapper

Changes 16

Hide whitespace changes

Inline Side-by-side

Showing

umbra/dutch_mmetaphone.py 0 additions, 2 deletions

umbra/dutch_mmetaphone.py
umbra/filereader.py 0 additions, 9 deletions

umbra/filereader.py
umbra/form_checker.py 160 additions, 39 deletions

umbra/form_checker.py
umbra/mistake_finder.py 110 additions, 39 deletions

umbra/mistake_finder.py
umbra/model.py 1 addition, 0 deletions

umbra/model.py
umbra/needleman_wunsch.py 21 additions, 2 deletions

umbra/needleman_wunsch.py
umbra/resources/irregular_verbs.csv 0 additions, 0 deletions

umbra/resources/irregular_verbs.csv
umbra/semantic_checker.py 7 additions, 5 deletions

umbra/semantic_checker.py
umbra/statistics.py 10 additions, 4 deletions

umbra/statistics.py
umbra/tests/context.py 17 additions, 4 deletions

umbra/tests/context.py
umbra/tests/test_controller.py 113 additions, 16 deletions

umbra/tests/test_controller.py
umbra/tests/test_dwn.py 57 additions, 0 deletions

umbra/tests/test_dwn.py
umbra/tests/test_view.py 24 additions, 0 deletions

umbra/tests/test_view.py
umbra/utils.py 9 additions, 0 deletions

umbra/utils.py
umbra/view.py 3 additions, 15 deletions

umbra/view.py
umbra/words.py 20 additions, 0 deletions

umbra/words.py

with 552 additions and 135 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment