From 7b6f6508f83d2bffc1e73668ca1d5c71e0d64a42 Mon Sep 17 00:00:00 2001 From: mmatera Date: Fri, 26 May 2023 14:07:37 -0300 Subject: [PATCH] Pi is a Numpy constant --- mathics/builtin/numbers/constants.py | 5 ++--- mathics/eval/arithmetic.py | 2 +- mathics/eval/parts.py | 8 ++------ 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/mathics/builtin/numbers/constants.py b/mathics/builtin/numbers/constants.py index a29aefe81..73779ff6a 100644 --- a/mathics/builtin/numbers/constants.py +++ b/mathics/builtin/numbers/constants.py @@ -646,8 +646,7 @@ def evaluate(self, evaluation: Evaluation) -> MachineReal: return NUMERICAL_CONSTANTS[self.symbol] -class Pi(_MPMathConstant, _SympyConstant): - # class Pi(_MPMathConstant, _NumpyConstant, _SympyConstant): +class Pi(_MPMathConstant, _NumpyConstant, _SympyConstant): """ :Pi, \u03c0: https://en.wikipedia.org/wiki/Pi ( @@ -752,7 +751,7 @@ class Underflow(Builtin): # Constants that are not numpy constants, -for cls in (Catalan, Degree, Glaisher, GoldenRatio, Khinchin, Pi): +for cls in (Catalan, Degree, Glaisher, GoldenRatio, Khinchin): instance = cls(expression=False) val = instance.get_constant() NUMERICAL_CONSTANTS[instance.symbol] = MachineReal(val.value) diff --git a/mathics/eval/arithmetic.py b/mathics/eval/arithmetic.py index 33d76c6e8..00976ac7b 100644 --- a/mathics/eval/arithmetic.py +++ b/mathics/eval/arithmetic.py @@ -479,7 +479,7 @@ def test_positive_arithmetic_expr(expr: BaseElement) -> bool: return False head, elements = expr.get_head(), expr.elements - print("check specifics", expr) + if head is SymbolPlus: positive_nonpositive_terms = {True: [], False: []} for term in elements: diff --git a/mathics/eval/parts.py b/mathics/eval/parts.py index 3ecf356d1..61a1adf33 100644 --- a/mathics/eval/parts.py +++ b/mathics/eval/parts.py @@ -6,7 +6,7 @@ from typing import List -from mathics.core.atoms import Integer, Integer1 +from mathics.core.atoms import Integer from mathics.core.convert.expression import make_expression from mathics.core.element import BaseElement, BoxElementMixin from mathics.core.exceptions import ( @@ -20,11 +20,7 @@ from mathics.core.list import ListExpression from mathics.core.subexpression import SubExpression from mathics.core.symbols import Atom, Symbol, SymbolList -from mathics.core.systemsymbols import ( - SymbolDirectedInfinity, - SymbolInfinity, - SymbolNothing, -) +from mathics.core.systemsymbols import SymbolInfinity, SymbolNothing from mathics.eval.patterns import Matcher