[Puzzler-checkins] SF.net SVN: puzzler:[640] trunk
Brought to you by:
goodger
From: <go...@us...> - 2016-12-05 04:39:21
|
Revision: 640 http://sourceforge.net/p/puzzler/code/640 Author: goodger Date: 2016-12-05 04:39:18 +0000 (Mon, 05 Dec 2016) Log Message: ----------- added puzzles Modified Paths: -------------- trunk/puzzler/docs/hexiamonds.txt trunk/puzzler/docs/pentominoes.txt trunk/puzzler/docs/solid-pentominoes.txt trunk/puzzler/puzzler/puzzles/hexiamonds.py trunk/puzzler/puzzler/puzzles/pentominoes.py trunk/puzzler/puzzler/puzzles/solid_pentominoes.py Added Paths: ----------- trunk/puzzler/bin/cubes/solid-pentominoes-square-tower-5.py trunk/puzzler/bin/cubes/solid-pentominoes-square-tower-6.py trunk/puzzler/bin/iamonds/hexiamonds-notched-hexagon-1.py trunk/puzzler/bin/iamonds/hexiamonds-spinner-5.py trunk/puzzler/bin/iamonds/hexiamonds-spinner-6.py trunk/puzzler/bin/iamonds/hexiamonds-trilevel.py trunk/puzzler/bin/ominoes/pentominoes-holey-spinner.py trunk/puzzler/docs/images/cubes/solid-pentominoes-square-tower-5.png trunk/puzzler/docs/images/cubes/solid-pentominoes-square-tower-5.svg trunk/puzzler/docs/images/cubes/solid-pentominoes-square-tower-5.x3d trunk/puzzler/docs/images/cubes/solid-pentominoes-square-tower-6.png trunk/puzzler/docs/images/cubes/solid-pentominoes-square-tower-6.svg trunk/puzzler/docs/images/cubes/solid-pentominoes-square-tower-6.x3d trunk/puzzler/docs/images/iamonds/hexiamonds-notched-hexagon-1.png trunk/puzzler/docs/images/iamonds/hexiamonds-notched-hexagon-1.svg trunk/puzzler/docs/images/iamonds/hexiamonds-spinner-5.png trunk/puzzler/docs/images/iamonds/hexiamonds-spinner-5.svg trunk/puzzler/docs/images/iamonds/hexiamonds-spinner-6.png trunk/puzzler/docs/images/iamonds/hexiamonds-spinner-6.svg trunk/puzzler/docs/images/iamonds/hexiamonds-trilevel.png trunk/puzzler/docs/images/iamonds/hexiamonds-trilevel.svg trunk/puzzler/docs/images/ominoes/pentominoes-holey-spinner.png trunk/puzzler/docs/images/ominoes/pentominoes-holey-spinner.svg trunk/solutions/cubes/solid-pentominoes-square-tower-5.txt trunk/solutions/cubes/solid-pentominoes-square-tower-6.txt trunk/solutions/iamonds/hexiamonds-notched-hexagon-1.txt trunk/solutions/iamonds/hexiamonds-spinner-5.txt trunk/solutions/iamonds/hexiamonds-spinner-6.txt trunk/solutions/iamonds/hexiamonds-trilevel.txt trunk/solutions/ominoes/pentominoes-holey-spinner.txt Added: trunk/puzzler/bin/cubes/solid-pentominoes-square-tower-5.py =================================================================== --- trunk/puzzler/bin/cubes/solid-pentominoes-square-tower-5.py (rev 0) +++ trunk/puzzler/bin/cubes/solid-pentominoes-square-tower-5.py 2016-12-05 04:39:18 UTC (rev 640) @@ -0,0 +1,10 @@ +#!/usr/bin/env python +# $Id$ + +"""106 solutions""" + +import puzzler +from puzzler.puzzles.solid_pentominoes import SolidPentominoesSquareTower5 \ + as puzzle + +puzzler.run(puzzle) Property changes on: trunk/puzzler/bin/cubes/solid-pentominoes-square-tower-5.py ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Revision \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: trunk/puzzler/bin/cubes/solid-pentominoes-square-tower-6.py =================================================================== --- trunk/puzzler/bin/cubes/solid-pentominoes-square-tower-6.py (rev 0) +++ trunk/puzzler/bin/cubes/solid-pentominoes-square-tower-6.py 2016-12-05 04:39:18 UTC (rev 640) @@ -0,0 +1,10 @@ +#!/usr/bin/env python +# $Id$ + +""" solutions""" + +import puzzler +from puzzler.puzzles.solid_pentominoes import SolidPentominoesSquareTower6 \ + as puzzle + +puzzler.run(puzzle) Property changes on: trunk/puzzler/bin/cubes/solid-pentominoes-square-tower-6.py ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Revision \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: trunk/puzzler/bin/iamonds/hexiamonds-notched-hexagon-1.py =================================================================== --- trunk/puzzler/bin/iamonds/hexiamonds-notched-hexagon-1.py (rev 0) +++ trunk/puzzler/bin/iamonds/hexiamonds-notched-hexagon-1.py 2016-12-05 04:39:18 UTC (rev 640) @@ -0,0 +1,9 @@ +#!/usr/bin/env python +# $Id$ + +"""1 solution""" + +import puzzler +from puzzler.puzzles.hexiamonds import HexiamondsNotchedHexagon1 as puzzle + +puzzler.run(puzzle) Property changes on: trunk/puzzler/bin/iamonds/hexiamonds-notched-hexagon-1.py ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Revision \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: trunk/puzzler/bin/iamonds/hexiamonds-spinner-5.py =================================================================== --- trunk/puzzler/bin/iamonds/hexiamonds-spinner-5.py (rev 0) +++ trunk/puzzler/bin/iamonds/hexiamonds-spinner-5.py 2016-12-05 04:39:18 UTC (rev 640) @@ -0,0 +1,9 @@ +#!/usr/bin/env python +# $Id$ + +"""1 solution""" + +import puzzler +from puzzler.puzzles.hexiamonds import HexiamondsSpinner5 as puzzle + +puzzler.run(puzzle) Property changes on: trunk/puzzler/bin/iamonds/hexiamonds-spinner-5.py ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Revision \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: trunk/puzzler/bin/iamonds/hexiamonds-spinner-6.py =================================================================== --- trunk/puzzler/bin/iamonds/hexiamonds-spinner-6.py (rev 0) +++ trunk/puzzler/bin/iamonds/hexiamonds-spinner-6.py 2016-12-05 04:39:18 UTC (rev 640) @@ -0,0 +1,9 @@ +#!/usr/bin/env python +# $Id$ + +"""1 solution""" + +import puzzler +from puzzler.puzzles.hexiamonds import HexiamondsSpinner6 as puzzle + +puzzler.run(puzzle) Property changes on: trunk/puzzler/bin/iamonds/hexiamonds-spinner-6.py ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Revision \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: trunk/puzzler/bin/iamonds/hexiamonds-trilevel.py =================================================================== --- trunk/puzzler/bin/iamonds/hexiamonds-trilevel.py (rev 0) +++ trunk/puzzler/bin/iamonds/hexiamonds-trilevel.py 2016-12-05 04:39:18 UTC (rev 640) @@ -0,0 +1,9 @@ +#!/usr/bin/env python +# $Id$ + +"""1 solution""" + +import puzzler +from puzzler.puzzles.hexiamonds import HexiamondsTriLevel as puzzle + +puzzler.run(puzzle) Property changes on: trunk/puzzler/bin/iamonds/hexiamonds-trilevel.py ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Revision \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: trunk/puzzler/bin/ominoes/pentominoes-holey-spinner.py =================================================================== --- trunk/puzzler/bin/ominoes/pentominoes-holey-spinner.py (rev 0) +++ trunk/puzzler/bin/ominoes/pentominoes-holey-spinner.py 2016-12-05 04:39:18 UTC (rev 640) @@ -0,0 +1,9 @@ +#!/usr/bin/env python +# $Id$ + +"""3 solutions""" + +import puzzler +from puzzler.puzzles.pentominoes import PentominoesHoleySpinner as puzzle + +puzzler.run(puzzle) Property changes on: trunk/puzzler/bin/ominoes/pentominoes-holey-spinner.py ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Revision \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Modified: trunk/puzzler/docs/hexiamonds.txt =================================================================== --- trunk/puzzler/docs/hexiamonds.txt 2016-12-01 14:53:21 UTC (rev 639) +++ trunk/puzzler/docs/hexiamonds.txt 2016-12-05 04:39:18 UTC (rev 640) @@ -8,7 +8,7 @@ :Date: $Date$ :Revision: $Revision$ :Web site: http://puzzler.sourceforge.net/ -:Copyright: |c| 1998-2015 by David J. Goodger +:Copyright: |c| 1998-2016 by David J. Goodger :License: `GPL 2 <../COPYING.html>`__ .. image:: images/puzzler.png @@ -222,7 +222,12 @@ `993 solutions <../solutions/iamonds/hexiamonds-5x2-semiregular-hexagon-2.txt>`__ +* Notched hexagon (design from `Kadon's "Iamond Hex"`_ booklet): `1 + solution <../solutions/iamonds/hexiamonds-notched-hexagon-1.txt>`__ + .. image:: images/iamonds/hexiamonds-notched-hexagon-1.png + + "Choose 9" Hexagons ------------------- @@ -424,7 +429,18 @@ <../solutions/iamonds/hexiamonds-spinner-4.txt>`__ (design from `Kadon's "Iamond Hex"`_ booklet) + * - .. figure:: images/iamonds/hexiamonds-spinner-5.png + `1 solution + <../solutions/iamonds/hexiamonds-spinner-5.txt>`__ (design + from `Kadon's "Iamond Hex"`_ booklet) + + - .. figure:: images/iamonds/hexiamonds-spinner-6.png + + `1 solution + <../solutions/iamonds/hexiamonds-spinner-6.txt>`__ (design + from `Kadon's "Iamond Hex"`_ booklet) + * Deltas: .. list-table:: @@ -476,7 +492,12 @@ .. image:: images/iamonds/hexiamonds-near-hexagram-1.png +* Trilevel (design via John Greening): `1 + solution <../solutions/iamonds/hexiamonds-trilevel.txt>`__ + .. image:: images/iamonds/hexiamonds-trilevel.png + + One-Sided Hexiamonds ==================== Added: trunk/puzzler/docs/images/cubes/solid-pentominoes-square-tower-5.png =================================================================== (Binary files differ) Index: trunk/puzzler/docs/images/cubes/solid-pentominoes-square-tower-5.png =================================================================== --- trunk/puzzler/docs/images/cubes/solid-pentominoes-square-tower-5.png 2016-12-01 14:53:21 UTC (rev 639) +++ trunk/puzzler/docs/images/cubes/solid-pentominoes-square-tower-5.png 2016-12-05 04:39:18 UTC (rev 640) Property changes on: trunk/puzzler/docs/images/cubes/solid-pentominoes-square-tower-5.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/puzzler/docs/images/cubes/solid-pentominoes-square-tower-5.svg =================================================================== (Binary files differ) Index: trunk/puzzler/docs/images/cubes/solid-pentominoes-square-tower-5.svg =================================================================== --- trunk/puzzler/docs/images/cubes/solid-pentominoes-square-tower-5.svg 2016-12-01 14:53:21 UTC (rev 639) +++ trunk/puzzler/docs/images/cubes/solid-pentominoes-square-tower-5.svg 2016-12-05 04:39:18 UTC (rev 640) Property changes on: trunk/puzzler/docs/images/cubes/solid-pentominoes-square-tower-5.svg ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/svg+xml \ No newline at end of property Added: trunk/puzzler/docs/images/cubes/solid-pentominoes-square-tower-5.x3d =================================================================== --- trunk/puzzler/docs/images/cubes/solid-pentominoes-square-tower-5.x3d (rev 0) +++ trunk/puzzler/docs/images/cubes/solid-pentominoes-square-tower-5.x3d 2016-12-05 04:39:18 UTC (rev 640) @@ -0,0 +1,487 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE X3D PUBLIC "ISO//Web3D//DTD X3D 3.0//EN" + "http://www.web3d.org/specifications/x3d-3.0.dtd"> +<X3D profile="Immersive" version="2.0"> +<Scene> +<Transform translation="2 0 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.251 0.878 0.816"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="3 0 0"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="4 0 0"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.549 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="5 0 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.867 0.627 0.867"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="6 0 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.867 0.627 0.867"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="2 1 0"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="3 1 0"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="4 1 0"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="5 1 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.867 0.627 0.867"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="6 1 0"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.843 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="2 2 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.251 0.878 0.816"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="3 2 0"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="4 2 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.867 0.627 0.867"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="5 2 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.867 0.627 0.867"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="6 2 0"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.843 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="2 3 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.000 0.502"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="3 3 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.000 0.502"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="4 3 0"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.000 1.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="5 3 0"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.843 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="6 3 0"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.843 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="2 4 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.502 0.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="3 4 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.000 0.502"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="4 4 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.000 0.502"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="5 4 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.000 0.502"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="6 4 0"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.843 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="2 0 1"> + <Shape> + <Appearance> + <Material diffuseColor="0.251 0.878 0.816"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="4 0 1"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.549 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="2 1 1"> + <Shape> + <Appearance> + <Material diffuseColor="0.251 0.878 0.816"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="4 1 1"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.549 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="2 2 1"> + <Shape> + <Appearance> + <Material diffuseColor="0.251 0.878 0.816"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="4 2 1"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.549 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="2 3 1"> + <Shape> + <Appearance> + <Material diffuseColor="0.502 0.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="4 3 1"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.000 1.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="2 4 1"> + <Shape> + <Appearance> + <Material diffuseColor="0.502 0.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="4 4 1"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.000 1.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 0 2"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.000 1.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="1 0 2"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 1.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="2 0 2"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 1.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="3 0 2"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.502 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="4 0 2"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.549 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 1 2"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.000 1.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="1 1 2"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 1.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="2 1 2"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.502 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="3 1 2"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.502 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="4 1 2"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.502 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 2 2"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.000 1.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="1 2 2"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 1.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="2 2 2"> + <Shape> + <Appearance> + <Material diffuseColor="0.502 0.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="3 2 2"> + <Shape> + <Appearance> + <Material diffuseColor="0.541 0.169 0.886"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="4 2 2"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.502 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 3 2"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.000 1.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="1 3 2"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 1.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="2 3 2"> + <Shape> + <Appearance> + <Material diffuseColor="0.502 0.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="3 3 2"> + <Shape> + <Appearance> + <Material diffuseColor="0.541 0.169 0.886"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="4 3 2"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.000 1.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 4 2"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.000 1.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="1 4 2"> + <Shape> + <Appearance> + <Material diffuseColor="0.541 0.169 0.886"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="2 4 2"> + <Shape> + <Appearance> + <Material diffuseColor="0.541 0.169 0.886"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="3 4 2"> + <Shape> + <Appearance> + <Material diffuseColor="0.541 0.169 0.886"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="4 4 2"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.000 1.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +</Scene> +</X3D> Added: trunk/puzzler/docs/images/cubes/solid-pentominoes-square-tower-6.png =================================================================== (Binary files differ) Index: trunk/puzzler/docs/images/cubes/solid-pentominoes-square-tower-6.png =================================================================== --- trunk/puzzler/docs/images/cubes/solid-pentominoes-square-tower-6.png 2016-12-01 14:53:21 UTC (rev 639) +++ trunk/puzzler/docs/images/cubes/solid-pentominoes-square-tower-6.png 2016-12-05 04:39:18 UTC (rev 640) Property changes on: trunk/puzzler/docs/images/cubes/solid-pentominoes-square-tower-6.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/puzzler/docs/images/cubes/solid-pentominoes-square-tower-6.svg =================================================================== (Binary files differ) Index: trunk/puzzler/docs/images/cubes/solid-pentominoes-square-tower-6.svg =================================================================== --- trunk/puzzler/docs/images/cubes/solid-pentominoes-square-tower-6.svg 2016-12-01 14:53:21 UTC (rev 639) +++ trunk/puzzler/docs/images/cubes/solid-pentominoes-square-tower-6.svg 2016-12-05 04:39:18 UTC (rev 640) Property changes on: trunk/puzzler/docs/images/cubes/solid-pentominoes-square-tower-6.svg ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/svg+xml \ No newline at end of property Added: trunk/puzzler/docs/images/cubes/solid-pentominoes-square-tower-6.x3d =================================================================== --- trunk/puzzler/docs/images/cubes/solid-pentominoes-square-tower-6.x3d (rev 0) +++ trunk/puzzler/docs/images/cubes/solid-pentominoes-square-tower-6.x3d 2016-12-05 04:39:18 UTC (rev 640) @@ -0,0 +1,487 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE X3D PUBLIC "ISO//Web3D//DTD X3D 3.0//EN" + "http://www.web3d.org/specifications/x3d-3.0.dtd"> +<X3D profile="Immersive" version="2.0"> +<Scene> +<Transform translation="0 0 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.502 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="1 0 0"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="2 0 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.867 0.627 0.867"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="3 0 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.867 0.627 0.867"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="4 0 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.502 0.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 1 0"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="1 1 0"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="2 1 0"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="3 1 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.502 0.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="4 1 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.502 0.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 2 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.251 0.878 0.816"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="1 2 0"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="2 2 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.502 0.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="3 2 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.502 0.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="4 2 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.541 0.169 0.886"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 3 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.251 0.878 0.816"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="1 3 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.000 0.502"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="2 3 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.000 0.502"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="3 3 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.000 0.502"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="4 3 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.541 0.169 0.886"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 4 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.000 0.502"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="1 4 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.000 0.502"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="2 4 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.541 0.169 0.886"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="3 4 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.541 0.169 0.886"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="4 4 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.541 0.169 0.886"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 0 1"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.502 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="2 0 1"> + <Shape> + <Appearance> + <Material diffuseColor="0.867 0.627 0.867"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 1 1"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.502 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="2 1 1"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.843 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 2 1"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.502 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="2 2 1"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.843 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 3 1"> + <Shape> + <Appearance> + <Material diffuseColor="0.251 0.878 0.816"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="2 3 1"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.843 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 4 1"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.549 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="2 4 1"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.843 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 0 2"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 1.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="1 0 2"> + <Shape> + <Appearance> + <Material diffuseColor="0.867 0.627 0.867"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="2 0 2"> + <Shape> + <Appearance> + <Material diffuseColor="0.867 0.627 0.867"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 1 2"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.502 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="1 1 2"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.000 1.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="2 1 2"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.000 1.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 2 2"> + <Shape> + <Appearance> + <Material diffuseColor="0.251 0.878 0.816"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="1 2 2"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.000 1.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="2 2 2"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.000 1.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 3 2"> + <Shape> + <Appearance> + <Material diffuseColor="0.251 0.878 0.816"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="1 3 2"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.000 1.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="2 3 2"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.843 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 4 2"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.549 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="1 4 2"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.549 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="2 4 2"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.549 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 0 3"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 1.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 1 3"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 1.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 2 3"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 1.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 3 3"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 1.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 4 3"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.549 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 0 4"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.000 1.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 1 4"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.000 1.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 2 4"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.000 1.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 3 4"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.000 1.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 4 4"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.000 1.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +</Scene> +</X3D> Added: trunk/puzzler/docs/images/iamonds/hexiamonds-notched-hexagon-1.png =================================================================== (Binary files differ) Index: trunk/puzzler/docs/images/iamonds/hexiamonds-notched-hexagon-1.png =================================================================== --- trunk/puzzler/docs/images/iamonds/hexiamonds-notched-hexagon-1.png 2016-12-01 14:53:21 UTC (rev 639) +++ trunk/puzzler/docs/images/iamonds/hexiamonds-notched-hexagon-1.png 2016-12-05 04:39:18 UTC (rev 640) Property changes on: trunk/puzzler/docs/images/iamonds/hexiamonds-notched-hexagon-1.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/puzzler/docs/images/iamonds/hexiamonds-notched-hexagon-1.svg =================================================================== (Binary files differ) Index: trunk/puzzler/docs/images/iamonds/hexiamonds-notched-hexagon-1.svg =================================================================== --- trunk/puzzler/docs/images/iamonds/hexiamonds-notched-hexagon-1.svg 2016-12-01 14:53:21 UTC (rev 639) +++ trunk/puzzler/docs/images/iamonds/hexiamonds-notched-hexagon-1.svg 2016-12-05 04:39:18 UTC (rev 640) Property changes on: trunk/puzzler/docs/images/iamonds/hexiamonds-notched-hexagon-1.svg ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/svg+xml \ No newline at end of property Added: trunk/puzzler/docs/images/iamonds/hexiamonds-spinner-5.png =================================================================== (Binary files differ) Index: trunk/puzzler/docs/images/iamonds/hexiamonds-spinner-5.png =================================================================== --- trunk/puzzler/docs/images/iamonds/hexiamonds-spinner-5.png 2016-12-01 14:53:21 UTC (rev 639) +++ trunk/puzzler/docs/images/iamonds/hexiamonds-spinner-5.png 2016-12-05 04:39:18 UTC (rev 640) Property changes on: trunk/puzzler/docs/images/iamonds/hexiamonds-spinner-5.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/puzzler/docs/images/iamonds/hexiamonds-spinner-5.svg =================================================================== (Binary files differ) Index: trunk/puzzler/docs/images/iamonds/hexiamonds-spinner-5.svg =================================================================== --- trunk/puzzler/docs/images/iamonds/hexiamonds-spinner-5.svg 2016-12-01 14:53:21 UTC (rev 639) +++ trunk/puzzler/docs/images/iamonds/hexiamonds-spinner-5.svg 2016-12-05 04:39:18 UTC (rev 640) Property changes on: trunk/puzzler/docs/images/iamonds/hexiamonds-spinner-5.svg ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/svg+xml \ No newline at end of property Added: trunk/puzzler/docs/images/iamonds/hexiamonds-spinner-6.png =================================================================== (Binary files differ) Index: trunk/puzzler/docs/images/iamonds/hexiamonds-spinner-6.png =================================================================== --- trunk/puzzler/docs/images/iamonds/hexiamonds-spinner-6.png 2016-12-01 14:53:21 UTC (rev 639) +++ trunk/puzzler/docs/images/iamonds/hexiamonds-spinner-6.png 2016-12-05 04:39:18 UTC (rev 640) Property changes on: trunk/puzzler/docs/images/iamonds/hexiamonds-spinner-6.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/puzzler/docs/images/iamonds/hexiamonds-spinner-6.svg =================================================================== (Binary files differ) Index: trunk/puzzler/docs/images/iamonds/hexiamonds-spinner-6.svg =================================================================== --- trunk/puzzler/docs/images/iamonds/hexiamonds-spinner-6.svg 2016-12-01 14:53:21 UTC (rev 639) +++ trunk/puzzler/docs/images/iamonds/hexiamonds-spinner-6.svg 2016-12-05 04:39:18 UTC (rev 640) Property changes on: trunk/puzzler/docs/images/iamonds/hexiamonds-spinner-6.svg ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/svg+xml \ No newline at end of property Added: trunk/puzzler/docs/images/iamonds/hexiamonds-trilevel.png =================================================================== (Binary files differ) Index: trunk/puzzler/docs/images/iamonds/hexiamonds-trilevel.png =================================================================== --- trunk/puzzler/docs/images/iamonds/hexiamonds-trilevel.png 2016-12-01 14:53:21 UTC (rev 639) +++ trunk/puzzler/docs/images/iamonds/hexiamonds-trilevel.png 2016-12-05 04:39:18 UTC (rev 640) Property changes on: trunk/puzzler/docs/images/iamonds/hexiamonds-trilevel.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/puzzler/docs/images/iamonds/hexiamonds-trilevel.svg =================================================================== (Binary files differ) Index: trunk/puzzler/docs/images/iamonds/hexiamonds-trilevel.svg =================================================================== --- trunk/puzzler/docs/images/iamonds/hexiamonds-trilevel.svg 2016-12-01 14:53:21 UTC (rev 639) +++ trunk/puzzler/docs/images/iamonds/hexiamonds-trilevel.svg 2016-12-05 04:39:18 UTC (rev 640) Property changes on: trunk/puzzler/docs/images/iamonds/hexiamonds-trilevel.svg ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/svg+xml \ No newline at end of property Added: trunk/puzzler/docs/images/ominoes/pentominoes-holey-spinner.png =================================================================== (Binary files differ) Index: trunk/puzzler/docs/images/ominoes/pentominoes-holey-spinner.png =================================================================== --- trunk/puzzler/docs/images/ominoes/pentominoes-holey-spinner.png 2016-12-01 14:53:21 UTC (rev 639) +++ trunk/puzzler/docs/images/ominoes/pentominoes-holey-spinner.png 2016-12-05 04:39:18 UTC (rev 640) Property changes on: trunk/puzzler/docs/images/ominoes/pentominoes-holey-spinner.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/puzzler/docs/images/ominoes/pentominoes-holey-spinner.svg =================================================================== (Binary files differ) Index: trunk/puzzler/docs/images/ominoes/pentominoes-holey-spinner.svg =================================================================== --- trunk/puzzler/docs/images/ominoes/pentominoes-holey-spinner.svg 2016-12-01 14:53:21 UTC (rev 639) +++ trunk/puzzler/docs/images/ominoes/pentominoes-holey-spinner.svg 2016-12-05 04:39:18 UTC (rev 640) Property changes on: trunk/puzzler/docs/images/ominoes/pentominoes-holey-spinner.svg ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/svg+xml \ No newline at end of property Modified: trunk/puzzler/docs/pentominoes.txt =================================================================== --- trunk/puzzler/docs/pentominoes.txt 2016-12-01 14:53:21 UTC (rev 639) +++ trunk/puzzler/docs/pentominoes.txt 2016-12-05 04:39:18 UTC (rev 640) @@ -8,7 +8,7 @@ :Date: $Date$ :Revision: $Revision$ :Web site: http://puzzler.sourceforge.net/ -:Copyright: |c| 1998-2015 by David J. Goodger +:Copyright: |c| 1998-2016 by David J. Goodger :License: `GPL 2 <../COPYING.html>`__ .. image:: images/puzzler.png @@ -286,7 +286,12 @@ .. image:: images/ominoes/pentominoes-spinner-1.png +* Holey spinner (design from John Greening): `3 solutions + <../solutions/ominoes/ominoes/pentominoes-holey-spinner.txt>`__ + .. image:: images/ominoes/pentominoes-holey-spinner.png + + Pentominoes Plus the Square Tetromino ===================================== Modified: trunk/puzzler/docs/solid-pentominoes.txt =================================================================== --- trunk/puzzler/docs/solid-pentominoes.txt 2016-12-01 14:53:21 UTC (rev 639) +++ trunk/puzzler/docs/solid-pentominoes.txt 2016-12-05 04:39:18 UTC (rev 640) @@ -343,6 +343,20 @@ (`X3D model <images/cubes/solid-pentominoes-square-tower-4.x3d>`__) + * - .. figure:: images/cubes/solid-pentominoes-square-tower-5.png + + `106 solutions + <../solutions/ominoes/cubes/solid-pentominoes-square-tower-5.txt>`__ + (`X3D model + <images/cubes/solid-pentominoes-square-tower-5.x3d>`__) + + - .. figure:: images/cubes/solid-pentominoes-square-tower-6.png + + `154 solutions + <../solutions/ominoes/cubes/solid-pentominoes-square-tower-6.txt>`__ + (`X3D model + <images/cubes/solid-pentominoes-square-tower-6.x3d>`__) + * Stairstep walls: .. list-table:: Modified: trunk/puzzler/puzzler/puzzles/hexiamonds.py =================================================================== --- trunk/puzzler/puzzler/puzzles/hexiamonds.py 2016-12-01 14:53:21 UTC (rev 639) +++ trunk/puzzler/puzzler/puzzles/hexiamonds.py 2016-12-05 04:39:18 UTC (rev 640) @@ -2,7 +2,7 @@ # $Id$ # Author: David Goodger <go...@py...> -# Copyright: (C) 1998-2015 by David J. Goodger +# Copyright: (C) 1998-2016 by David J. Goodger # License: GPL 2 (see __init__.py) """ @@ -1267,6 +1267,56 @@ self.piece_data['P6'][-1]['rotations'] = (0, 1) +class HexiamondsSpinner5(Hexiamonds): + + """ + 1 solution + + Design from `Kadon's Iamond Hex`_ booklet. + """ + + height = 8 + width = 8 + + holes = set(((0,2,0),(2,3,0),(2,6,0),(3,2,0),(3,3,0),(6,0,0))) + + def coordinates(self): + return sorted( + set(self.coordinates_semiregular_hexagon(7, 1)) + - self.holes) + + def customize_piece_data(self): + self.piece_data['I6'][-1]['rotations'] = None + + +class HexiamondsSpinner6(Hexiamonds): + + """ + 1 solution + + Design from `Kadon's Iamond Hex`_ booklet. + """ + + height = 8 + width = 8 + + holes = set(((0,2,0),(2,3,0),(2,6,0),(3,2,0),(3,3,0),(6,0,0))) + + def coordinates(self): + holes = set + coords = (set(self.coordinates_semiregular_hexagon(5, 3)) + - set(((2,3,1),)) + - set(self.coordinates_parallelogram(1, 2, offset=(3,3,0))) + - set(self.coordinates_diamond(1, offset=(4,2,0)))) + for offset in ((-3,5,0), (3,-3,0), (5,3,0)): + coords.difference_update( + set(self.coordinates_hexagon(2, offset=offset))) + return sorted(coords) + + def customize_piece_data(self): + self.piece_data['I6'][-1]['rotations'] = None + + class HexiamondsSpinner_x1(Hexiamonds): """0 solutions""" @@ -1793,6 +1843,65 @@ self.piece_data['P6'][-1]['rotations'] = (0, 1) +class HexiamondsNotchedHexagon1(Hexiamonds): + + """ + 1 solution + + Design from `Kadon's Iamond Hex`_ booklet. + """ + + height = 8 + width = 8 + + holes = (set(Hexiamonds.coordinates_hexagon(1, offset=(3,3,0))) + .union(set(((1,5,1), (2,3,0), (3,6,0), + (4,1,1), (5,4,1), (6,2,0))))) + + def coordinates(self): + coords = (set( + list(self.coordinates_semiregular_hexagon(5, 2, offset=(1,1,0))) + + list(self.coordinates_semiregular_hexagon(2, 5))) + - self.holes) + return sorted(coords) + + def customize_piece_data(self): + self.piece_data['P6'][-1]['rotations'] = None + + +class HexiamondsNotchedHexagon_x2(HexiamondsNotchedHexagon1): + + """0 solutions""" + + holes = set(Hexiamonds.coordinates_hexagram(1, offset=(2,2,0))) + + def customize_piece_data(self): + self.piece_data['P6'][-1]['rotations'] = None + self.piece_data['P6'][-1]['flips'] = None + + +class HexiamondsTriLevel(Hexiamonds): + + """ + 1 solution + + Design via John Greening. + """ + + height = 6 + width = 10 + + def coordinates(self): + coords = set() + for offset in ((0,0,0), (2,2,0), (4,4,0)): + coords.update( + set(self.coordinates_parallelogram(6, 2, offset=offset))) + return sorted(coords) + + def customize_piece_data(self): + self.piece_data['P6'][-1]['rotations'] = (0,1,2) + + class OneSidedHexiamondsOBeirnesHexagon(OneSidedHexiamonds): """ Modified: trunk/puzzler/puzzler/puzzles/pentominoes.py =================================================================== --- trunk/puzzler/puzzler/puzzles/pentominoes.py 2016-12-01 14:53:21 UTC (rev 639) +++ trunk/puzzler/puzzler/puzzles/pentominoes.py 2016-12-05 04:39:18 UTC (rev 640) @@ -2,7 +2,7 @@ # $Id$ # Author: David Goodger <go...@py...> -# Copyright: (C) 1998-2015 by David J. Goodger +# Copyright: (C) 1998-2016 by David J. Goodger # License: GPL 2 (see __init__.py) """ @@ -1312,6 +1312,32 @@ self.piece_data['P'][-1]['rotations'] = None +class PentominoesHoleySpinner(Pentominoes): + + """ + 3 solutions + + Design from John Greening. + """ + + height = 9 + width = 9 + + holes = set(((1,2), (2,4), (2,7), (4,2), (4,4), (4,6), (6,1), (6,4), (7,6))) + + def coordinates(self): + coords = (set( + list(self.coordinates_rectangle(8, 5, offset=(0,1))) + + list(self.coordinates_rectangle(5, 3, offset=(1,6))) + + list(self.coordinates_rectangle(5, 1, offset=(3,0))) + + list(self.coordinates_rectangle(3, 5, offset=(6,3)))) + - self.holes) + return sorted(coords) + + def customize_piece_data(self): + self.piece_data['P'][-1]['rotations'] = None + + class OneSidedPentominoes3x30(OneSidedPentominoes): """46 solutions""" Modified: trunk/puzzler/puzzler/puzzles/solid_pentominoes.py =================================================================== --- trunk/puzzler/puzzler/puzzles/solid_pentominoes.py 2016-12-01 14:53:21 UTC (rev 639) +++ trunk/puzzler/puzzler/puzzles/solid_pentominoes.py 2016-12-05 04:39:18 UTC (rev 640) @@ -2,7 +2,7 @@ # $Id$ # Author: David Goodger <go...@py...> -# Copyright: (C) 1998-2015 by David J. Goodger +# Copyright: (C) 1998-2016 by David J. Goodger # License: GPL 2 (see __init__.py) """ @@ -1230,10 +1230,12 @@ duplicate_conditions = ({'x_reversed': True},) + _square_offset = (1,1,0) _offsets = ((0,2), (2,0), (2,4), (4,2)) def coordinates(self): - coords = set(self.coordinates_ring_wall(3, 3, 5, offset=(1,1,0))) + coords = set( + self.coordinates_ring_wall(3, 3, 5, offset=self._square_offset)) for (x, y) in self._offsets: coords.update(set(self.coordinates_cuboid(1, 1, 5, offset=(x,y,0)))) return sorted(coords) @@ -1257,28 +1259,51 @@ check_for_duplicates = False -class SolidPentominoesSquareTower3(SolidPentominoesSquareTower1): +class SolidPentominoesSquareTower3(SolidPentominoesSquareTower2): """27 solutions""" _offsets = ((0,3), (1,0), (3,4), (4,1)) - check_for_duplicates = False +class SolidPentominoesSquareTower4(SolidPentominoesSquareTower2): -class SolidPentominoesSquareTower4(SolidPentominoesSquareTower1): - """8 solutions""" _offsets = ((0,3), (0,4), (4,0), (4,1)) - check_for_duplicates = False + def customize_piece_data(self): + self.piece_data['P'][-1]['flips'] = None + self.piece_data['P'][-1]['rotations'] = (0, 1) + +class SolidPentominoesSquareTower5(SolidPentominoesSquareTower2): + + """106 solutions""" + + width = 3 + height = 7 + + _square_offset = (0,2,0) + _offsets = ((0,5), (0,6), (2,0), (2,1)) + def customize_piece_data(self): self.piece_data['P'][-1]['flips'] = None self.piece_data['P'][-1]['rotations'] = (0, 1) +class SolidPentominoesSquareTower6(SolidPentominoesSquareTower2): + + """154 solutions""" + + _square_offset = (0,0,0) + _offsets = ((0,3), (0,4), (3,0), (4,0)) + + def customize_piece_data(self): + self.piece_data['P'][-1]['axes'] = (0,) + self.piece_data['P'][-1]['flips'] = None + + class SolidPentominoesStairstepWalls1(SolidPentominoes): """34 solutions""" Added: trunk/solutions/cubes/solid-pentominoes-square-tower-5.txt =================================================================== --- trunk/solutions/cubes/solid-pentominoes-square-tower-5.txt (rev 0) +++ trunk/solutions/cubes/solid-pentominoes-square-tower-5.txt 2016-12-05 04:39:18 UTC (rev 640) @@ -0,0 +1,247 @@ +solving SolidPentominoesSquareTower5: + +solution 1: +2,0,0 2,0,1 2,0,2 2,0,3 2,0,4 I +0,2,1 0,3,0 0,3,1 0,3,2 0,4,1 X +0,2,0 0,2,2 1,2,0 1,2,1 1,2,2 U +0,2,4 1,2,3 1,2,4 2,2,2 2,2,3 W +2,1,0 2,1,1 2,1,2 2,1,3 2,2,0 L +2,1,4 2,2,4 2,3,2 2,3,3 2,3,4 V +2,2,1 2,3,0 2,3,1 2,4,1 2,4,2 F +0,4,0 1,4,0 1,4,1 1,4,2 2,4,0 T +0,4,3 1,4,3 1,4,4 2,4,3 2,4,4 P +0,2,3 0,3,3 0,3,4 0,4,4 0,5,4 N +0,4,2 0,5,0 0,5,1 0,5,2 0,6,0 Z +0,5,3 0,6,1 0,6,2 0,6,3 0,6,4 Y + +Z Y Y Y Y +Z Z Z Y N +T T T X T F Z T F P P P N P P +X F X F X V N V N V +U U L X U F U U W N W W W W V + L L L L V + I I I I I + +solution 2: +2,0,0 2,0,1 2,0,2 2,0,3 2,0,4 I +0,2,1 0,3,0 0,3,1 0,3,2 0,4,1 X +0,2,0 0,2,2 1,2,0 1,2,1 1,2,2 U +0,2,4 1,2,3 1,2,4 2,2,2 2,2,3 W +2,1,0 2,1,1 2,1,2 2,1,3 2,2,0 L +2,1,4 2,2,4 2,3,2 2,3,3 2,3,4 V +2,2,1 2,3,0 2,3,1 2,4,1 2,4,2 F +0,4,2 1,4,0 1,4,1 1,4,2 2,4,0 Z +0,4,0 0,5,0 0,5,1 0,5,2 0,6,0 T +0,4,3 1,4,3 1,4,4 2,4,3 2,4,4 P +0,2,3 0,3,3 0,3,4 0,4,4 0,5,4 N +0,5,3 0,6,1 0,6,2 0,6,3 0,6,4 Y + +T Y Y Y Y +T T T Y N +T Z Z X Z F Z Z F P P P N P P +X F X F X V N V N V +U U L X U F U U W N W W W W V + L L L L V + I I I I I + +solution 3: +2,0,0 2,0,1 2,0,2 2,0,3 2,0,4 I +0,2,1 0,3,0 0,3,1 0,3,2 0,4,1 X +0,2,0 0,2,2 1,2,0 1,2,1 1,2,2 U +1,2,4 2,1,4 2,2,4 2,3,4 2,4,4 Y +0,2,3 1,2,3 2,1,3 2,2,3 2,3,3 T +0,2,4 0,3,3 0,3,4 0,4,3 0,5,3 N +0,4,4 0,5,4 0,6,2 0,6,3 0,6,4 V +1,4,1 1,4,2 1,4,3 1,4,4 2,4,1 L +0,4,0 0,5,0 1,4,0 2,3,0 2,4,0 Z +0,4,2 0,5,1 0,5,2 0,6,0 0,6,1 W +2,2,2 2,3,1 2,3,2 2,4,2 2,4,3 F +2,1,0 2,1,1 2,1,2 2,2,0 2,2,1 P + +W W V V V +Z W W N V +Z Z Z X L L W L F N L F V L Y +X Z X F X F N T N Y +U U P X U P U U F T T T N Y Y + P P P T Y + I I I I I + +solution 4: +2,0,0 2,0,1 2,0,2 2,0,3 2,0,4 I +0,2,1 0,3,0 0,3,1 0,3,2 0,4,1 X +0,2,0 0,2,2 1,2,0 1,2,1 1,2,2 U +1,2,4 2,1,4 2,2,4 2,3,4 2,4,4 Y +0,2,3 1,2,3 2,1,3 2,2,3 2,3,3 T +0,2,4 0,3,3 0,3,4 0,4,2 0,4,3 W +0,4,4 0,5,4 0,6,2 0,6,3 0,6,4 V +0,5,1 0,5,2 0,5,3 0,6,0 0,6,1 N +0,4,0 0,5,0 1,4,0 2,3,0 2,4,0 Z +1,4,1 1,4,2 1,4,3 1,4,4 2,4,1 L +2,2,2 2,3,1 2,3,2 2,4,2 2,4,3 F +2,1,0 2,1,1 2,1,2 2,2,0 2,2,1 P + +N N V V V +Z N N N V +Z Z Z X L L W L F W L F V L Y +X Z X F X F W T W Y +U U P X U P U U F T T T W Y Y + P P P T Y + I I I I I + +solution 5: +2,0,0 2,0,1 2,0,2 2,0,3 2,0,4 I +0,2,1 0,3,0 0,3,1 0,3,2 0,4,1 X +0,2,0 1,2,0 1,2,1 2,2,1 2,2,2 W +2,1,0 2,1,1 2,1,2 2,2,0 2,3,0 V +0,2,2 0,2,4 1,2,2 1,2,3 1,2,4 U +2,1,3 2,1,4 2,2,4 2,3,4 2,4,4 L +2,2,3 2,3,1 2,3,2 2,3,3 2,4,3 T +0,4,0 1,4,0 1,4,1 2,4,0 2,4,1 P +0,4,3 1,4,2 1,4,3 1,4,4 2,4,2 F +0,2,3 0,3,3 0,3,4 0,4,4 0,5,4 N +0,4,2 0,5,0 0,5,1 0,5,2 0,6,0 Z +0,5,3 0,6,1 0,6,2 0,6,3 0,6,4 Y + +Z Y Y Y Y +Z Z Z Y N +P P P X P P Z F F F F T N F L +X V X T X T N T N L +W W V X W W U U W N U T U U L + V V V L L + I I I I I + +solution 6: +2,0,0 2,0,1 2,0,2 2,0,3 2,0,4 I +0,2,1 0,3,0 0,3,1 0,3,2 0,4,1 X +0,2,0 1,2,0 1,2,1 1,2,2 2,2,2 Z +0,2,2 0,2,3 1,2,3 1,2,4 2,2,4 W +2,1,1 2,1,2 2,1,3 2,1,4 2,2,1 L +2,1,0 2,2,0 2,3,0 2,3,1 2,4,1 N +1,4,0 1,4,1 1,4,2 2,4,0 2,4,2 U +2,2,3 2,3,2 2,3,3 2,3,4 2,4,4 F +0,2,4 0,3,4 0,4,4 0,5,4 1,4,4 Y +0,3,3 0,4,3 0,5,3 1,4,3 2,4,3 T +0,4,2 0,5,2 0,6,2 0,6,3 0,6,4 V +0,4,0 0,5,0 0,5,1 0,6,0 0,6,1 P + +P P V V V +P P V T Y +P U U X U N V U U T T T Y Y F +X N X N X F T F Y F +Z Z N X Z L W Z Z W W F Y W W + N L L L L + I I I I I + +solution 7: +2,0,0 2,0,1 2,0,2 2,0,3 2,0,4 I +2,2,1 2,3,0 2,3,1 2,3,2 2,4,1 X +2,1,0 2,1,1 2,1,2 2,1,3 2,2,3 L +2,1,4 2,2,4 2,3,3 2,3,4 2,4,3 N +0,2,1 0,2,2 1,2,0 1,2,1 2,2,0 W +0,2,4 1,2,2 1,2,3 1,2,4 2,2,2 Z +0,3,4 0,4,4 0,5,4 1,4,4 2,4,4 T +0,4,2 0,5,2 0,6,2 0,6,3 0,6,4 V +0,2,3 0,3,3 0,4,3 0,5,3 1,4,3 Y +0,2,0 0,3,0 0,3,1 0,3,2 0,4,1 F +0,4,0 0,5,0 0,5,1 0,6,0 0,6,1 P +1,4,0 1,4,1 1,4,2 2,4,0 2,4,2 U + +P P V V V +P P V Y T +P U U F U X V U U Y Y N T T T +F X F X F X Y N T N +F W W W W X W Z Z Y Z L Z Z N + L L L L N + I I I I I + +solution 8: +2,0,0 2,0,1 2,0,2 2,0,3 2,0,4 I +2,2,1 2,3,0 2,3,1 2,3,2 2,4,1 X +0,2,0 0,3,0 1,2,0 2,1,0 2,2,0 Z +2,1,1 2,1,2 2,1,3 2,2,3 2,3,3 V +1,2,4 2,1,4 2,2,4 2,3,4 2,4,4 Y +0,4,0 1,4,0 1,4,1 1,4,2 2,4,0 T +0,4,4 1,4,3 1,4,4 2,4,2 2,4,3 W +0,2,1 1,2,1 1,2,2 1,2,3 2,2,2 F +0,2,2 0,2,3 0,2,4 0,3,2 0,3,4 U +0,3,3 0,4,3 0,5,3 0,5,4 0,6,4 N +0,3,1 0,4,1 0,4,2 0,5,1 0,5,2 P +0,5,0 0,6,0 0,6,1 0,6,2 0,6,3 L + +L L L L N +L P P N N +T T T P T X P T W N W W W W Y +Z X P X U X N V U Y +Z Z Z F F X U F F U F V U Y Y + Z V V V Y + I I I I I + +solution 9: +2,0,0 2,0,1 2,0,2 2,0,3 2,0,4 I +2,2,2 2,3,1 2,3,2 2,3,3 2,4,2 X +2,1,1 2,1,2 2,1,3 2,1,4 2,2,1 L +0,2,0 1,2,0 2,1,0 2,2,0 2,3,0 T +0,2,4 1,2,4 2,2,4 2,3,4 2,4,4 V +0,2,1 1,2,1 1,2,2 1,2,3 2,2,3 Z +0,4,4 1,4,2 1,4,3 1,4,4 2,4,3 F +0,4,0 1,4,0 1,4,1 2,4,0 2,4,1 P +0,2,2 0,2,3 0,3,0 0,3,1 0,3,2 N +0,3,3 0,3,4 0,4,3 0,5,3 0,5,4 U +0,4,1 0,4,2 0,5,0 0,5,1 0,6,0 W +0,5,2 0,6,1 0,6,2 0,6,3 0,6,4 Y + +W Y Y Y Y +W W Y U U +P P P W P P W F X U F F F F V +N T N X N X U X U V +T T T Z Z L N Z X N Z Z V V V + T L L L L + I I I I I + +solution 10: +2,0,0 2,0,1 2,0,2 2,0,3 2,0,4 I +2,2,2 2,3,1 2,3,2 2,3,3 2,4,2 X +0,2,4 1,2,4 2,1,4 2,2,4 2,3,4 T +2,1,0 2,1,1 2,1,2 2,1,3 2,2,1 Y +0,2,1 1,2,1 1,2,2 1,2,3 2,2,3 Z +0,2,0 1,2,0 2,2,0 2,3,0 2,4,0 V +0,4,2 1,4,0 1,4,1 1,4,2 2,4,1 F +0,4,3 1,4,3 1,4,4 2,4,3 2,4,4 P +0,2,2 0,2,3 0,3,1 0,3,2 0,4,1 W +0,3,0 0,4,0 0,5,0 0,6,0 0,6,1 L +0,3,3 0,3,4 0,4,4 0,5,3 0,5,4 U +0,5,1 0,5,2 0,6,2 0,6,3 0,6,4 N + +L L N ... [truncated message content] |