From cbf1cc4e783efd3268e96f5f302f69ac1ba87f97 Mon Sep 17 00:00:00 2001 From: Arthur Guiot Date: Mon, 30 Dec 2019 20:18:56 -0500 Subject: [PATCH] Working on simplification (but the tree makes a priority error) --- .../Algebra/Parser/Node/ConstantNode.swift | 2 +- .../Algebra/Parser/Node/ExpressionNode.swift | 4 ++-- .../Algebra/Parser/Node/OperatorNode.swift | 4 ++-- Sources/Euler/Algebra/Simplify/simplify.swift | 14 ++++++++++++++ Tests/EulerTests/NodeTests.swift | 19 ++++++++++++++++++- 5 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 Sources/Euler/Algebra/Simplify/simplify.swift diff --git a/Sources/Euler/Algebra/Parser/Node/ConstantNode.swift b/Sources/Euler/Algebra/Parser/Node/ConstantNode.swift index 468db6a..b3145dc 100644 --- a/Sources/Euler/Algebra/Parser/Node/ConstantNode.swift +++ b/Sources/Euler/Algebra/Parser/Node/ConstantNode.swift @@ -31,7 +31,7 @@ public class ConstantNode: NSObject, Node { /// Create a ConstantNode /// - Parameter bn: BigNumber/BigDouble public init(_ bn: BigNumber) { - self.content = bn.decimalDescription + self.content = bn.description } /// Create a ConstantNode /// - Parameter int: Integer diff --git a/Sources/Euler/Algebra/Parser/Node/ExpressionNode.swift b/Sources/Euler/Algebra/Parser/Node/ExpressionNode.swift index 841a68e..6bd04ff 100644 --- a/Sources/Euler/Algebra/Parser/Node/ExpressionNode.swift +++ b/Sources/Euler/Algebra/Parser/Node/ExpressionNode.swift @@ -47,8 +47,8 @@ public class ExpressionNode: NSObject, Node { /// Compiles ExpressionNode to simpler node (useless here, but required by protocol) public func compile() -> Node { - self.children = self.children.map { $0.compile() } - return self + guard let first = self.children.first else { return self } + return first.compile() } /// Converts ExpressionNode to BigNumber public func evaluate(_ params: [String: BigNumber]) -> BigNumber { diff --git a/Sources/Euler/Algebra/Parser/Node/OperatorNode.swift b/Sources/Euler/Algebra/Parser/Node/OperatorNode.swift index b2840fe..e687c2d 100644 --- a/Sources/Euler/Algebra/Parser/Node/OperatorNode.swift +++ b/Sources/Euler/Algebra/Parser/Node/OperatorNode.swift @@ -60,7 +60,7 @@ public class OperatorNode: NSObject, Node { let c1 = self.children[0].compile() let c2 = self.children[1].compile() - if c1.type == "ContantNode" && c2.type == "ContantNode" { + if c1.type == "ConstantNode" && c2.type == "ConstantNode" { let ev1 = c1.evaluate([:]) let ev2 = c2.evaluate([:]) switch self.content { @@ -80,7 +80,7 @@ public class OperatorNode: NSObject, Node { } - return self + return OperatorNode(self.content, children: [c1, c2]) } /// Converts OperatorNode to BigNumber public func evaluate(_ params: [String: BigNumber]) -> BigNumber { diff --git a/Sources/Euler/Algebra/Simplify/simplify.swift b/Sources/Euler/Algebra/Simplify/simplify.swift new file mode 100644 index 0000000..e5bfa15 --- /dev/null +++ b/Sources/Euler/Algebra/Simplify/simplify.swift @@ -0,0 +1,14 @@ +// +// File.swift +// +// +// Created by Arthur Guiot on 2019-12-30. +// + +import Foundation + +class Simplify { +// func simple(_ expr: ExpressionNode) -> ExpressionNode { +// return expr.compile() +// } +} diff --git a/Tests/EulerTests/NodeTests.swift b/Tests/EulerTests/NodeTests.swift index 8216ec4..c745251 100644 --- a/Tests/EulerTests/NodeTests.swift +++ b/Tests/EulerTests/NodeTests.swift @@ -54,12 +54,29 @@ class NodeTests: XCTestCase { XCTAssertEqual(try Parser("((4*2) - 3) +sqrt(4)").parse().toString(), "((4.0 * 2.0) - 3.0) + sqrt(4.0)") } catch { print(error.localizedDescription) + XCTFail() + } + + } + func testCompile() { + do { + let p = Parser("x+y*2 + (4+5)/3") + let expression = try p.parse() + let comp = expression.compile() + XCTAssertEqual(comp.toString(), "x + y * 2.0 + 3.0") + + XCTAssertEqual(try Parser("(4*2)").parse().compile().toString(), "8.0000") + } catch { + print(error.localizedDescription) + XCTFail() } } static var allTests = [ ("Constant Node", testConstantNode), ("Operator Node", testOperatorNode), - ("Symbol Node", testSymboleNode) + ("Symbol Node", testSymboleNode), + ("Parser", testParser), + ("Compiler", testCompile) ] }