1
0
Fork 0
mirror of https://github.com/shlomif/PySolFC.git synced 2025-04-05 00:02:29 -04:00
Commit graph

57 commits

Author SHA1 Message Date
Shlomi Fish
dbdd0f392c division sanity 2017-08-25 18:25:58 +03:00
Shlomi Fish
748a287f93 Fix the black-hole solver. 2017-08-25 18:25:58 +03:00
Shlomi Fish
f40fdfbb82 Remove debug traces and fix the solver dlg. 2017-08-25 18:25:58 +03:00
Shlomi Fish
aa4f9ee5da Crude code to get some func running in py3.
Right now klondike and freecell sort of work, but this is very hacky and
there are many leftover debug traces.
2017-08-25 18:25:58 +03:00
Shlomi Fish
e2cb4d8e79 Fix a bug caused by refactoring/flake8ing. 2017-04-19 12:03:44 +03:00
Shlomi Fish
b62f600d34 flake 8 2017-04-19 12:03:44 +03:00
Shlomi Fish
463aec56af Remove the max_depth option to the solver.
It's no longer supported nor recommended.
2016-11-16 22:53:22 +02:00
Shlomi Fish
97a70ea882 More refactoring. 2016-02-19 19:19:18 +02:00
Shlomi Fish
e182ddd68f Refactor pysollib/hint.
Still a lot of ugliness showing but it's better than nothing.
2016-02-19 18:58:16 +02:00
Shlomi Fish
81b37f8673 Fix a bug with an unassigned var.
It prevented running the solver in mid play.
2016-02-19 18:15:28 +02:00
Shlomi Fish
b03ec17350 Add "Export current layout".
A menu option in the tile (for now only that) menubar.

TODO: the tile and tk directories contain *a lot* of duplicate code.
One should extract base classes and abstract.
2016-02-13 19:30:00 +02:00
Shlomi Fish
8a5b8de137 Extract the calcBoard methods. 2016-02-10 15:33:00 +02:00
Shlomi Fish
d31855830d Fix the solver_state output with progress off.
Previously - it did not display anything if progress was off.
2014-11-06 13:55:39 +02:00
Shlomi Fish
5da836e778 distinguish between intractable and unsolvable. 2014-10-14 11:37:16 +03:00
Shlomi Fish
415c65194c Convert to a base class. 2014-05-09 17:06:05 +03:00
Shlomi Fish
d2c398881c Remove the import pdb and other cleanups. 2014-05-09 16:56:58 +03:00
Shlomi Fish
c07b60a65c Implement for All in a Row too. 2014-05-09 16:51:44 +03:00
Shlomi Fish
85ecb25e30 Got the solver for BlackHole to work.
Currently there's some duplicate code between it and the
FreeCellSolver_Hint and I haven't checked All in a Row yet.
2014-05-09 16:36:20 +03:00
Shlomi Fish
8a3348962d Remove some unused code. 2013-05-22 13:51:15 +03:00
Shlomi Fish
8a8a7c2714 Convert the move matching to regexps. 2013-05-22 13:49:45 +03:00
Shlomi Fish
3eb36012b3 Start converting the move matches to regexps. 2013-05-22 13:24:26 +03:00
Shlomi Fish
b2052c91aa Modernise to bonus +=. 2013-04-15 18:49:03 +03:00
Shlomi Fish
3b921faa61 Convert to regex. 2013-04-15 18:40:25 +03:00
Shlomi Fish
7f42260031 Remove 'Solving method' from the solver dialog.
The --method parameter affects only the current "soft thread" (= single
scan), may confuse laymen, and should not matter when an aggregate scan
preset or theme is specified, and those are in general superior and more
encouraged for fc-solve beginners and most experts a like. An aggregate
scan explicitly sets the --method for each scan individually, so there.

As a result, I don't see the point of having the 'Solving method' there.
Perhaps in the future, a more comprehensive GUI for editing the fc-solve
command line will be in order, but that may end up something like thess
monstrocities:

* http://www.codinghorror.com/blog/2006/11/this-is-what-happens-when-you-let-developers-create-ui.html

