DanilaFe/Abacus
1
0
Fork 0
mirror of https://github.com/DanilaFe/abacus synced 2026-09-25 12:52:33 +00:00
Code Issues Releases Wiki Activity

Remove the additional methods from the VariableDatabase.

Browse Source
This commit is contained in:
Danila Fedorin
2017-09-02 00:19:44 -07:00
parent 428df8bfd3
commit 28802cfed3
2 changed files with 11 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/main/java/org/nwapw/abacus/tree/NumberReducer.java
View File

@@ -8,6 +8,7 @@ import org.nwapw.abacus.function.TreeValueOperator;
import org.nwapw.abacus.number.NumberInterface;
import org.nwapw.abacus.number.PromotionManager;
import org.nwapw.abacus.number.PromotionResult;
import org.nwapw.abacus.variables.VariableDatabase;
/**
* A reducer implementation that turns a tree into a single number.
@@ -35,7 +36,13 @@ public class NumberReducer implements Reducer<NumberInterface> {
if (node instanceof NumberNode) {
return abacus.getNumberImplementation().instanceForString(((NumberNode) node).getNumber());
} else if (node instanceof VariableNode) {
return abacus.getVariableDatabase().getVariableValue(((VariableNode) node).getVariable());
VariableDatabase database = abacus.getVariableDatabase();
String name = ((VariableNode) node).getVariable();
NumberInterface variable = database.getVariables().get(name);
if(variable != null) return variable;
TreeNode definition = database.getDefinitions().get(name);
if(definition != null) return definition.reduce(this);
return abacus.getNumberImplementation().instanceForString("0");
} else if (node instanceof NumberBinaryNode) {
NumberInterface left = (NumberInterface) children[0];
NumberInterface right = (NumberInterface) children[1];