summaryrefslogtreecommitdiff
path: root/impl
diff options
context:
space:
mode:
authorZancanaro; Carlo <czan8762@plang3.cs.usyd.edu.au>2012-11-27 14:56:56 +1100
committerZancanaro; Carlo <czan8762@plang3.cs.usyd.edu.au>2012-11-27 14:56:56 +1100
commit51dd6b2b022ade7a1fc4ec8c404d9b81c7e961f5 (patch)
tree47872b121fa330fc1003ec9786e03bee55c8602b /impl
parentc0e0ae1e0399e17b5ad5f9a22905ab352153c8b7 (diff)
Updated solver stuff. This really should have already been in here...
Diffstat (limited to 'impl')
-rw-r--r--impl/main.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/impl/main.cpp b/impl/main.cpp
index 267d11c..6bc3ee0 100644
--- a/impl/main.cpp
+++ b/impl/main.cpp
@@ -164,10 +164,10 @@ void treeToSystem(pANTLR3_BASE_TREE node, EquationSystem<T>& system) {
string varName = (char*) varNode->getText(varNode)->chars;
Variable<T>& var = system.variable(varName);
- vector<Expression<T>*> args;
- args.push_back(&system.constant(-infinity<T>()));
- args.push_back(&treeToExpression(exprNode, system));
- system[var] = &system.maxExpression(args);
+ //vector<Expression<T>*> args;
+ //args.push_back(&system.constant(-infinity<T>()));
+ //args.push_back(&treeToExpression(exprNode, system));
+ system[var] = (MaxExpression<T>*)(&treeToExpression(exprNode, system)); //&system.maxExpression(args);
}
}