From 8fe4d9b44bde3cec33314bcafe2130b6e4dac7af Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Sat, 24 Nov 2018 16:51:29 +0000
Subject: [PATCH] Dec debbuged and unit tests done.
---
aoi_gen/Variable.py | 26 +++++++++-----------------
1 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/aoi_gen/Variable.py b/aoi_gen/Variable.py
index 0777143..f27d718 100644
--- a/aoi_gen/Variable.py
+++ b/aoi_gen/Variable.py
@@ -130,18 +130,13 @@
num=float(("{:."+str(self.precision-1)+"e}").format(num))
places=self.fexp(num)
- if(places>0):
- decimal_places=self.precision-places-1
- if(decimal_places<0):
- decimal_places=0
- format_str="{:"+str(places)+"."+str(decimal_places)+"f}"
- else:
- format_str="{:."+str(self.precision)+"f}"
+ decimal_places=self.precision-places-1
+ if(decimal_places<0):
+ decimal_places=0
+ format_str="{:"+str(places)+"."+str(decimal_places)+"f}"
- return (
+ return format_str.format(num).replace(".", ",\!")
- format_str.format(num).replace(".", ",\!")
- )
def getValue(self, num):
@@ -149,13 +144,10 @@
num=float(("{:."+str(self.precision-1)+"e}").format(num))
places=self.fexp(num)
- if(places>0):
- decimal_places=self.precision-places-1
- if(decimal_places<0):
- decimal_places=0
- format_str="{:"+str(places)+"."+str(decimal_places)+"f}"
- else:
- format_str="{:."+str(self.precision)+"f}"
+ decimal_places=self.precision-places-1
+ if(decimal_places<0):
+ decimal_places=0
+ format_str="{:"+str(places)+"."+str(decimal_places)+"f}"
val=format_str.format(num)
return float(val)
--
Gitblit v1.8.0