Skip to content

Fixed right angled triangle side ordering for area #161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TRManderson wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fixed right angled triangle side ordering for area #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b770e59
Fixed right angled triangle side ordering for area
TRManderson Apr 28, 2015
2efd56e
Update DESCRIPTION to reflect change
TRManderson Apr 28, 2015
8e98f8a
Change other tests to match invariant
TRManderson Apr 28, 2015
5e00a36
Update version
TRManderson Apr 28, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/tutorlib/gui/app/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
from tutorlib.online.sync import SyncClient


VERSION = '3.0.7'
VERSION = '3.0.8'


class TutorialApp(TutorialMenuDelegate, TutorEditorDelegate,
Expand Down
16 changes: 8 additions & 8 deletions problem_db/inherit_poly.tut/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,46 +43,46 @@ def _get_results():


class TestTriangleArea(StudentTestCase):
DESCRIPTION = 't = RightAngledTriangle([(0, 0), (0, 4), (3, 4)]); t.area() -> 6.'
DESCRIPTION = 't = RightAngledTriangle([(0, 4), (0, 0), (3, 4)]); t.area() -> 6.'
MAIN_TEST = 'test_main'

def test_main(self):
def _get_results():
t = RightAngledTriangle([(0, 0), (0, 4), (3, 4)])
t = RightAngledTriangle([(0, 4), (0, 0), (3, 4)])
return t.area()

result = self.run_in_student_context(_get_results)
self.assertEqual(result, 6)

def test_alternate(self):
def _get_results():
t = RightAngledTriangle([(0, 0), (0, 5), (12, 5)])
t = RightAngledTriangle([(0, 5), (0, 0), (12, 5)])
return t.area()

result = self.run_in_student_context(_get_results)
self.assertEqual(result, 30)


class TestTriangleVertices(StudentTestCase):
DESCRIPTION = 't = RightAngledTriangle([(0, 0), (0, 4), (3, 4)]); t.vertices() -> [(0, 0), (0, 4), (3, 4)]'
DESCRIPTION = 't = RightAngledTriangle([(0, 4), (0, 0), (3, 4)]); t.vertices() -> [(0, 4), (0, 0), (3, 4)]'
MAIN_TEST = 'test_main'

def test_main(self):
def _get_results():
t = RightAngledTriangle([(0, 0), (0, 4), (3, 4)])
t = RightAngledTriangle([(0, 4), (0, 0), (3, 4)])
return t.vertices()

result = self.run_in_student_context(_get_results)
expected = [(0, 0), (0, 4), (3, 4)]
expected = [(0, 4), (0, 0), (3, 4)]
self.assertEqual(sorted(result), sorted(expected))

def test_alternate(self):
def _get_results():
t = RightAngledTriangle([(0, 0), (0, 5), (12, 5)])
t = RightAngledTriangle([(0, 5), (0, 0), (12, 5)])
return t.vertices()

result = self.run_in_student_context(_get_results)
expected = [(0, 0), (0, 5), (12, 5)]
expected = [(0, 5), (0, 0), (12, 5)]
self.assertEqual(sorted(result), sorted(expected))


Expand Down