release 1.1

smack42 · Feb 2, 2018 · 9b834e2 · 9b834e2
1 parent c1f0210
commit 9b834e2
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 10 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -2,6 +2,20 @@ ColorFill  CHANGES
 
 
 
+1.1 (2018-02-02)
+
+- optimized DfsExhaustiveStrategy
+  * much faster then before
+  * solves Programming Challenge 19 in about 1/3 of the previous time (now 47 minutes)
+- added AStarPuchertStrategy
+  * better heuristic for AStar (A*) solver
+  * idea taken from the program "floodit" by Aaron and Simon Puchert https://github.com/aaronpuchert/floodit
+  * finds optimal solutions (shortest possible)
+  * much faster than DfsExhaustiveStrategy
+  * solves Programming Challenge 19 in less than 2 (!) minutes
+
+
+
 1.0 (2017-02-05)
 
 - program solves the challenge:  Code Golf: Create a Flood Paint AI

diff --git a/README.txt b/README.txt
@@ -1,6 +1,6 @@
 ColorFill - yet another Flood-It clone (game and solver algorithm)
 
-Version   1.0 (2017-02-05)
+Version   1.1 (2018-02-02)
 Homepage  https://github.com/smack42/ColorFill/wiki
 
 
@@ -21,8 +21,8 @@ that its integrated solver algorithms have found.
 
 The program also has a dedicated "solver mode" that uses the algorithms to
 solve two competition tasks that I've found on the internet:
-- "Programming Challenge 19" (1.000 14x14 boards; see directory pc19)
-- "Code Golf 26232" (100.000 19x19 boards; see directory codegolf26232)
+- "Programming Challenge 19" (1000 14x14 boards; see directory pc19)
+- "Code Golf 26232" (100000 19x19 boards; see directory codegolf26232)
 
 
 
@@ -42,7 +42,7 @@ On the command line run it like this:
 license
 
 ColorFill game and solver
-Copyright (C) 2017 Michael Henke <smack42@gmail.com>
+Copyright (C) 2018 Michael Henke <smack42@gmail.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -63,16 +63,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 some links
 
 Online game
-    http://floodit.appspot.com/
-    http://www.jacksmack.com/games/550/globs.html
+    http://unixpapa.com/floodit/
 
 Android app
+    https://play.google.com/store/apps/details?id=name.boyle.chris.sgtpuzzles
     https://play.google.com/store/apps/details?id=com.labpixies.flood
     https://play.google.com/store/apps/details?id=com.wetpalm.colorflood
-    http://www.elevatefun.com/games/globs/
 
 Programming
-    http://cplus.about.com/od/programmingchallenges/a/challenge19.htm
+    https://web.archive.org/web/20150909200653/http://cplus.about.com/od/programmingchallenges/a/challenge19.htm
     https://stackoverflow.com/questions/1430962/how-to-optimally-solve-the-flood-fill-puzzle
     http://markgritter.livejournal.com/tag/floodit
     http://kunigami.wordpress.com/2012/09/16/flood-it-an-exact-approach/

diff --git a/releases/ColorFill_1.1.zip b/releases/ColorFill_1.1.zip
diff --git a/src/colorfill/ui/Starter.java b/src/colorfill/ui/Starter.java
@@ -46,8 +46,8 @@
 public class Starter {
 
     public static void main(String[] args) throws Exception {
-        final String progname = "ColorFill __DEV__";
-        final String version  = "1.1 (2018-01-28)";
+        final String progname = "ColorFill";
+        final String version  = "1.1 (2018-02-02)";
         final String author   = "Copyright (C) 2018 Michael Henke <smack42@gmail.com>";
         System.out.println(progname + " " + version);
         System.out.println(author);