Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/FractionBounceActivity.py
diff options
context:
space:
mode:
authorWalter Bender <walter.bender@gmail.com>2011-10-01 13:13:11 (GMT)
committer Walter Bender <walter.bender@gmail.com>2011-10-01 13:13:11 (GMT)
commit2e22d4501d72b59f4591ae40ff3e2f56e0135b79 (patch)
tree46696ae8c4f9e068cd5efa92912f314e1504a8f8 /FractionBounceActivity.py
parentbe3a02fe7cfbac29ce9d01ce663db3feb5f709a5 (diff)
use string value from table instead of frac2dec
Diffstat (limited to 'FractionBounceActivity.py')
-rw-r--r--FractionBounceActivity.py40
1 files changed, 1 insertions, 39 deletions
diff --git a/FractionBounceActivity.py b/FractionBounceActivity.py
index 043b74e..6454c72 100644
--- a/FractionBounceActivity.py
+++ b/FractionBounceActivity.py
@@ -48,44 +48,6 @@ def _separator_factory(toolbar, expand=False, visible=True):
_separator.show()
-def dec2frac(d):
- """ Convert float to its approximate fractional representation. """
-
- """
- This code was translated to Python from the answers at
- http://stackoverflow.com/questions/95727/how-to-convert-floats-to-human-\
-readable-fractions/681534#681534
-
- For example:
- >>> 3./5
- 0.59999999999999998
-
- >>> dec2frac(3./5)
- "3/5"
-
- """
-
- if d > 1:
- return "%s" % d
- df = 1.0
- top = 1
- bot = 1
-
- while abs(df - d) > 0.00000001:
- if df < d:
- top += 1
- else:
- bot += 1
- top = int(d * bot)
- df = float(top) / bot
-
- if bot == 1:
- return "%s" % top
- elif top == 0:
- return ""
- return "%s/%s" % (top, bot)
-
-
class FractionBounceActivity(activity.Activity):
def __init__(self, handle):
@@ -130,4 +92,4 @@ class FractionBounceActivity(activity.Activity):
""" update the challenge label """
self.challenge.set_label(_("Bounce the ball to a position %(fraction)s \
way from the left side of the bar.") \
- % {'fraction': dec2frac(fraction)})
+ % {'fraction': fraction})