summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-11-26Merge branch 'master' of ssh://bitbucket.org/czan/honoursCarlo Zancanaro
2012-11-26A bunch more writing. Write write write.Carlo Zancanaro
2012-11-22A few fixes.Carlo Zancanaro
2012-11-21Some performance stuff for the solverCarlo Zancanaro
2012-11-21Thesis writing! Yum yum!Carlo Zancanaro
2012-11-21Bug fixes for stupid things.Carlo Zancanaro
2012-11-21Implementation stuff.Zancanaro; Carlo
2012-11-19Trying something a little different w/ background.Carlo Zancanaro
2012-11-19A few changes suggested by Bernhard.Carlo Zancanaro
2012-11-19Remove two things I'm not using.Carlo Zancanaro
2012-11-19Very simple little change to the lit review stuff.Carlo Zancanaro
2012-11-19Add some more contribution stuff. Proof?Carlo Zancanaro
2012-11-19Thesis stuff. Contribution & lit review.Carlo Zancanaro
2012-11-13Some more contribution fixing stuff.Carlo Zancanaro
2012-11-12Poster stuff.Carlo Zancanaro
2012-11-12A few minor changes to the presentation Makefile.Carlo Zancanaro
2012-11-12A few minor fixes to contribution.Carlo Zancanaro
2012-11-12Final presentation stuff. Slides and whatnot.Carlo Zancanaro
2012-11-09Work a bit more on contribution stuff.Carlo Zancanaro
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