* http://i.stack.imgur.com/cVWub.gif
2012-12-11 17:26:24 +02:00
Shlomi Fish
e2a6c00606 Merge remote-tracking branch 'jimsize/master' into pysolfc_modules_modularization
Conflicts:
	.gitignore
	Makefile
	pysollib/acard.py
	pysollib/actions.py
	pysollib/app.py
	pysollib/customgame.py
	pysollib/game.py
	pysollib/gamedb.py
	pysollib/games/__init__.py
	pysollib/games/auldlangsyne.py
	pysollib/games/braid.py
	pysollib/games/calculation.py
	pysollib/games/camelot.py
	pysollib/games/canfield.py
	pysollib/games/curdsandwhey.py
	pysollib/games/fan.py
	pysollib/games/golf.py
	pysollib/games/klondike.py
	pysollib/games/larasgame.py
	pysollib/games/mahjongg/mahjongg.py
	pysollib/games/mahjongg/shisensho.py
	pysollib/games/matriarchy.py
	pysollib/games/napoleon.py
	pysollib/games/numerica.py
	pysollib/games/osmosis.py
	pysollib/games/pileon.py
	pysollib/games/royalcotillion.py
	pysollib/games/special/memory.py
	pysollib/games/special/poker.py
	pysollib/games/special/tarock.py
	pysollib/games/spider.py
	pysollib/games/takeaway.py
	pysollib/games/terrace.py
	pysollib/games/threepeaks.py
	pysollib/games/tournament.py
	pysollib/games/ultra/dashavatara.py
	pysollib/games/ultra/hanafuda.py
	pysollib/games/ultra/hanafuda1.py
	pysollib/games/ultra/hanafuda_common.py
	pysollib/games/ultra/hexadeck.py
	pysollib/games/ultra/mughal.py
	pysollib/games/yukon.py
	pysollib/help.py
	pysollib/hint.py
	pysollib/images.py
	pysollib/init.py
	pysollib/layout.py
	pysollib/main.py
	pysollib/mfxutil.py
	pysollib/options.py
	pysollib/pysolgtk/colorsdialog.py
	pysollib/pysolgtk/fontsdialog.py
	pysollib/pysolgtk/menubar.py
	pysollib/pysolgtk/playeroptionsdialog.py
	pysollib/pysolgtk/selectcardset.py
	pysollib/pysolgtk/selectgame.py
	pysollib/pysolgtk/selecttile.py
	pysollib/pysolgtk/soundoptionsdialog.py
	pysollib/pysolgtk/statusbar.py
	pysollib/pysolgtk/timeoutsdialog.py
	pysollib/pysolgtk/tkhtml.py
	pysollib/pysolgtk/tkstats.py
	pysollib/pysolgtk/tkwidget.py
	pysollib/pysolrandom.py
	pysollib/pysoltk.py
	pysollib/resource.py
	pysollib/stack.py
	pysollib/stats.py
	pysollib/tile/colorsdialog.py
	pysollib/tile/edittextdialog.py
	pysollib/tile/findcarddialog.py
	pysollib/tile/fontsdialog.py
	pysollib/tile/gameinfodialog.py
	pysollib/tile/menubar.py
	pysollib/tile/playeroptionsdialog.py
	pysollib/tile/selectcardset.py
	pysollib/tile/selectgame.py
	pysollib/tile/selecttile.py
	pysollib/tile/solverdialog.py
	pysollib/tile/soundoptionsdialog.py
	pysollib/tile/statusbar.py
	pysollib/tile/timeoutsdialog.py
	pysollib/tile/tkconst.py
	pysollib/tile/tkhtml.py
	pysollib/tile/tkstats.py
	pysollib/tile/tkwidget.py
	pysollib/tile/toolbar.py
	pysollib/tile/ttk.py
	pysollib/tile/wizarddialog.py
	pysollib/tk/colorsdialog.py
	pysollib/tk/edittextdialog.py
	pysollib/tk/findcarddialog.py
	pysollib/tk/fontsdialog.py
	pysollib/tk/gameinfodialog.py
	pysollib/tk/menubar.py
	pysollib/tk/playeroptionsdialog.py
	pysollib/tk/selectcardset.py
	pysollib/tk/selectgame.py
	pysollib/tk/selecttile.py
	pysollib/tk/solverdialog.py
	pysollib/tk/soundoptionsdialog.py
	pysollib/tk/statusbar.py
	pysollib/tk/timeoutsdialog.py
	pysollib/tk/tkconst.py
	pysollib/tk/tkhtml.py
	pysollib/tk/tkstats.py
	pysollib/tk/tkwidget.py
	pysollib/tk/toolbar.py
	pysollib/tk/wizarddialog.py
	pysollib/util.py
	pysollib/winsystems/common.py
	pysollib/wizardpresets.py
	pysollib/wizardutil.py
	setup_osx.py
