summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-11-09A bunch of changes to make it build nicerCarlo Zancanaro
In particular: - fix up the MCF sovler to get rid of all the warnings/errors - make the build with Wall and Werror and whatnot again
2012-11-09Add an MCF operator to the separate solverCarlo Zancanaro
For the solver utility it'd be good to have MCF problems, so here they are! Format is: MCF<supplies, arcs>(cost*) Supplies is a [int,int,int,...], where each int represents a new node Arcs is [int:int, int:int, int:int, ...] where each int:int pair represents an edge from the first to the second (1 indexed from the "supplies" array). Costs is the argument to the function. There must be as many costs as arcs, and they are set from left to right, in order.
2012-11-08A few fixes to the MCF solver, and equation stuffZancanaro; Carlo
General work on the equation systems. Trying to get them to generate correctly with the MCF stuff. It's harder than it seems!
2012-11-08Contribution writing stuff.Carlo Zancanaro
2012-11-06Fix a minor typo.Carlo Zancanaro
2012-11-05A bunch of contribution writing, also fix the bib.Carlo Zancanaro
Fix up the bib style to use [1] style citations. Add a bunch of stuff to the contribution section.
2012-11-05Remove a bit of junk and fix up the logging again.Carlo Zancanaro
2012-11-02Change to using "touched" sets, and some writing.Carlo Zancanaro
2012-11-02Merge branch 'master' of ssh://bitbucket.org/czan/honoursCarlo Zancanaro
Conflicts: tex/thesis/contribution/contribution.tex
2012-11-02Add remote target in Makefile, and contributionCarlo Zancanaro
2012-11-01Merge branch 'master' of git@bitbucket.org:czan/honours into HEADZancanaro; Carlo
2012-11-01Fixing up some equation system stuff.Zancanaro; Carlo
Adding function arguments to the system, as well as making it slightly easier to read.
2012-11-01A bunch of fixes to the solver, and moving it in to clang.Zancanaro; Carlo
Also some contribution writing stuff. Basically: lots of work.
2012-10-31.Thomas Martin Gawlitza
2012-10-31Remove _var_influence and do some writeupCarlo Zancanaro
_var_influence was really just duplicating data that was available elsewhere, so I got rid of it. I also did some writing about the algorithm and stuff for the thesis.
2012-10-30Merge branch 'master' of ssh://bitbucket.org/czan/honoursCarlo Zancanaro
2012-10-30Commit some stuff to move between computers.Carlo Zancanaro
2012-10-30Merge branch 'master' of ssh://bitbucket.org/czan/honoursCarlo Zancanaro
Conflicts: impl/test/run
2012-10-27Output some timing information to stderr.Carlo Zancanaro
2012-10-27Don't show stderr in tests. That's just annoying.Carlo Zancanaro
2012-10-26Merge branch 'master' into new-devCarlo Zancanaro
2012-10-26Add some tests, and stuff.Carlo Zancanaro
2012-10-26Try to make the correct solver into a local solverCarlo Zancanaro
As far as I can tell, it's worked! Hooray!
2012-10-24Add a fix for mutually-recursive infinite thingsCarlo Zancanaro
So now it will solve correctly for x = y + 1 y = max(0, x + 1) I also added in tests for this (and a slightly different form with `x` going through another variable, `z`, for indirection). The tests will also stop now after five seconds of execution. If they can't be solved in five seconds then they're considered a failure.
2012-10-23Another fix, with a test for what the problem was.Carlo Zancanaro
2012-10-23Fix the merge.Carlo Zancanaro
2012-10-23Merge branch 'master' of https://bitbucket.org/czan/honoursCarlo Zancanaro
Conflicts: .gitignore impl/MaxStrategy.hpp impl/VariableAssignment.hpp impl/systems/test.eqns impl/test/7.eqns
2012-10-23Make the recursive solver work properly.Carlo Zancanaro
If you ignore the intermediate results for the strategy iteration phase then you're in the clear! I think!
2012-10-22Try fixing clang to work with the fixed solver.Carlo Zancanaro
(This may not compile, for an annoying reason. I'll check in again soon with something better-er, or whatever.)
2012-10-22Okay, the solver is now correct.Carlo Zancanaro
It runs in two separate passes: - improve strategy (for all) - evaluate fixpoint Unfortunately this loses out on locality at the moment. I really want a local solver, so I'll have to see what I can do about that.
2012-10-17More work on the thesis itself.Carlo Zancanaro
2012-10-17Get rid of extra files produced during LaTeX compilation.Carlo Zancanaro
2012-10-16Doop doop doop. Some contribution writing stuff.Carlo Zancanaro
2012-10-16A quick fix to the solver.Carlo Zancanaro
2012-10-15Some bug fixes for the solver.Carlo Zancanaro
Still doesn't work in clang, though.
2012-10-15Merge branch 'master' of ssh://bitbucket.org/czan/honoursCarlo Zancanaro
2012-10-15Fix up the Equation System generation. Now there's a bug in the solver.Zancanaro; Carlo
The solver seems to work fine when run as a tool by itself, but not in the clang stuff. Very annoying.
2012-10-15... Assert needs some includes.Carlo Zancanaro
2012-10-15Fix up to build with clang (and fix another bug)Carlo Zancanaro
- Remove exceptions - Remove dynamic casts The bug was relating to MaxStrategy not cleaning up the influence sets after propagating changes. I just added a call to .clear() and it seems fine.
2012-10-04Lets keep trying with this here equation system.Zancanaro; Carlo
Still not there, but more non-functional code is there. Splitting blocks into sub-blocks now works, as does some of the guard stuff and the general "shape" of the resulting equation system.
2012-09-24Fix up some of the interval solving stuff.Zancanaro; Carlo
Still missing: - Guards - Actual construction of the EquationSystem - Necessary operators for a Vector EquationSystem - Splitting blocks on multiple-assignment - Solving/linking with Checkers
2012-09-24Add the clang library to the repo (with some of my changes, too).Zancanaro; Carlo
2012-09-20Remove exceptions and C++11 features for LLVM.Carlo Zancanaro
2012-09-10Thesis updating.Carlo Zancanaro
2012-09-05Something, something. Thesis!Carlo Zancanaro
2012-09-05Delete a lot of tex stuff, better debug infoCarlo Zancanaro
Some other stuff, too, I think. Oh well. No biggie!
2012-08-07Initial thesis stuff. No content, though.Carlo Zancanaro
2012-08-07Merge complete! Get onto the right branch.Carlo Zancanaro
2012-08-07A whole bunch of clean up work around the place.Carlo Zancanaro
- Make it a bit nicer to use the command-line - Remove the strategies we won't be using - Clean up some code around the place, generally
2012-08-06New variation on the equation system solver.Carlo Zancanaro
Much simpler to understand. Basically have a variable assignment which is dynamic and updates with the strategy changes. Similarly have strategy changes easily invalidate the variable assignment. This makes them strongly inter-dependent, but simplifies the implementation considerably. Proving it should be easier like this, too.