summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--impl/ImprovementOperator.hpp9
-rw-r--r--impl/Log.hpp2
-rw-r--r--impl/TODO.org10
3 files changed, 12 insertions, 9 deletions
diff --git a/impl/ImprovementOperator.hpp b/impl/ImprovementOperator.hpp
index d99ccbc..e70b5af 100644
--- a/impl/ImprovementOperator.hpp
+++ b/impl/ImprovementOperator.hpp
@@ -224,18 +224,21 @@ struct SmartImprovementOperator : public ImprovementOperator<Domain> {
stableSet = invalidSet.inverse();
}
+ log::strategy << std::endl;
log::strategy << "stable: " << stableSet << std::endl;
log::strategy << "infl: " << _influence << std::endl;
DynamicMaxStrategy strat(_system, stratOut, _influence, rho, stableSet, changedSet);
log::strategy << "invalid: " << invalidSet << std::endl;
+ log::strategy << "==================" << std::endl;
for (auto it = invalidSet.begin(),
end = invalidSet.end();
it != end;
++it) {
+ auto expr = _system.maxExpression(*it);
unsigned int subExpression = strat.get(_system.maxExpression(*it));
- log::strategy << _system.maxExpression(*it)
- << " -> "
- << subExpression << std::endl;
+ log::strategy << expr
+ << " --[" << subExpression << "]-> "
+ << *expr.arguments()[subExpression] << std::endl;
}
log::strategy << std::endl;
IdSet<MaxExpression<Domain>> seen;
diff --git a/impl/Log.hpp b/impl/Log.hpp
index 0f12fec..621c94c 100644
--- a/impl/Log.hpp
+++ b/impl/Log.hpp
@@ -15,7 +15,7 @@ namespace log {
struct LoggerBuffer : public std::streambuf {
LoggerBuffer(std::streambuf* buffer, const std::string& name)
: _buffer(buffer),
- _prefix(name + " :- "),
+ _prefix(name + ": "),
_prefix_next(true) { }
int_type overflow(int_type c=EOF) {
diff --git a/impl/TODO.org b/impl/TODO.org
index fe7acee..4d14b64 100644
--- a/impl/TODO.org
+++ b/impl/TODO.org
@@ -17,11 +17,11 @@
- [X] debug
- [X] trace
- [X] info
-- [ ] Provide output [0/5]
- - [ ] strategies
- print the system and assignment, then the next strategy
- print each strategy like this:
- max(0, x, sub(y,2)) -> sub(y,2)
+- [-] Provide output [0/5]
+ - [-] strategies [1/2]
+ - [ ] print the system and assignment, then the next strategy
+ - [X] print each strategy like this:
+ max(0, x, sub(y,2)) --[2]-> sub(y,2)
- [ ] fixpoint
print the system we're working with, then print the resultant assignment
- [ ] debug