From 839d16fdf062d1675430d669025772b36ef500f8 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Wed, 21 Nov 2018 21:09:14 +0000
Subject: [PATCH] Added dec formatting and checking multiple 0 answers.
---
aoi_gen/Problem.py | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/aoi_gen/Problem.py b/aoi_gen/Problem.py
index ee70873..bb6be1a 100644
--- a/aoi_gen/Problem.py
+++ b/aoi_gen/Problem.py
@@ -68,8 +68,12 @@
def checkAnsProximity(self, ans):
for idx1, (val1, cor) in enumerate(ans):
for idx2, (val2, cor) in enumerate(ans):
+
if idx1 == idx2:
continue
+
+ if (val1.get_formatted_value()==val2.get_formatted_value()):
+ return True
if not val1.is_float() or not val2.is_float():
if val1.get_formatted_value() == val2.get_formatted_value():
return True
@@ -118,7 +122,10 @@
for __corrsplit in __corr.split(";"):
__result = None
if __corrsplit.find("=") >= 0:
- exec(self.substitute_octave(__corrsplit))
+ try:
+ exec(self.substitute_octave(__corrsplit))
+ except:
+ print("Error while evaluating {}".format(__corrsplit))
else:
__result = eval(self.substitute_octave(__corrsplit))
if __result is None:
--
Gitblit v1.8.0