Skip to content

Comments

Corestuff#17

Merged
athendrix merged 30 commits intomasterfrom
corestuff
Nov 21, 2015
Merged

Corestuff#17
athendrix merged 30 commits intomasterfrom
corestuff

Conversation

@athendrix
Copy link
Contributor

Yeah, I did a lot of crap here.
Um. I made optimizations, and integrated them as a preprocessing step.
We can do more when we fix our memory stuff.

athendrix and others added 28 commits November 17, 2015 15:49
added some filetypes to the .gitignore
Modified Visual Studio settings to allow debugging on ARM
Modified input.txt.example to be a valid input.txt
Still runs with color under OSX and Linux, but replaced with text prefixes specifying the intended color.
…e during our algorithm)

(note that file_free doesn't "free" the file, it just releases the lock on it.)
Changed preprocess to optimize because we'll probably call it multiple times. (each level of solve)
To test, added optimize to be called once from solve before attempting to solve.
Tested on queen8x8-8.cnf and finished almost instantaneously with correct answer.
reordered solve to allow optimize to solve for sat if an optimization removes enough to find a contradiction.
Also fixed my tabbing errors in some locations.
…d Makefile to treat warnings as errors in Windows so I don't release bad code again... (I needed to fix warnings before it worked properly, as compiling in Linux told me, then when I checked my code, there were indeed warnings.)
…ions (they don't compile when we do a release build.
I intend to test it now, but I must commit it first
…o test it now, but I must commit it first"

This reverts commit 9b152fe.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggests, at some point lets modify the input so it takes FILE* fp, int file_size, and a struct containing everything else.

athendrix added a commit that referenced this pull request Nov 21, 2015
@athendrix athendrix merged commit f141c9c into master Nov 21, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants