diff options
Diffstat (limited to 'lengthproblem.py')
| -rw-r--r-- | lengthproblem.py | 53 |
1 files changed, 25 insertions, 28 deletions
diff --git a/lengthproblem.py b/lengthproblem.py index 9965233..3c503e4 100644 --- a/lengthproblem.py +++ b/lengthproblem.py @@ -35,6 +35,8 @@ class LengthProblem(Problem): self.letter1 = letter1 self.letter2 = letter2 + self.problem_number = -1 + self.generate_problem() self.show_problem() @@ -68,13 +70,7 @@ class LengthProblem(Problem): LENGTH_13 = [ Vector(0, 0), Vector(50, 0), Vector(50, 500), Vector(0, 500) ] LENGTH_14 = [ Vector(0, 0), Vector(50, 0), Vector(50, 525), Vector(0, 525) ] LENGTH_15 = [ Vector(0, 0), Vector(50, 0), Vector(50, 550), Vector(0, 550) ] - - ## Choose two random letter to represent the two quantities - #letter1 = random.choice(['A', 'B', 'C', 'D', 'G', 'H', 'K', 'L', 'M', 'N', 'P', 'S', 'T']) - #letter2 = letter1 - #while letter2 == letter1: - # letter2 = random.choice(['A', 'B', 'C', 'D', 'G', 'H', 'K', 'L', 'M', 'N', 'P', 'S', 'T']) - + # Standard initial positions for the shapes. upper_left_position = Vector(300, 300) lower_right_position = Vector(900, 400) @@ -92,75 +88,76 @@ class LengthProblem(Problem): (0, math.pi/4), (math.pi/4, 0), (0, math.pi/4), (math.pi/4, 0), (0, 0), (math.pi/2, 0), (0, math.pi/2) ]) # The total number of problems. - n_problems = 18 + self.n_problems = 18 # Choose a random problem. - problem_number = random.randrange(0, n_problems) + while (self.problem_number in self.container.recently_used): + self.problem_number = random.randrange(0, self.n_problems) # Uncomment to test a particular problem. - #problem_number = 0 + #problem_number = 3 # Define the various problems. - if problem_number == 0: + if self.problem_number == 0: object1 = LENGTH_1 object2 = LENGTH_1 - elif problem_number == 1: + elif self.problem_number == 1: object1 = LENGTH_3 object2 = LENGTH_3 - elif problem_number == 2: + elif self.problem_number == 2: object1 = LENGTH_5 object2 = LENGTH_5 - elif problem_number == 3: + elif self.problem_number == 3: object1 = LENGTH_1 object2 = LENGTH_3 - elif problem_number == 4: + elif self.problem_number == 4: object1 = LENGTH_2 object2 = LENGTH_4 - elif problem_number == 5: + elif self.problem_number == 5: object1 = LENGTH_7 object2 = LENGTH_7 - elif problem_number == 6: + elif self.problem_number == 6: object1 = LENGTH_3 object2 = LENGTH_5 - elif problem_number == 7: + elif self.problem_number == 7: object1 = LENGTH_4 object2 = LENGTH_6 - elif problem_number == 8: + elif self.problem_number == 8: object1 = LENGTH_5 object2 = LENGTH_7 - elif problem_number == 9: + elif self.problem_number == 9: object1 = LENGTH_6 object2 = LENGTH_8 - elif problem_number == 10: + elif self.problem_number == 10: object1 = LENGTH_9 object2 = LENGTH_9 - elif problem_number == 11: + elif self.problem_number == 11: object1 = LENGTH_7 object2 = LENGTH_9 - elif problem_number == 12: + elif self.problem_number == 12: object1 = LENGTH_8 object2 = LENGTH_10 - elif problem_number == 13: + elif self.problem_number == 13: object1 = LENGTH_9 object2 = LENGTH_11 - elif problem_number == 14: + elif self.problem_number == 14: object1 = LENGTH_10 object2 = LENGTH_12 - elif problem_number == 15: + elif self.problem_number == 15: object1 = LENGTH_11 object2 = LENGTH_11 - elif problem_number == 16: + elif self.problem_number == 16: object1 = LENGTH_11 object2 = LENGTH_13 - elif problem_number == 17: + elif self.problem_number == 17: object1 = LENGTH_0 object2 = LENGTH_2 |