2012-12-07 16:32:30 +02:00
Shlomi Fish
0785307eb8 Test import of pysollib.util. 2012-11-25 18:00:48 +02:00
Shlomi Fish
308ede18ff Convert mfxutil and settings imports to pysollib 2012-11-25 17:05:22 +02:00
skomoroh
4ee830ae2f Display final statistics in solver
git-svn-id: file:///home/shlomif/Backup/svn-dumps/PySolFC/svnsync-repos/pysolfc/PySolFC/trunk@279 efabe8c0-fbe8-4139-b769-b5e6d273206e
2012-06-05 18:44:08 +00:00
skomoroh
2256f5d9f2 Display final statistics in solver
git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@279 39dd0a4e-7c14-0410-91b3-c4f2d318f732
2012-06-05 18:44:08 +00:00
skomoroh
2744887cd4 * changed comments style
git-svn-id: file:///home/shlomif/Backup/svn-dumps/PySolFC/svnsync-repos/pysolfc/PySolFC/trunk@243 efabe8c0-fbe8-4139-b769-b5e6d273206e
2009-07-22 21:36:22 +00:00
skomoroh
232dca18fb * changed comments style
git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@243 39dd0a4e-7c14-0410-91b3-c4f2d318f732
2009-07-22 21:36:22 +00:00
skomoroh
26f2fe277b * fixed game Spaces and Aces
* improved cards shadowing
* minor fixes

git-svn-id: file:///home/shlomif/Backup/svn-dumps/PySolFC/svnsync-repos/pysolfc/PySolFC/trunk@238 efabe8c0-fbe8-4139-b769-b5e6d273206e
2009-06-27 07:25:24 +00:00
skomoroh
1927232d68 * fixed game Spaces and Aces
* improved cards shadowing
* minor fixes

git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@238 39dd0a4e-7c14-0410-91b3-c4f2d318f732
2009-06-27 07:25:24 +00:00
skomoroh
dfe790a101 * changed GPL version to 3
* added config-file option sound_sample_buffer_size
* bugfixes


git-svn-id: file:///home/shlomif/Backup/svn-dumps/PySolFC/svnsync-repos/pysolfc/PySolFC/trunk@234 efabe8c0-fbe8-4139-b769-b5e6d273206e
2009-06-12 09:32:43 +00:00
skomoroh
fb107c8727 * changed GPL version to 3
* added config-file option sound_sample_buffer_size
* bugfixes


git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@234 39dd0a4e-7c14-0410-91b3-c4f2d318f732
2009-06-12 09:32:43 +00:00
skomoroh
46a2191011 + added config-file option `translate_game_names'
+ added accelerator ctrl-x: `Hold and quit'
* fixed games `Matriarchy', `Grandfather', `Bristol', `Chessboard', Twenty, `Q.C.'
* improved MfxScrolledCanvas
* improved hint
* fixed SelectTileDialogWithPreview


git-svn-id: file:///home/shlomif/Backup/svn-dumps/PySolFC/svnsync-repos/pysolfc/PySolFC/trunk@194 efabe8c0-fbe8-4139-b769-b5e6d273206e
2007-08-18 21:19:52 +00:00
skomoroh
8a080cfc2e + added config-file option `translate_game_names'
+ added accelerator ctrl-x: `Hold and quit'
* fixed games `Matriarchy', `Grandfather', `Bristol', `Chessboard', Twenty, `Q.C.'
* improved MfxScrolledCanvas
* improved hint
* fixed SelectTileDialogWithPreview


git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@194 39dd0a4e-7c14-0410-91b3-c4f2d318f732
2007-08-18 21:19:52 +00:00
skomoroh
ebb552c135 + 2 new games
+ new Layout method: createRoundText
+ added showing `Round #' for many games
* minor improvement of SelectTileDialogWithPreview
* improved `select random game'
* fixed setting bg image


git-svn-id: file:///home/shlomif/Backup/svn-dumps/PySolFC/svnsync-repos/pysolfc/PySolFC/trunk@193 efabe8c0-fbe8-4139-b769-b5e6d273206e
2007-08-15 21:44:20 +00:00
skomoroh
ccf656ba52 + 2 new games
+ new Layout method: createRoundText
+ added showing `Round #' for many games
* minor improvement of SelectTileDialogWithPreview
* improved `select random game'
* fixed setting bg image


