Update app.py

app.py

@@ -42,7 +42,7 @@ def parse_value_unit(value_unit_str):
     if match:
         value, unit = match.groups()
         log(f"Parsed value: {value}, unit: {unit}")
-        return Decimal(value), unit
+        return Decimal(value), unit, len(value.split('.')[1]) if '.' in value else 0
     else:
         raise ValueError("Invalid format. The input should be in the form 'value[unit]'.")
 
@@ -77,14 +77,14 @@ def calculate_expression(expression):
         raise ValueError("Invalid expression format")
     
     # 最初の項目を取得
-    value1, unit1 = parse_value_unit(terms[0])
+    value1, unit1, sig_figs1 = parse_value_unit(terms[0])
     total_value = value1
     total_unit = unit1
-    decimal_places_list = [len(str(value1).replace('.', '').replace('-', ''))]  # 有効数字のリストを保存
+    sig_figs_list = [sig_figs1]
     
     for i in range(1, len(terms)):
-        value2, unit2 = parse_value_unit(terms[i])
-        decimal_places_list.append(len(str(value2).replace('.', '').replace('-', '')))
+        value2, unit2, sig_figs2 = parse_value_unit(terms[i])
+        sig_figs_list.append(sig_figs2)
         
         if unit1 != unit2 and ('*' not in expression and '/' not in expression):
             value2 = convert_to_common_unit(value2, unit2, unit1)
@@ -98,10 +98,10 @@ def calculate_expression(expression):
         else:
             total_value += value2
 
-        log(f"Current total: {total_value}, current significant figures list: {decimal_places_list}")
+        log(f"Current total: {total_value}, current significant figures list: {sig_figs_list}")
     
     # 最も少ない有効数字に基づいて丸める
-    min_sig_figs = min(decimal_places_list)
+    min_sig_figs = min(sig_figs_list)
     rounded_result = total_value.quantize(Decimal('1e{0}'.format(-(min_sig_figs - 1))), rounding=ROUND_HALF_UP)
     log(f"Final result: {rounded_result} [{total_unit}]")