From 23306dc5e96b64389f6c312709be436453d7ff0e Mon Sep 17 00:00:00 2001 From: redroot Date: Mon, 26 Feb 2018 17:00:29 +0000 Subject: [PATCH 1/9] initial work on clojure --- .gitignore | 12 ++ README.md | 5 +- clojure/.gitignore | 11 ++ clojure/CHANGELOG.md | 24 ++++ clojure/LICENSE | 214 +++++++++++++++++++++++++++++ clojure/README.md | 36 +++++ clojure/project.clj | 9 ++ clojure/src/gogen_clojure/core.clj | 26 ++++ 8 files changed, 336 insertions(+), 1 deletion(-) create mode 100644 .gitignore create mode 100644 clojure/.gitignore create mode 100644 clojure/CHANGELOG.md create mode 100644 clojure/LICENSE create mode 100644 clojure/README.md create mode 100644 clojure/project.clj create mode 100644 clojure/src/gogen_clojure/core.clj diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..689d0d2 --- /dev/null +++ b/.gitignore @@ -0,0 +1,12 @@ +clojure/resources +clojure/target +clojure/classes +clojure/checkouts +pom.xml +pom.xml.asc +*.jar +*.class +/.lein-* +/.nrepl-port +.hgignore +.hg/ diff --git a/README.md b/README.md index 67ed010..62fbd30 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,8 @@ Attempts at solving a gogen puzzle solver in various languages cd ruby & ruby gogen.rb cd go & go run gogen.go - cd elixir & elixir gogen.go + cd elixir & elixir gogen.exs + cd clojurew && lein run Coming Soon: Clojure @@ -31,3 +32,5 @@ Coming Soon: Clojure - The solve function was another interesting issue using the parameters I'd used in previous solutions, namely: `letters_to_find`, map of unfound letters and potential positions, `letters_found` a map of found letters and known positions, and `adjacencies`, a map of letter adjacencies from the word list. The inability to modify variables outside of the loop, i.e. updating the maps - meant that I ended up nesting reduce statements, and implementing my own break/continue pattern using the accumulator tuple, [see here](https://github.com/redroot/gogen/blob/d66047ff2e9e8b9387ee65756ae93287838eabe4/elixir/gogen.exs#L16). - One question that came to me while I was doing above if I could do the same with only one map of known letters - possible but I doubt I could use guards since determining if there was still work to do would involve `map_size(Enum.filter(letter_pos_set, fn {k,v} -> length(v) > 1 end))` which I wouldn't be able to write in a guard. Unless I passed the count of remaining letters through as a parameter on each pass. Thats what I did in the `elixir-alt` branch - simplifying the data structures making the reduce accumlator simpler too and only involving a control parameter within the loop once! [See the commit here](https://github.com/redroot/gogen/commit/c9656f92a4460e05a1fb61a0125e809e871e3cf9) - But then I realised I didn't even need to control variable now I was doing the length check in the nested reducer! So I managed to make it even simpler, which was the final edition. + +#### Clojure diff --git a/clojure/.gitignore b/clojure/.gitignore new file mode 100644 index 0000000..c53038e --- /dev/null +++ b/clojure/.gitignore @@ -0,0 +1,11 @@ +/target +/classes +/checkouts +pom.xml +pom.xml.asc +*.jar +*.class +/.lein-* +/.nrepl-port +.hgignore +.hg/ diff --git a/clojure/CHANGELOG.md b/clojure/CHANGELOG.md new file mode 100644 index 0000000..ed1f8ca --- /dev/null +++ b/clojure/CHANGELOG.md @@ -0,0 +1,24 @@ +# Change Log +All notable changes to this project will be documented in this file. This change log follows the conventions of [keepachangelog.com](http://keepachangelog.com/). + +## [Unreleased] +### Changed +- Add a new arity to `make-widget-async` to provide a different widget shape. + +## [0.1.1] - 2018-02-26 +### Changed +- Documentation on how to make the widgets. + +### Removed +- `make-widget-sync` - we're all async, all the time. + +### Fixed +- Fixed widget maker to keep working when daylight savings switches over. + +## 0.1.0 - 2018-02-26 +### Added +- Files from the new template. +- Widget maker public API - `make-widget-sync`. + +[Unreleased]: https://github.com/your-name/gogen-clojure/compare/0.1.1...HEAD +[0.1.1]: https://github.com/your-name/gogen-clojure/compare/0.1.0...0.1.1 diff --git a/clojure/LICENSE b/clojure/LICENSE new file mode 100644 index 0000000..d921d3d --- /dev/null +++ b/clojure/LICENSE @@ -0,0 +1,214 @@ +THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC +LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM +CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + +1. DEFINITIONS + +"Contribution" means: + +a) in the case of the initial Contributor, the initial code and +documentation distributed under this Agreement, and + +b) in the case of each subsequent Contributor: + +i) changes to the Program, and + +ii) additions to the Program; + +where such changes and/or additions to the Program originate from and are +distributed by that particular Contributor. A Contribution 'originates' from +a Contributor if it was added to the Program by such Contributor itself or +anyone acting on such Contributor's behalf. Contributions do not include +additions to the Program which: (i) are separate modules of software +distributed in conjunction with the Program under their own license +agreement, and (ii) are not derivative works of the Program. + +"Contributor" means any person or entity that distributes the Program. + +"Licensed Patents" mean patent claims licensable by a Contributor which are +necessarily infringed by the use or sale of its Contribution alone or when +combined with the Program. + +"Program" means the Contributions distributed in accordance with this +Agreement. + +"Recipient" means anyone who receives the Program under this Agreement, +including all Contributors. + +2. GRANT OF RIGHTS + +a) Subject to the terms of this Agreement, each Contributor hereby grants +Recipient a non-exclusive, worldwide, royalty-free copyright license to +reproduce, prepare derivative works of, publicly display, publicly perform, +distribute and sublicense the Contribution of such Contributor, if any, and +such derivative works, in source code and object code form. + +b) Subject to the terms of this Agreement, each Contributor hereby grants +Recipient a non-exclusive, worldwide, royalty-free patent license under +Licensed Patents to make, use, sell, offer to sell, import and otherwise +transfer the Contribution of such Contributor, if any, in source code and +object code form. This patent license shall apply to the combination of the +Contribution and the Program if, at the time the Contribution is added by the +Contributor, such addition of the Contribution causes such combination to be +covered by the Licensed Patents. The patent license shall not apply to any +other combinations which include the Contribution. No hardware per se is +licensed hereunder. + +c) Recipient understands that although each Contributor grants the licenses +to its Contributions set forth herein, no assurances are provided by any +Contributor that the Program does not infringe the patent or other +intellectual property rights of any other entity. Each Contributor disclaims +any liability to Recipient for claims brought by any other entity based on +infringement of intellectual property rights or otherwise. As a condition to +exercising the rights and licenses granted hereunder, each Recipient hereby +assumes sole responsibility to secure any other intellectual property rights +needed, if any. For example, if a third party patent license is required to +allow Recipient to distribute the Program, it is Recipient's responsibility +to acquire that license before distributing the Program. + +d) Each Contributor represents that to its knowledge it has sufficient +copyright rights in its Contribution, if any, to grant the copyright license +set forth in this Agreement. + +3. REQUIREMENTS + +A Contributor may choose to distribute the Program in object code form under +its own license agreement, provided that: + +a) it complies with the terms and conditions of this Agreement; and + +b) its license agreement: + +i) effectively disclaims on behalf of all Contributors all warranties and +conditions, express and implied, including warranties or conditions of title +and non-infringement, and implied warranties or conditions of merchantability +and fitness for a particular purpose; + +ii) effectively excludes on behalf of all Contributors all liability for +damages, including direct, indirect, special, incidental and consequential +damages, such as lost profits; + +iii) states that any provisions which differ from this Agreement are offered +by that Contributor alone and not by any other party; and + +iv) states that source code for the Program is available from such +Contributor, and informs licensees how to obtain it in a reasonable manner on +or through a medium customarily used for software exchange. + +When the Program is made available in source code form: + +a) it must be made available under this Agreement; and + +b) a copy of this Agreement must be included with each copy of the Program. + +Contributors may not remove or alter any copyright notices contained within +the Program. + +Each Contributor must identify itself as the originator of its Contribution, +if any, in a manner that reasonably allows subsequent Recipients to identify +the originator of the Contribution. + +4. COMMERCIAL DISTRIBUTION + +Commercial distributors of software may accept certain responsibilities with +respect to end users, business partners and the like. While this license is +intended to facilitate the commercial use of the Program, the Contributor who +includes the Program in a commercial product offering should do so in a +manner which does not create potential liability for other Contributors. +Therefore, if a Contributor includes the Program in a commercial product +offering, such Contributor ("Commercial Contributor") hereby agrees to defend +and indemnify every other Contributor ("Indemnified Contributor") against any +losses, damages and costs (collectively "Losses") arising from claims, +lawsuits and other legal actions brought by a third party against the +Indemnified Contributor to the extent caused by the acts or omissions of such +Commercial Contributor in connection with its distribution of the Program in +a commercial product offering. The obligations in this section do not apply +to any claims or Losses relating to any actual or alleged intellectual +property infringement. In order to qualify, an Indemnified Contributor must: +a) promptly notify the Commercial Contributor in writing of such claim, and +b) allow the Commercial Contributor to control, and cooperate with the +Commercial Contributor in, the defense and any related settlement +negotiations. The Indemnified Contributor may participate in any such claim +at its own expense. + +For example, a Contributor might include the Program in a commercial product +offering, Product X. That Contributor is then a Commercial Contributor. If +that Commercial Contributor then makes performance claims, or offers +warranties related to Product X, those performance claims and warranties are +such Commercial Contributor's responsibility alone. Under this section, the +Commercial Contributor would have to defend claims against the other +Contributors related to those performance claims and warranties, and if a +court requires any other Contributor to pay any damages as a result, the +Commercial Contributor must pay those damages. + +5. NO WARRANTY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON +AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER +EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR +CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A +PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the +appropriateness of using and distributing the Program and assumes all risks +associated with its exercise of rights under this Agreement , including but +not limited to the risks and costs of program errors, compliance with +applicable laws, damage to or loss of data, programs or equipment, and +unavailability or interruption of operations. + +6. DISCLAIMER OF LIABILITY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY +CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION +LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE +EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY +OF SUCH DAMAGES. + +7. GENERAL + +If any provision of this Agreement is invalid or unenforceable under +applicable law, it shall not affect the validity or enforceability of the +remainder of the terms of this Agreement, and without further action by the +parties hereto, such provision shall be reformed to the minimum extent +necessary to make such provision valid and enforceable. + +If Recipient institutes patent litigation against any entity (including a +cross-claim or counterclaim in a lawsuit) alleging that the Program itself +(excluding combinations of the Program with other software or hardware) +infringes such Recipient's patent(s), then such Recipient's rights granted +under Section 2(b) shall terminate as of the date such litigation is filed. + +All Recipient's rights under this Agreement shall terminate if it fails to +comply with any of the material terms or conditions of this Agreement and +does not cure such failure in a reasonable period of time after becoming +aware of such noncompliance. If all Recipient's rights under this Agreement +terminate, Recipient agrees to cease use and distribution of the Program as +soon as reasonably practicable. However, Recipient's obligations under this +Agreement and any licenses granted by Recipient relating to the Program shall +continue and survive. + +Everyone is permitted to copy and distribute copies of this Agreement, but in +order to avoid inconsistency the Agreement is copyrighted and may only be +modified in the following manner. The Agreement Steward reserves the right to +publish new versions (including revisions) of this Agreement from time to +time. No one other than the Agreement Steward has the right to modify this +Agreement. The Eclipse Foundation is the initial Agreement Steward. The +Eclipse Foundation may assign the responsibility to serve as the Agreement +Steward to a suitable separate entity. Each new version of the Agreement will +be given a distinguishing version number. The Program (including +Contributions) may always be distributed subject to the version of the +Agreement under which it was received. In addition, after a new version of +the Agreement is published, Contributor may elect to distribute the Program +(including its Contributions) under the new version. Except as expressly +stated in Sections 2(a) and 2(b) above, Recipient receives no rights or +licenses to the intellectual property of any Contributor under this +Agreement, whether expressly, by implication, estoppel or otherwise. All +rights in the Program not expressly granted under this Agreement are +reserved. + +This Agreement is governed by the laws of the State of New York and the +intellectual property laws of the United States of America. No party to this +Agreement will bring a legal action under this Agreement more than one year +after the cause of action arose. Each party waives its rights to a jury trial +in any resulting litigation. diff --git a/clojure/README.md b/clojure/README.md new file mode 100644 index 0000000..ae74296 --- /dev/null +++ b/clojure/README.md @@ -0,0 +1,36 @@ +# gogen-clojure + +FIXME: description + +## Installation + +Download from http://example.com/FIXME. + +## Usage + +FIXME: explanation + + $ java -jar gogen-clojure-0.1.0-standalone.jar [args] + +## Options + +FIXME: listing of options this app accepts. + +## Examples + +... + +### Bugs + +... + +### Any Other Sections +### That You Think +### Might be Useful + +## License + +Copyright © 2018 FIXME + +Distributed under the Eclipse Public License either version 1.0 or (at +your option) any later version. diff --git a/clojure/project.clj b/clojure/project.clj new file mode 100644 index 0000000..116f810 --- /dev/null +++ b/clojure/project.clj @@ -0,0 +1,9 @@ +(defproject gogen-clojure "0.1.0-SNAPSHOT" + :description "FIXME: write description" + :url "http://example.com/FIXME" + :license {:name "Eclipse Public License" + :url "http://www.eclipse.org/legal/epl-v10.html"} + :dependencies [[org.clojure/clojure "1.8.0"]] + :main ^:skip-aot gogen-clojure.core + :target-path "target/%s" + :profiles {:uberjar {:aot :all}}) diff --git a/clojure/src/gogen_clojure/core.clj b/clojure/src/gogen_clojure/core.clj new file mode 100644 index 0000000..5eafbea --- /dev/null +++ b/clojure/src/gogen_clojure/core.clj @@ -0,0 +1,26 @@ +(ns gogen-clojure.core + (require '[clojure.string :as str]) + (:gen-class)) + +(def ^:const text-input-split "#####") +(def ^:const grid-size 5) +(def ^:const print_padding 3) +(def ^:const blank_character "_") + +(defn get-puzzle-id [] + (or (System/getenv "PUZZLE") + "1")) + +(defn get-puzzle-raw [] + (let [id (get-puzzle-id)] + (slurp + (str "../examples/" id "-unsolved.txt")))) + +(defn data-from-puzzle [] + (let [raw (get-puzzle-raw)]) + ) + +(defn -main + "Main entry point to solving puzzles" + [& args] + (println "asdasd")) From 4b0390ada4ab3d376e06658adead02d1349d3303 Mon Sep 17 00:00:00 2001 From: redroot Date: Tue, 27 Feb 2018 15:04:32 +0000 Subject: [PATCH 2/9] adds some more for the clojure solution --- .gitignore | 8 +- README.md | 5 +- clojure/.gitignore | 11 -- clojure/CHANGELOG.md | 24 ---- clojure/LICENSE | 214 ----------------------------- clojure/README.md | 36 ----- clojure/src/gogen_clojure/core.clj | 55 +++++++- 7 files changed, 57 insertions(+), 296 deletions(-) delete mode 100644 clojure/.gitignore delete mode 100644 clojure/CHANGELOG.md delete mode 100644 clojure/LICENSE delete mode 100644 clojure/README.md diff --git a/.gitignore b/.gitignore index 689d0d2..cb7814d 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,7 @@ pom.xml pom.xml.asc *.jar *.class -/.lein-* -/.nrepl-port -.hgignore -.hg/ +*.lein-* +*.nrepl-port +*.hgignore +*.hg/ diff --git a/README.md b/README.md index 62fbd30..f60dcf0 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Attempts at solving a gogen puzzle solver in various languages cd ruby & ruby gogen.rb cd go & go run gogen.go cd elixir & elixir gogen.exs - cd clojurew && lein run + cd clojure && lein run Coming Soon: Clojure @@ -34,3 +34,6 @@ Coming Soon: Clojure - But then I realised I didn't even need to control variable now I was doing the length check in the nested reducer! So I managed to make it even simpler, which was the final edition. #### Clojure + +- `lein repl` is super useful +- Errors messaging relating to syntax aren't the most helpful out of the box diff --git a/clojure/.gitignore b/clojure/.gitignore deleted file mode 100644 index c53038e..0000000 --- a/clojure/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -/target -/classes -/checkouts -pom.xml -pom.xml.asc -*.jar -*.class -/.lein-* -/.nrepl-port -.hgignore -.hg/ diff --git a/clojure/CHANGELOG.md b/clojure/CHANGELOG.md deleted file mode 100644 index ed1f8ca..0000000 --- a/clojure/CHANGELOG.md +++ /dev/null @@ -1,24 +0,0 @@ -# Change Log -All notable changes to this project will be documented in this file. This change log follows the conventions of [keepachangelog.com](http://keepachangelog.com/). - -## [Unreleased] -### Changed -- Add a new arity to `make-widget-async` to provide a different widget shape. - -## [0.1.1] - 2018-02-26 -### Changed -- Documentation on how to make the widgets. - -### Removed -- `make-widget-sync` - we're all async, all the time. - -### Fixed -- Fixed widget maker to keep working when daylight savings switches over. - -## 0.1.0 - 2018-02-26 -### Added -- Files from the new template. -- Widget maker public API - `make-widget-sync`. - -[Unreleased]: https://github.com/your-name/gogen-clojure/compare/0.1.1...HEAD -[0.1.1]: https://github.com/your-name/gogen-clojure/compare/0.1.0...0.1.1 diff --git a/clojure/LICENSE b/clojure/LICENSE deleted file mode 100644 index d921d3d..0000000 --- a/clojure/LICENSE +++ /dev/null @@ -1,214 +0,0 @@ -THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC -LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM -CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. - -1. DEFINITIONS - -"Contribution" means: - -a) in the case of the initial Contributor, the initial code and -documentation distributed under this Agreement, and - -b) in the case of each subsequent Contributor: - -i) changes to the Program, and - -ii) additions to the Program; - -where such changes and/or additions to the Program originate from and are -distributed by that particular Contributor. A Contribution 'originates' from -a Contributor if it was added to the Program by such Contributor itself or -anyone acting on such Contributor's behalf. Contributions do not include -additions to the Program which: (i) are separate modules of software -distributed in conjunction with the Program under their own license -agreement, and (ii) are not derivative works of the Program. - -"Contributor" means any person or entity that distributes the Program. - -"Licensed Patents" mean patent claims licensable by a Contributor which are -necessarily infringed by the use or sale of its Contribution alone or when -combined with the Program. - -"Program" means the Contributions distributed in accordance with this -Agreement. - -"Recipient" means anyone who receives the Program under this Agreement, -including all Contributors. - -2. GRANT OF RIGHTS - -a) Subject to the terms of this Agreement, each Contributor hereby grants -Recipient a non-exclusive, worldwide, royalty-free copyright license to -reproduce, prepare derivative works of, publicly display, publicly perform, -distribute and sublicense the Contribution of such Contributor, if any, and -such derivative works, in source code and object code form. - -b) Subject to the terms of this Agreement, each Contributor hereby grants -Recipient a non-exclusive, worldwide, royalty-free patent license under -Licensed Patents to make, use, sell, offer to sell, import and otherwise -transfer the Contribution of such Contributor, if any, in source code and -object code form. This patent license shall apply to the combination of the -Contribution and the Program if, at the time the Contribution is added by the -Contributor, such addition of the Contribution causes such combination to be -covered by the Licensed Patents. The patent license shall not apply to any -other combinations which include the Contribution. No hardware per se is -licensed hereunder. - -c) Recipient understands that although each Contributor grants the licenses -to its Contributions set forth herein, no assurances are provided by any -Contributor that the Program does not infringe the patent or other -intellectual property rights of any other entity. Each Contributor disclaims -any liability to Recipient for claims brought by any other entity based on -infringement of intellectual property rights or otherwise. As a condition to -exercising the rights and licenses granted hereunder, each Recipient hereby -assumes sole responsibility to secure any other intellectual property rights -needed, if any. For example, if a third party patent license is required to -allow Recipient to distribute the Program, it is Recipient's responsibility -to acquire that license before distributing the Program. - -d) Each Contributor represents that to its knowledge it has sufficient -copyright rights in its Contribution, if any, to grant the copyright license -set forth in this Agreement. - -3. REQUIREMENTS - -A Contributor may choose to distribute the Program in object code form under -its own license agreement, provided that: - -a) it complies with the terms and conditions of this Agreement; and - -b) its license agreement: - -i) effectively disclaims on behalf of all Contributors all warranties and -conditions, express and implied, including warranties or conditions of title -and non-infringement, and implied warranties or conditions of merchantability -and fitness for a particular purpose; - -ii) effectively excludes on behalf of all Contributors all liability for -damages, including direct, indirect, special, incidental and consequential -damages, such as lost profits; - -iii) states that any provisions which differ from this Agreement are offered -by that Contributor alone and not by any other party; and - -iv) states that source code for the Program is available from such -Contributor, and informs licensees how to obtain it in a reasonable manner on -or through a medium customarily used for software exchange. - -When the Program is made available in source code form: - -a) it must be made available under this Agreement; and - -b) a copy of this Agreement must be included with each copy of the Program. - -Contributors may not remove or alter any copyright notices contained within -the Program. - -Each Contributor must identify itself as the originator of its Contribution, -if any, in a manner that reasonably allows subsequent Recipients to identify -the originator of the Contribution. - -4. COMMERCIAL DISTRIBUTION - -Commercial distributors of software may accept certain responsibilities with -respect to end users, business partners and the like. While this license is -intended to facilitate the commercial use of the Program, the Contributor who -includes the Program in a commercial product offering should do so in a -manner which does not create potential liability for other Contributors. -Therefore, if a Contributor includes the Program in a commercial product -offering, such Contributor ("Commercial Contributor") hereby agrees to defend -and indemnify every other Contributor ("Indemnified Contributor") against any -losses, damages and costs (collectively "Losses") arising from claims, -lawsuits and other legal actions brought by a third party against the -Indemnified Contributor to the extent caused by the acts or omissions of such -Commercial Contributor in connection with its distribution of the Program in -a commercial product offering. The obligations in this section do not apply -to any claims or Losses relating to any actual or alleged intellectual -property infringement. In order to qualify, an Indemnified Contributor must: -a) promptly notify the Commercial Contributor in writing of such claim, and -b) allow the Commercial Contributor to control, and cooperate with the -Commercial Contributor in, the defense and any related settlement -negotiations. The Indemnified Contributor may participate in any such claim -at its own expense. - -For example, a Contributor might include the Program in a commercial product -offering, Product X. That Contributor is then a Commercial Contributor. If -that Commercial Contributor then makes performance claims, or offers -warranties related to Product X, those performance claims and warranties are -such Commercial Contributor's responsibility alone. Under this section, the -Commercial Contributor would have to defend claims against the other -Contributors related to those performance claims and warranties, and if a -court requires any other Contributor to pay any damages as a result, the -Commercial Contributor must pay those damages. - -5. NO WARRANTY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON -AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER -EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR -CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A -PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the -appropriateness of using and distributing the Program and assumes all risks -associated with its exercise of rights under this Agreement , including but -not limited to the risks and costs of program errors, compliance with -applicable laws, damage to or loss of data, programs or equipment, and -unavailability or interruption of operations. - -6. DISCLAIMER OF LIABILITY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY -CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION -LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE -EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY -OF SUCH DAMAGES. - -7. GENERAL - -If any provision of this Agreement is invalid or unenforceable under -applicable law, it shall not affect the validity or enforceability of the -remainder of the terms of this Agreement, and without further action by the -parties hereto, such provision shall be reformed to the minimum extent -necessary to make such provision valid and enforceable. - -If Recipient institutes patent litigation against any entity (including a -cross-claim or counterclaim in a lawsuit) alleging that the Program itself -(excluding combinations of the Program with other software or hardware) -infringes such Recipient's patent(s), then such Recipient's rights granted -under Section 2(b) shall terminate as of the date such litigation is filed. - -All Recipient's rights under this Agreement shall terminate if it fails to -comply with any of the material terms or conditions of this Agreement and -does not cure such failure in a reasonable period of time after becoming -aware of such noncompliance. If all Recipient's rights under this Agreement -terminate, Recipient agrees to cease use and distribution of the Program as -soon as reasonably practicable. However, Recipient's obligations under this -Agreement and any licenses granted by Recipient relating to the Program shall -continue and survive. - -Everyone is permitted to copy and distribute copies of this Agreement, but in -order to avoid inconsistency the Agreement is copyrighted and may only be -modified in the following manner. The Agreement Steward reserves the right to -publish new versions (including revisions) of this Agreement from time to -time. No one other than the Agreement Steward has the right to modify this -Agreement. The Eclipse Foundation is the initial Agreement Steward. The -Eclipse Foundation may assign the responsibility to serve as the Agreement -Steward to a suitable separate entity. Each new version of the Agreement will -be given a distinguishing version number. The Program (including -Contributions) may always be distributed subject to the version of the -Agreement under which it was received. In addition, after a new version of -the Agreement is published, Contributor may elect to distribute the Program -(including its Contributions) under the new version. Except as expressly -stated in Sections 2(a) and 2(b) above, Recipient receives no rights or -licenses to the intellectual property of any Contributor under this -Agreement, whether expressly, by implication, estoppel or otherwise. All -rights in the Program not expressly granted under this Agreement are -reserved. - -This Agreement is governed by the laws of the State of New York and the -intellectual property laws of the United States of America. No party to this -Agreement will bring a legal action under this Agreement more than one year -after the cause of action arose. Each party waives its rights to a jury trial -in any resulting litigation. diff --git a/clojure/README.md b/clojure/README.md deleted file mode 100644 index ae74296..0000000 --- a/clojure/README.md +++ /dev/null @@ -1,36 +0,0 @@ -# gogen-clojure - -FIXME: description - -## Installation - -Download from http://example.com/FIXME. - -## Usage - -FIXME: explanation - - $ java -jar gogen-clojure-0.1.0-standalone.jar [args] - -## Options - -FIXME: listing of options this app accepts. - -## Examples - -... - -### Bugs - -... - -### Any Other Sections -### That You Think -### Might be Useful - -## License - -Copyright © 2018 FIXME - -Distributed under the Eclipse Public License either version 1.0 or (at -your option) any later version. diff --git a/clojure/src/gogen_clojure/core.clj b/clojure/src/gogen_clojure/core.clj index 5eafbea..08652f7 100644 --- a/clojure/src/gogen_clojure/core.clj +++ b/clojure/src/gogen_clojure/core.clj @@ -1,5 +1,6 @@ (ns gogen-clojure.core - (require '[clojure.string :as str]) + "A Gogen solver!" + (require clojure.string clojure.set) (:gen-class)) (def ^:const text-input-split "#####") @@ -7,18 +8,60 @@ (def ^:const print_padding 3) (def ^:const blank_character "_") -(defn get-puzzle-id [] +(def all-positions + (for [row (range 0 grid-size) + col (range 0 grid-size)] + [col row])) + +(defn puzzle-id [] (or (System/getenv "PUZZLE") "1")) -(defn get-puzzle-raw [] - (let [id (get-puzzle-id)] +(defn puzzle-raw [] + (let [id (puzzle-id)] (slurp (str "../examples/" id "-unsolved.txt")))) +(defn raw-from-puzzle [] + (let [raw (puzzle-raw)] + (clojure.string/split raw #"#####"))) + +(defn extract-grid + [grid-raw] + (apply mapv vector + (mapv #(clojure.string/split % #" ") + (clojure.string/split grid-raw #"\n")))) + +(defn extract-words + [words-raw] + (clojure.string/split (clojure.string/trim words-raw) #"\n")) + +(defn word-to-letter-pairs + [word] + (let [word-length (count word) + max-index (- word-length 1)] + (map + (fn [index] + (into [] + [(subs word index (+ index 1)) + (subs word (+ index 1) (+ index 2))])) + (range 0 max-index)))) + +(defn extract-adjacencies + [words] + words) + +(defn extract-letters-pos-map + [grid] + grid) + (defn data-from-puzzle [] - (let [raw (get-puzzle-raw)]) - ) + (let [[grid-raw words-raw] (raw-from-puzzle) + grid (extract-grid grid-raw) + words (extract-words words-raw)] + (into [] + [(extract-adjacencies words) + (extract-letters-pos-map grid)]))) (defn -main "Main entry point to solving puzzles" From 61e6900a2e76cbbf1261502d8377c6dc63abe4a6 Mon Sep 17 00:00:00 2001 From: redroot Date: Tue, 27 Feb 2018 17:46:59 +0000 Subject: [PATCH 3/9] middway through writign adjencies code --- clojure/src/gogen_clojure/core.clj | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/clojure/src/gogen_clojure/core.clj b/clojure/src/gogen_clojure/core.clj index 08652f7..d6830dd 100644 --- a/clojure/src/gogen_clojure/core.clj +++ b/clojure/src/gogen_clojure/core.clj @@ -13,6 +13,17 @@ col (range 0 grid-size)] [col row])) +(def all-letters + (map #(str (char %)) + (range (int \A) (int \Y)))) + +(def initial-letter-map + (let [letter all-letters] + (into {} + (map + (fn [l] [l,[]]) + all-letters)))) + (defn puzzle-id [] (or (System/getenv "PUZZLE") "1")) @@ -63,6 +74,13 @@ [(extract-adjacencies words) (extract-letters-pos-map grid)]))) +; get adjacenies +; get letter pos map +; start with data-from-puzzle and then loop / reduce +; over extract-letters-pos-map until all letters have only one pos +; solved! +; printing methid required + (defn -main "Main entry point to solving puzzles" [& args] From f100efe1bf520ac6b48ee38d9a188e6ca8b3c119 Mon Sep 17 00:00:00 2001 From: redroot Date: Wed, 28 Feb 2018 09:02:56 +0000 Subject: [PATCH 4/9] adds ajacencies code --- clojure/src/gogen_clojure/core.clj | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/clojure/src/gogen_clojure/core.clj b/clojure/src/gogen_clojure/core.clj index d6830dd..16eb4dd 100644 --- a/clojure/src/gogen_clojure/core.clj +++ b/clojure/src/gogen_clojure/core.clj @@ -58,9 +58,25 @@ (subs word (+ index 1) (+ index 2))])) (range 0 max-index)))) +(defn unique-letter-pairs + [words] + (distinct + (apply concat + (map word-to-letter-pairs words)))) + (defn extract-adjacencies [words] - words) + (let [pairs-list (unique-letter-pairs words)] + (reduce + (fn [acc pair] + (let [a (first pair) + b (second pair) + a-val (get acc a) + b-val (get acc b)] + (assoc acc a (conj a-val b) + b (conj b-val a)))) + initial-letter-map + pairs-list))) (defn extract-letters-pos-map [grid] From 57a294cd5a51747048b66bf1b4178263122a3ead Mon Sep 17 00:00:00 2001 From: redroot Date: Fri, 2 Mar 2018 16:47:03 +0000 Subject: [PATCH 5/9] finishes data-from-puzzle --- clojure/src/gogen_clojure/core.clj | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/clojure/src/gogen_clojure/core.clj b/clojure/src/gogen_clojure/core.clj index 16eb4dd..9eedc85 100644 --- a/clojure/src/gogen_clojure/core.clj +++ b/clojure/src/gogen_clojure/core.clj @@ -5,12 +5,12 @@ (def ^:const text-input-split "#####") (def ^:const grid-size 5) -(def ^:const print_padding 3) -(def ^:const blank_character "_") +(def ^:const print-padding 3) +(def ^:const blank-character "_") (def all-positions (for [row (range 0 grid-size) - col (range 0 grid-size)] + col (range 0 grid-size)] [col row])) (def all-letters @@ -78,9 +78,29 @@ initial-letter-map pairs-list))) +(defn extract-known-positions + [grid] + (into {} + (remove nil? + (apply concat + (map-indexed + (fn [row_idx row] + (map-indexed + (fn [col_idx val] + (if (= val "_") nil [val [[col_idx row_idx]]])) row)) + grid))))) + (defn extract-letters-pos-map [grid] - grid) + (let [known-letters-pos-map (extract-known-positions grid) + known-letters-positions (set (map first (vals known-letters-pos-map))) + unknown-positions (clojure.set/difference (set all-positions) known-letters-positions)] + (into {} + (map + (fn [[letter v]] + (let [known-val (get known-letters-pos-map letter)] + (if (nil? known-val) [letter unknown-positions] [letter (set known-val)]))) + initial-letter-map)))) (defn data-from-puzzle [] (let [[grid-raw words-raw] (raw-from-puzzle) @@ -90,8 +110,6 @@ [(extract-adjacencies words) (extract-letters-pos-map grid)]))) -; get adjacenies -; get letter pos map ; start with data-from-puzzle and then loop / reduce ; over extract-letters-pos-map until all letters have only one pos ; solved! From 5970a18363ece127665637efd6aed03f4a39c529 Mon Sep 17 00:00:00 2001 From: redroot Date: Wed, 7 Mar 2018 17:38:53 +0000 Subject: [PATCH 6/9] adds build neighbourhood --- clojure/src/gogen_clojure/core.clj | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/clojure/src/gogen_clojure/core.clj b/clojure/src/gogen_clojure/core.clj index 9eedc85..c50e9f4 100644 --- a/clojure/src/gogen_clojure/core.clj +++ b/clojure/src/gogen_clojure/core.clj @@ -15,7 +15,7 @@ (def all-letters (map #(str (char %)) - (range (int \A) (int \Y)))) + (range (int \A) (int \Z)))) (def initial-letter-map (let [letter all-letters] @@ -24,6 +24,24 @@ (fn [l] [l,[]]) all-letters)))) +(defn build-neighbourhood [x y] + (let [low-x (max 0 (- x 1)) + low-y (max 0 (- y 1)) + high-x (min (- grid-size 1) (+ x 1)) + high-y (min (- grid-size 1) (+ y 1)) + x-range (range low-x (+ high-x 1)) + y-range (range low-y (+ high-y 1))] + (for [a x-range b x-range] + (list a b)))) + +(defn is-solved? + [letter-pos-map] + (= (count all-letters) + (count + (filter + #(-> (second %) count (= 1)) + letter-pos-map)))) + (defn puzzle-id [] (or (System/getenv "PUZZLE") "1")) @@ -110,10 +128,11 @@ [(extract-adjacencies words) (extract-letters-pos-map grid)]))) -; start with data-from-puzzle and then loop / reduce -; over extract-letters-pos-map until all letters have only one pos -; solved! -; printing methid required +(defn solve [] + (let [[adjacencies letters-pos-map] (data-from-puzzle)] + (if (is-solved? letters-pos-map) + letters-pos-map + "NOT SOLVED NEED REECURSION"))) (defn -main "Main entry point to solving puzzles" From 3a312bf1030edb912c8e00afb65441592091e10a Mon Sep 17 00:00:00 2001 From: redroot Date: Thu, 8 Mar 2018 10:52:43 +0000 Subject: [PATCH 7/9] add print grid method --- clojure/src/gogen_clojure/core.clj | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/clojure/src/gogen_clojure/core.clj b/clojure/src/gogen_clojure/core.clj index c50e9f4..b706d71 100644 --- a/clojure/src/gogen_clojure/core.clj +++ b/clojure/src/gogen_clojure/core.clj @@ -8,6 +8,11 @@ (def ^:const print-padding 3) (def ^:const blank-character "_") +(defn surround-vec + [middle end] + (into [end] + (conj middle end))) + (def all-positions (for [row (range 0 grid-size) col (range 0 grid-size)] @@ -120,6 +125,19 @@ (if (nil? known-val) [letter unknown-positions] [letter (set known-val)]))) initial-letter-map)))) +(defn print-grid + [grid] + (let [padding (repeat print-padding "\n")] + (map + (fn [l] (apply println l)) + (surround-vec + (vec + (map + (fn [pos] (clojure.string/join "" pos)) + grid)) + (vec + (clojure.string/join (repeat print-padding "\n"))))))) + (defn data-from-puzzle [] (let [[grid-raw words-raw] (raw-from-puzzle) grid (extract-grid grid-raw) @@ -134,7 +152,13 @@ letters-pos-map "NOT SOLVED NEED REECURSION"))) + +; print initial grid +; recur on solve +; print final grid +; build step? + (defn -main "Main entry point to solving puzzles" [& args] - (println "asdasd")) + (println data-from-puzzle)) From 91bd20f8e2fc29daa9c5eb6632f4190b6a58b8d0 Mon Sep 17 00:00:00 2001 From: redroot Date: Fri, 9 Mar 2018 12:43:03 +0000 Subject: [PATCH 8/9] more progres on solve-step --- README.md | 3 +- clojure/src/gogen_clojure/core.clj | 74 ++++++++++++++++++++++++------ 2 files changed, 61 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index f60dcf0..1183991 100644 --- a/README.md +++ b/README.md @@ -35,5 +35,6 @@ Coming Soon: Clojure #### Clojure -- `lein repl` is super useful +- `lein repl` is super useful, but a pain if there are compilation errors as you have to restart the whole repl to get things to load properly. - Errors messaging relating to syntax aren't the most helpful out of the box +- Simple pure functions are a joy to write, many different ways of doing it, however complication control flows took a little while longer and doesnt seem as neat, such as print a few blank lines either side of the grid. diff --git a/clojure/src/gogen_clojure/core.clj b/clojure/src/gogen_clojure/core.clj index b706d71..32e26dc 100644 --- a/clojure/src/gogen_clojure/core.clj +++ b/clojure/src/gogen_clojure/core.clj @@ -39,6 +39,7 @@ (for [a x-range b x-range] (list a b)))) +; optimise this to break to false if it finds any count > 1? (defn is-solved? [letter-pos-map] (= (count all-letters) @@ -101,7 +102,7 @@ initial-letter-map pairs-list))) -(defn extract-known-positions +(defn extract-known-positions-from-grid [grid] (into {} (remove nil? @@ -113,9 +114,17 @@ (if (= val "_") nil [val [[col_idx row_idx]]])) row)) grid))))) +(defn extract-known-positions-from-map + [letters-pos-map] + (set + (mapcat second + (filter + #(-> (second %) count (= 1)) + letters-pos-map)))) + (defn extract-letters-pos-map [grid] - (let [known-letters-pos-map (extract-known-positions grid) + (let [known-letters-pos-map (extract-known-positions-from-grid grid) known-letters-positions (set (map first (vals known-letters-pos-map))) unknown-positions (clojure.set/difference (set all-positions) known-letters-positions)] (into {} @@ -143,22 +152,57 @@ grid (extract-grid grid-raw) words (extract-words words-raw)] (into [] - [(extract-adjacencies words) + [grid + (extract-adjacencies words) (extract-letters-pos-map grid)]))) -(defn solve [] - (let [[adjacencies letters-pos-map] (data-from-puzzle)] - (if (is-solved? letters-pos-map) - letters-pos-map - "NOT SOLVED NEED REECURSION"))) - - -; print initial grid -; recur on solve -; print final grid -; build step? +(defn build-neighbourhood-set-from-pos-list + [pos-list] + (set + (distinct ; uniq positible identity + (mapcat identity + (map + (fn + [pos] + (build-neighbourhood (first pos) (second pos))) + pos-list))))) + +(defn updated-value-from-adjancencies + [letter-positions adj-letter-positions known-positions] + (let [neighbour-set (build-neighbourhood-set-from-pos-list adj-letter-positions)] + (clojure.set/intersection + letter-positions + (clojure.set/difference neighbour-set known-positions)))) + +(defn solve-step + [adjacencies letters-pos-map] + (reduce + (fn + [acc letter] + (reduce + (fn + [inner-acc adj-letter] + (if (= (count (get letters-pos-map adj-letter)) 1) + inner-acc + (assoc inner-acc letter + (updated-value-from-adjancencies + (get letters-pos-map letter) + (get letters-pos-map adj-letter) + (extract-known-positions-from-map)))) + acc + (get letters-pos-map adj-letter)))) + letters-pos-map + adjacencies)) + +(defn solve + [adjacencies letters-pos-map] + (if (is-solved? letters-pos-map) + letters-pos-map + (recur adjacencies (solve-step adjacencies letters-pos-map)))) + +; (print-grid (update-grid (solve (data-from-puzzle)))) (defn -main "Main entry point to solving puzzles" [& args] - (println data-from-puzzle)) + (print-grid (first (data-from-puzzle)))) From 9ee1bdc0d98150367385bbd7082b4bd30076bc82 Mon Sep 17 00:00:00 2001 From: redroot Date: Sat, 10 Mar 2018 09:16:36 +0000 Subject: [PATCH 9/9] Finishes up clojure attempt, fixes typo in build neighbourhood and removes print padding --- README.md | 4 +- clojure/src/gogen_clojure/core.clj | 72 +++++++++++++++++------------- 2 files changed, 42 insertions(+), 34 deletions(-) diff --git a/README.md b/README.md index 1183991..8039a72 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Attempts at solving a gogen puzzle solver in various languages cd ruby & ruby gogen.rb cd go & go run gogen.go cd elixir & elixir gogen.exs - cd clojure && lein run + cd clojure & lein repl # then (-main) I have no idea what I'm doing here Coming Soon: Clojure @@ -37,4 +37,4 @@ Coming Soon: Clojure - `lein repl` is super useful, but a pain if there are compilation errors as you have to restart the whole repl to get things to load properly. - Errors messaging relating to syntax aren't the most helpful out of the box -- Simple pure functions are a joy to write, many different ways of doing it, however complication control flows took a little while longer and doesnt seem as neat, such as print a few blank lines either side of the grid. +- Simple pure functions are a joy to write, many different ways of doing it, however complicated control flows took a little while longer and doesn't seem as neat, such as print a few blank lines either side of the grid - later I found out you can have multiple statements in a function body with negates the wrapping method I found first. Feels like its best for people who know exactly what they are doing from the get go rather than stepping through an idea. diff --git a/clojure/src/gogen_clojure/core.clj b/clojure/src/gogen_clojure/core.clj index 32e26dc..31133a0 100644 --- a/clojure/src/gogen_clojure/core.clj +++ b/clojure/src/gogen_clojure/core.clj @@ -5,7 +5,6 @@ (def ^:const text-input-split "#####") (def ^:const grid-size 5) -(def ^:const print-padding 3) (def ^:const blank-character "_") (defn surround-vec @@ -36,17 +35,18 @@ high-y (min (- grid-size 1) (+ y 1)) x-range (range low-x (+ high-x 1)) y-range (range low-y (+ high-y 1))] - (for [a x-range b x-range] - (list a b)))) + (map vec + (for [a x-range b y-range] + (list a b))))) ; optimise this to break to false if it finds any count > 1? (defn is-solved? - [letter-pos-map] + [letters-pos-map] (= (count all-letters) (count (filter #(-> (second %) count (= 1)) - letter-pos-map)))) + letters-pos-map)))) (defn puzzle-id [] (or (System/getenv "PUZZLE") @@ -134,18 +134,15 @@ (if (nil? known-val) [letter unknown-positions] [letter (set known-val)]))) initial-letter-map)))) +; we can have statements per function, fix this (defn print-grid [grid] - (let [padding (repeat print-padding "\n")] - (map - (fn [l] (apply println l)) - (surround-vec - (vec - (map - (fn [pos] (clojure.string/join "" pos)) - grid)) - (vec - (clojure.string/join (repeat print-padding "\n"))))))) + (map + (fn [l] (apply println l)) + (vec + (map + (fn [pos] (clojure.string/join "" pos)) + grid)))) (defn data-from-puzzle [] (let [[grid-raw words-raw] (raw-from-puzzle) @@ -160,14 +157,14 @@ [pos-list] (set (distinct ; uniq positible identity - (mapcat identity + (mapcat identity ; flatten 1 layer (map (fn [pos] (build-neighbourhood (first pos) (second pos))) pos-list))))) -(defn updated-value-from-adjancencies +(defn updated-value-from-adjacencies [letter-positions adj-letter-positions known-positions] (let [neighbour-set (build-neighbourhood-set-from-pos-list adj-letter-positions)] (clojure.set/intersection @@ -178,21 +175,21 @@ [adjacencies letters-pos-map] (reduce (fn - [acc letter] + [acc [letter _]] (reduce - (fn - [inner-acc adj-letter] - (if (= (count (get letters-pos-map adj-letter)) 1) - inner-acc - (assoc inner-acc letter - (updated-value-from-adjancencies - (get letters-pos-map letter) - (get letters-pos-map adj-letter) - (extract-known-positions-from-map)))) + (fn [inner-map adj-letter] + (let [inner-map-letter-ps (get inner-map letter) + inner-map-adj-letter-ps (get inner-map adj-letter) + known-positions (extract-known-positions-from-map inner-map) + neighbour-set (build-neighbourhood-set-from-pos-list inner-map-adj-letter-ps) + updated-value (updated-value-from-adjacencies inner-map-letter-ps inner-map-adj-letter-ps known-positions)] + (if (= (count inner-map-letter-ps) 1) + inner-map ; exit early + (assoc inner-map letter updated-value)))) acc - (get letters-pos-map adj-letter)))) + (get adjacencies letter))) letters-pos-map - adjacencies)) + letters-pos-map)) (defn solve [adjacencies letters-pos-map] @@ -200,9 +197,20 @@ letters-pos-map (recur adjacencies (solve-step adjacencies letters-pos-map)))) -; (print-grid (update-grid (solve (data-from-puzzle)))) +(defn update-grid + [grid letters-pos-map] + (reduce + (fn + [new-grid [letter pos-map]] + (let [[x y] (first pos-map)] + (update-in new-grid [y x] (fn [_] letter)))) + grid + letters-pos-map)) (defn -main - "Main entry point to solving puzzles" + "Main entry point to solving Gogen puzzles" [& args] - (print-grid (first (data-from-puzzle)))) + (let [[grid adjacencies letters-pos-map] (data-from-puzzle)] + (print-grid + (update-grid grid + (solve adjacencies letters-pos-map)))))