git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@193 39dd0a4e-7c14-0410-91b3-c4f2d318f732
2007-08-15 21:44:20 +00:00
skomoroh
b643693619 + human readable config file (~/.PySolFC/options.cfg; options.dat is gone)
+ added `custom games' node to select games dialog
* cleanup code


git-svn-id: file:///home/shlomif/Backup/svn-dumps/PySolFC/svnsync-repos/pysolfc/PySolFC/trunk@170 efabe8c0-fbe8-4139-b769-b5e6d273206e
2007-05-25 21:27:03 +00:00
skomoroh
db52c78437 + human readable config file (~/.PySolFC/options.cfg; options.dat is gone)
+ added `custom games' node to select games dialog
* cleanup code


git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@170 39dd0a4e-7c14-0410-91b3-c4f2d318f732
2007-05-25 21:27:03 +00:00
skomoroh
a7e7aab703 * improved solitaire wizard
* removed round changes from turnStackMove


git-svn-id: file:///home/shlomif/Backup/svn-dumps/PySolFC/svnsync-repos/pysolfc/PySolFC/trunk@160 efabe8c0-fbe8-4139-b769-b5e6d273206e
2007-05-06 21:42:40 +00:00
skomoroh
9fd4942f23 * improved solitaire wizard
* removed round changes from turnStackMove


git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@160 39dd0a4e-7c14-0410-91b3-c4f2d318f732
2007-05-06 21:42:40 +00:00
skomoroh
8766c00a53 + new feature: Solitaire Wizard (tile only yet)
* misc. minor improvements


git-svn-id: file:///home/shlomif/Backup/svn-dumps/PySolFC/svnsync-repos/pysolfc/PySolFC/trunk@157 efabe8c0-fbe8-4139-b769-b5e6d273206e
2007-05-03 21:21:33 +00:00
skomoroh
fb3b59bf3d + new feature: Solitaire Wizard (tile only yet)
* misc. minor improvements


git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@157 39dd0a4e-7c14-0410-91b3-c4f2d318f732
2007-05-03 21:21:33 +00:00
skomoroh
5175caf86a + separated demo-mode and solver; solver dialog
+ added statistics progression; statistics progression dialog
+ new animation speed: `medium'; renamed `timer based' to `fast'
+ added flip animation (animatedFlip)
+ added move to waste animation (animatedFlipAndMove)
+ added cancel-drag animation (moveCardsBackHandler)
* improved demo game (snapshots based check for loop)
- removed setting text color from file name
- removed auto generation shadows (too slow)
* optimized menu creation
* changed some keybindings
* updated russian translation
* many bugfixes


git-svn-id: file:///home/shlomif/Backup/svn-dumps/PySolFC/svnsync-repos/pysolfc/PySolFC/trunk@138 efabe8c0-fbe8-4139-b769-b5e6d273206e
2007-02-16 23:20:02 +00:00
skomoroh
971148fa27 + separated demo-mode and solver; solver dialog
+ added statistics progression; statistics progression dialog
+ new animation speed: `medium'; renamed `timer based' to `fast'
+ added flip animation (animatedFlip)
+ added move to waste animation (animatedFlipAndMove)
+ added cancel-drag animation (moveCardsBackHandler)
* improved demo game (snapshots based check for loop)
- removed setting text color from file name
- removed auto generation shadows (too slow)
* optimized menu creation
* changed some keybindings
* updated russian translation
* many bugfixes


git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@138 39dd0a4e-7c14-0410-91b3-c4f2d318f732
2007-02-16 23:20:02 +00:00
skomoroh
1e0df4b925 + animated flip
* cleanup code


git-svn-id: file:///home/shlomif/Backup/svn-dumps/PySolFC/svnsync-repos/pysolfc/PySolFC/trunk@128 efabe8c0-fbe8-4139-b769-b5e6d273206e
2006-12-21 22:18:22 +00:00
skomoroh
1831696309 + animated flip
* cleanup code


git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@128 39dd0a4e-7c14-0410-91b3-c4f2d318f732
2006-12-21 22:18:22 +00:00
skomoroh
ee2f01fa63 + 11 new games
* improved StackDesc
* improved CautiousDefaultHint


git-svn-id: file:///home/shlomif/Backup/svn-dumps/PySolFC/svnsync-repos/pysolfc/PySolFC/trunk@30 efabe8c0-fbe8-4139-b769-b5e6d273206e
2006-07-28 21:12:37 +00:00