[Puzzler-checkins] SF.net SVN: puzzler:[639] trunk
Brought to you by:
goodger
From: <go...@us...> - 2016-12-01 14:53:24
|
Revision: 639 http://sourceforge.net/p/puzzler/code/639 Author: goodger Date: 2016-12-01 14:53:21 +0000 (Thu, 01 Dec 2016) Log Message: ----------- added puzzles Modified Paths: -------------- trunk/puzzler/docs/hexiamonds.txt trunk/puzzler/docs/solid-pentominoes.txt trunk/puzzler/puzzler/puzzles/hexiamonds.py trunk/puzzler/puzzler/puzzles/solid_pentominoes.py Added Paths: ----------- trunk/puzzler/bin/cubes/solid-pentominoes-stairstep-walls-1.py trunk/puzzler/bin/cubes/solid-pentominoes-stairstep-walls-2.py trunk/puzzler/bin/iamonds/hexiamonds-infinity-2.py trunk/puzzler/bin/iamonds/hexiamonds-near-hexagram-1.py trunk/puzzler/bin/iamonds/hexiamonds-spinner-4.py trunk/puzzler/bin/iamonds/hexiamonds-trefoil-3.py trunk/puzzler/docs/images/cubes/solid-pentominoes-stairstep-walls-1.png trunk/puzzler/docs/images/cubes/solid-pentominoes-stairstep-walls-1.svg trunk/puzzler/docs/images/cubes/solid-pentominoes-stairstep-walls-1.x3d trunk/puzzler/docs/images/cubes/solid-pentominoes-stairstep-walls-2.png trunk/puzzler/docs/images/cubes/solid-pentominoes-stairstep-walls-2.svg trunk/puzzler/docs/images/cubes/solid-pentominoes-stairstep-walls-2.x3d trunk/puzzler/docs/images/iamonds/hexiamonds-infinity-2.png trunk/puzzler/docs/images/iamonds/hexiamonds-infinity-2.svg trunk/puzzler/docs/images/iamonds/hexiamonds-near-hexagram-1.png trunk/puzzler/docs/images/iamonds/hexiamonds-near-hexagram-1.svg trunk/puzzler/docs/images/iamonds/hexiamonds-spinner-4.png trunk/puzzler/docs/images/iamonds/hexiamonds-spinner-4.svg trunk/puzzler/docs/images/iamonds/hexiamonds-trefoil-3.png trunk/puzzler/docs/images/iamonds/hexiamonds-trefoil-3.svg trunk/solutions/cubes/solid-pentominoes-stairstep-walls-1.txt trunk/solutions/cubes/solid-pentominoes-stairstep-walls-2.txt trunk/solutions/iamonds/hexiamonds-infinity-2.txt trunk/solutions/iamonds/hexiamonds-near-hexagram-1.txt trunk/solutions/iamonds/hexiamonds-spinner-4.txt trunk/solutions/iamonds/hexiamonds-trefoil-3.txt Added: trunk/puzzler/bin/cubes/solid-pentominoes-stairstep-walls-1.py =================================================================== --- trunk/puzzler/bin/cubes/solid-pentominoes-stairstep-walls-1.py (rev 0) +++ trunk/puzzler/bin/cubes/solid-pentominoes-stairstep-walls-1.py 2016-12-01 14:53:21 UTC (rev 639) @@ -0,0 +1,10 @@ +#!/usr/bin/env python +# $Id$ + +""" solutions""" + +import puzzler +from puzzler.puzzles.solid_pentominoes import SolidPentominoesStairstepWalls1 \ + as puzzle + +puzzler.run(puzzle) Property changes on: trunk/puzzler/bin/cubes/solid-pentominoes-stairstep-walls-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/cubes/solid-pentominoes-stairstep-walls-2.py =================================================================== --- trunk/puzzler/bin/cubes/solid-pentominoes-stairstep-walls-2.py (rev 0) +++ trunk/puzzler/bin/cubes/solid-pentominoes-stairstep-walls-2.py 2016-12-01 14:53:21 UTC (rev 639) @@ -0,0 +1,10 @@ +#!/usr/bin/env python +# $Id$ + +""" solutions""" + +import puzzler +from puzzler.puzzles.solid_pentominoes import SolidPentominoesStairstepWalls2 \ + as puzzle + +puzzler.run(puzzle) Property changes on: trunk/puzzler/bin/cubes/solid-pentominoes-stairstep-walls-2.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-infinity-2.py =================================================================== --- trunk/puzzler/bin/iamonds/hexiamonds-infinity-2.py (rev 0) +++ trunk/puzzler/bin/iamonds/hexiamonds-infinity-2.py 2016-12-01 14:53:21 UTC (rev 639) @@ -0,0 +1,9 @@ +#!/usr/bin/env python +# $Id$ + +"""2 solutions""" + +import puzzler +from puzzler.puzzles.hexiamonds import HexiamondsInfinity2 as puzzle + +puzzler.run(puzzle) Property changes on: trunk/puzzler/bin/iamonds/hexiamonds-infinity-2.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-near-hexagram-1.py =================================================================== --- trunk/puzzler/bin/iamonds/hexiamonds-near-hexagram-1.py (rev 0) +++ trunk/puzzler/bin/iamonds/hexiamonds-near-hexagram-1.py 2016-12-01 14:53:21 UTC (rev 639) @@ -0,0 +1,9 @@ +#!/usr/bin/env python +# $Id$ + +"""2 solutions""" + +import puzzler +from puzzler.puzzles.hexiamonds import HexiamondsNearHexagram1 as puzzle + +puzzler.run(puzzle) Property changes on: trunk/puzzler/bin/iamonds/hexiamonds-near-hexagram-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-4.py =================================================================== --- trunk/puzzler/bin/iamonds/hexiamonds-spinner-4.py (rev 0) +++ trunk/puzzler/bin/iamonds/hexiamonds-spinner-4.py 2016-12-01 14:53:21 UTC (rev 639) @@ -0,0 +1,9 @@ +#!/usr/bin/env python +# $Id$ + +"""79 solutions""" + +import puzzler +from puzzler.puzzles.hexiamonds import HexiamondsSpinner4 as puzzle + +puzzler.run(puzzle) Property changes on: trunk/puzzler/bin/iamonds/hexiamonds-spinner-4.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-trefoil-3.py =================================================================== --- trunk/puzzler/bin/iamonds/hexiamonds-trefoil-3.py (rev 0) +++ trunk/puzzler/bin/iamonds/hexiamonds-trefoil-3.py 2016-12-01 14:53:21 UTC (rev 639) @@ -0,0 +1,9 @@ +#!/usr/bin/env python +# $Id$ + +"""2 solutions""" + +import puzzler +from puzzler.puzzles.hexiamonds import HexiamondsTrefoil3 as puzzle + +puzzler.run(puzzle) Property changes on: trunk/puzzler/bin/iamonds/hexiamonds-trefoil-3.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-11-30 23:28:41 UTC (rev 638) +++ trunk/puzzler/docs/hexiamonds.txt 2016-12-01 14:53:21 UTC (rev 639) @@ -368,8 +368,12 @@ Bumpy trefoil (design by `Oktavian Scharek`_): `15 solutions <../solutions/iamonds/hexiamonds-bumpy-trefoil.txt>`__ - - + - .. figure:: images/iamonds/hexiamonds-trefoil-3.png + `2 solutions + <../solutions/iamonds/hexiamonds-trefoil-3.txt>`__ (design + from `Kadon's "Iamond Hex"`_ booklet) + * Tenyo's puzzle: `4968 solutions <../solutions/iamonds/hexiamonds-tenyo.txt>`__ @@ -414,8 +418,13 @@ <../solutions/iamonds/hexiamonds-spinner-3.txt>`__ (design from `Thimo Rosenkranz's pentoma.de`_) - - + - .. figure:: images/iamonds/hexiamonds-spinner-4.png + `4 solutions + <../solutions/iamonds/hexiamonds-spinner-4.txt>`__ (design + from `Kadon's "Iamond Hex"`_ booklet) + + * Deltas: .. list-table:: @@ -439,18 +448,35 @@ - -* Infinity (design by `Oktavian Scharek`_): `15 solutions - <../solutions/iamonds/hexiamonds-infinity.txt>`__ +* Infinities: - .. image:: images/iamonds/hexiamonds-infinity.png + .. list-table:: + :class: borderless + * - .. figure:: images/iamonds/hexiamonds-infinity.png + + `15 solutions + <../solutions/iamonds/hexiamonds-infinity.txt>`__ (design + by `Oktavian Scharek`_) + + - .. figure:: images/iamonds/hexiamonds-infinity-2.png + + `33 solutions + <../solutions/iamonds/hexiamonds-infinity-2.txt>`__ + (design from `Kadon's "Iamond Hex"`_ booklet) + * Knobby bone (design from `Thimo Rosenkranz's pentoma.de <http://www.pentoma.de>`_): `1 solution <../solutions/iamonds/hexiamonds-knobby-bone.txt>`__ .. image:: images/iamonds/hexiamonds-knobby-bone.png +* Near-hexagram (design from `Kadon's "Iamond Hex"`_ booklet): `2 + solutions <../solutions/iamonds/hexiamonds-near-hexagram-1.txt>`__ + .. image:: images/iamonds/hexiamonds-near-hexagram-1.png + + One-Sided Hexiamonds ==================== Added: trunk/puzzler/docs/images/cubes/solid-pentominoes-stairstep-walls-1.png =================================================================== (Binary files differ) Index: trunk/puzzler/docs/images/cubes/solid-pentominoes-stairstep-walls-1.png =================================================================== --- trunk/puzzler/docs/images/cubes/solid-pentominoes-stairstep-walls-1.png 2016-11-30 23:28:41 UTC (rev 638) +++ trunk/puzzler/docs/images/cubes/solid-pentominoes-stairstep-walls-1.png 2016-12-01 14:53:21 UTC (rev 639) Property changes on: trunk/puzzler/docs/images/cubes/solid-pentominoes-stairstep-walls-1.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/puzzler/docs/images/cubes/solid-pentominoes-stairstep-walls-1.svg =================================================================== (Binary files differ) Index: trunk/puzzler/docs/images/cubes/solid-pentominoes-stairstep-walls-1.svg =================================================================== --- trunk/puzzler/docs/images/cubes/solid-pentominoes-stairstep-walls-1.svg 2016-11-30 23:28:41 UTC (rev 638) +++ trunk/puzzler/docs/images/cubes/solid-pentominoes-stairstep-walls-1.svg 2016-12-01 14:53:21 UTC (rev 639) Property changes on: trunk/puzzler/docs/images/cubes/solid-pentominoes-stairstep-walls-1.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-stairstep-walls-1.x3d =================================================================== --- trunk/puzzler/docs/images/cubes/solid-pentominoes-stairstep-walls-1.x3d (rev 0) +++ trunk/puzzler/docs/images/cubes/solid-pentominoes-stairstep-walls-1.x3d 2016-12-01 14:53:21 UTC (rev 639) @@ -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 1.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="1 0 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 1.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="2 0 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 1.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="3 0 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 1.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="4 0 0"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.843 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="5 0 0"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.000 1.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="6 0 0"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.000 1.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="7 0 0"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.000 1.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 1 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 1.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="1 1 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.541 0.169 0.886"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="2 1 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.541 0.169 0.886"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="3 1 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.541 0.169 0.886"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="4 1 0"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.843 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="5 1 0"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.000 1.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="6 1 0"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.000 1.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 2 0"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.549 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="1 2 0"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.549 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="2 2 0"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.549 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="3 2 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.541 0.169 0.886"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="4 2 0"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.843 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="5 2 0"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.843 0.000"/> + </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="1.000 0.549 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="2 3 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.502 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="3 3 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.541 0.169 0.886"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="4 3 0"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.843 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 4 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.251 0.878 0.816"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="1 4 0"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.549 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="2 4 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.502 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="3 4 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.502 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 5 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.251 0.878 0.816"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="1 5 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.502 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="2 5 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.502 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 0 1"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.000 0.502"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 1 1"> + <Shape> + <Appearance> + <Material diffuseColor="0.867 0.627 0.867"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 2 1"> + <Shape> + <Appearance> + <Material diffuseColor="0.867 0.627 0.867"/> + </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="0 4 1"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 5 1"> + <Shape> + <Appearance> + <Material diffuseColor="0.251 0.878 0.816"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 0 2"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.000 0.502"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 1 2"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.000 0.502"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 2 2"> + <Shape> + <Appearance> + <Material diffuseColor="0.867 0.627 0.867"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 3 2"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 4 2"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 5 2"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 0 3"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.000 1.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 1 3"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.000 0.502"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 2 3"> + <Shape> + <Appearance> + <Material diffuseColor="0.867 0.627 0.867"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 3 3"> + <Shape> + <Appearance> + <Material diffuseColor="0.867 0.627 0.867"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 4 3"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.000 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 0.502"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 2 4"> + <Shape> + <Appearance> + <Material diffuseColor="0.502 0.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 3 4"> + <Shape> + <Appearance> + <Material diffuseColor="0.502 0.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 0 5"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.000 1.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 1 5"> + <Shape> + <Appearance> + <Material diffuseColor="0.502 0.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 2 5"> + <Shape> + <Appearance> + <Material diffuseColor="0.502 0.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 0 6"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.000 1.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 1 6"> + <Shape> + <Appearance> + <Material diffuseColor="0.502 0.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 0 7"> + <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/cubes/solid-pentominoes-stairstep-walls-2.png =================================================================== (Binary files differ) Index: trunk/puzzler/docs/images/cubes/solid-pentominoes-stairstep-walls-2.png =================================================================== --- trunk/puzzler/docs/images/cubes/solid-pentominoes-stairstep-walls-2.png 2016-11-30 23:28:41 UTC (rev 638) +++ trunk/puzzler/docs/images/cubes/solid-pentominoes-stairstep-walls-2.png 2016-12-01 14:53:21 UTC (rev 639) Property changes on: trunk/puzzler/docs/images/cubes/solid-pentominoes-stairstep-walls-2.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/puzzler/docs/images/cubes/solid-pentominoes-stairstep-walls-2.svg =================================================================== (Binary files differ) Index: trunk/puzzler/docs/images/cubes/solid-pentominoes-stairstep-walls-2.svg =================================================================== --- trunk/puzzler/docs/images/cubes/solid-pentominoes-stairstep-walls-2.svg 2016-11-30 23:28:41 UTC (rev 638) +++ trunk/puzzler/docs/images/cubes/solid-pentominoes-stairstep-walls-2.svg 2016-12-01 14:53:21 UTC (rev 639) Property changes on: trunk/puzzler/docs/images/cubes/solid-pentominoes-stairstep-walls-2.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-stairstep-walls-2.x3d =================================================================== --- trunk/puzzler/docs/images/cubes/solid-pentominoes-stairstep-walls-2.x3d (rev 0) +++ trunk/puzzler/docs/images/cubes/solid-pentominoes-stairstep-walls-2.x3d 2016-12-01 14:53:21 UTC (rev 639) @@ -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.541 0.169 0.886"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="3 0 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.000 1.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="4 0 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.000 1.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="5 0 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.000 1.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="6 0 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.000 1.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="7 0 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.000 1.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 1 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.541 0.169 0.886"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="1 1 0"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.549 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="2 1 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.867 0.627 0.867"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="3 1 0"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.843 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="4 1 0"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.843 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="5 1 0"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.843 0.000"/> + </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="0 2 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.541 0.169 0.886"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="1 2 0"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.549 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="2 2 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.867 0.627 0.867"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="3 2 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.867 0.627 0.867"/> + </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="1.000 0.843 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 3 0"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.549 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="1 3 0"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.549 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="2 3 0"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.549 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="3 3 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 1.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="4 3 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.867 0.627 0.867"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 4 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 1.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="1 4 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 1.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="2 4 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 1.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="3 4 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 1.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 5 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.502 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="1 5 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.502 0.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="2 5 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.502 0.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 6 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.502 0.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="1 6 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.502 0.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 7 0"> + <Shape> + <Appearance> + <Material diffuseColor="0.502 0.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 1 1"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.000 0.502"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 2 1"> + <Shape> + <Appearance> + <Material diffuseColor="0.541 0.169 0.886"/> + </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="0 4 1"> + <Shape> + <Appearance> + <Material diffuseColor="0.251 0.878 0.816"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 5 1"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.502 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 6 1"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.502 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 1 2"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.000 0.502"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 2 2"> + <Shape> + <Appearance> + <Material diffuseColor="0.541 0.169 0.886"/> + </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="0 4 2"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.502 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 5 2"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.502 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 0 3"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.000 0.502"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 1 3"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.000 0.502"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 2 3"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 3 3"> + <Shape> + <Appearance> + <Material diffuseColor="0.251 0.878 0.816"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 4 3"> + <Shape> + <Appearance> + <Material diffuseColor="0.251 0.878 0.816"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 0 4"> + <Shape> + <Appearance> + <Material diffuseColor="0.000 0.000 0.502"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 1 4"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 2 4"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 3 4"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 0 5"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.000 1.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 1 5"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.000 1.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 2 5"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.000 0.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 0 6"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.000 1.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 1 6"> + <Shape> + <Appearance> + <Material diffuseColor="1.000 0.000 1.000"/> + </Appearance> + <Box size="1 1 1"/> + </Shape> +</Transform> +<Transform translation="0 0 7"> + <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/iamonds/hexiamonds-infinity-2.png =================================================================== (Binary files differ) Index: trunk/puzzler/docs/images/iamonds/hexiamonds-infinity-2.png =================================================================== --- trunk/puzzler/docs/images/iamonds/hexiamonds-infinity-2.png 2016-11-30 23:28:41 UTC (rev 638) +++ trunk/puzzler/docs/images/iamonds/hexiamonds-infinity-2.png 2016-12-01 14:53:21 UTC (rev 639) Property changes on: trunk/puzzler/docs/images/iamonds/hexiamonds-infinity-2.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/puzzler/docs/images/iamonds/hexiamonds-infinity-2.svg =================================================================== (Binary files differ) Index: trunk/puzzler/docs/images/iamonds/hexiamonds-infinity-2.svg =================================================================== --- trunk/puzzler/docs/images/iamonds/hexiamonds-infinity-2.svg 2016-11-30 23:28:41 UTC (rev 638) +++ trunk/puzzler/docs/images/iamonds/hexiamonds-infinity-2.svg 2016-12-01 14:53:21 UTC (rev 639) Property changes on: trunk/puzzler/docs/images/iamonds/hexiamonds-infinity-2.svg ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/svg+xml \ No newline at end of property Added: trunk/puzzler/docs/images/iamonds/hexiamonds-near-hexagram-1.png =================================================================== (Binary files differ) Index: trunk/puzzler/docs/images/iamonds/hexiamonds-near-hexagram-1.png =================================================================== --- trunk/puzzler/docs/images/iamonds/hexiamonds-near-hexagram-1.png 2016-11-30 23:28:41 UTC (rev 638) +++ trunk/puzzler/docs/images/iamonds/hexiamonds-near-hexagram-1.png 2016-12-01 14:53:21 UTC (rev 639) Property changes on: trunk/puzzler/docs/images/iamonds/hexiamonds-near-hexagram-1.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/puzzler/docs/images/iamonds/hexiamonds-near-hexagram-1.svg =================================================================== (Binary files differ) Index: trunk/puzzler/docs/images/iamonds/hexiamonds-near-hexagram-1.svg =================================================================== --- trunk/puzzler/docs/images/iamonds/hexiamonds-near-hexagram-1.svg 2016-11-30 23:28:41 UTC (rev 638) +++ trunk/puzzler/docs/images/iamonds/hexiamonds-near-hexagram-1.svg 2016-12-01 14:53:21 UTC (rev 639) Property changes on: trunk/puzzler/docs/images/iamonds/hexiamonds-near-hexagram-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-4.png =================================================================== (Binary files differ) Index: trunk/puzzler/docs/images/iamonds/hexiamonds-spinner-4.png =================================================================== --- trunk/puzzler/docs/images/iamonds/hexiamonds-spinner-4.png 2016-11-30 23:28:41 UTC (rev 638) +++ trunk/puzzler/docs/images/iamonds/hexiamonds-spinner-4.png 2016-12-01 14:53:21 UTC (rev 639) Property changes on: trunk/puzzler/docs/images/iamonds/hexiamonds-spinner-4.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/puzzler/docs/images/iamonds/hexiamonds-spinner-4.svg =================================================================== (Binary files differ) Index: trunk/puzzler/docs/images/iamonds/hexiamonds-spinner-4.svg =================================================================== --- trunk/puzzler/docs/images/iamonds/hexiamonds-spinner-4.svg 2016-11-30 23:28:41 UTC (rev 638) +++ trunk/puzzler/docs/images/iamonds/hexiamonds-spinner-4.svg 2016-12-01 14:53:21 UTC (rev 639) Property changes on: trunk/puzzler/docs/images/iamonds/hexiamonds-spinner-4.svg ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/svg+xml \ No newline at end of property Added: trunk/puzzler/docs/images/iamonds/hexiamonds-trefoil-3.png =================================================================== (Binary files differ) Index: trunk/puzzler/docs/images/iamonds/hexiamonds-trefoil-3.png =================================================================== --- trunk/puzzler/docs/images/iamonds/hexiamonds-trefoil-3.png 2016-11-30 23:28:41 UTC (rev 638) +++ trunk/puzzler/docs/images/iamonds/hexiamonds-trefoil-3.png 2016-12-01 14:53:21 UTC (rev 639) Property changes on: trunk/puzzler/docs/images/iamonds/hexiamonds-trefoil-3.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/puzzler/docs/images/iamonds/hexiamonds-trefoil-3.svg =================================================================== (Binary files differ) Index: trunk/puzzler/docs/images/iamonds/hexiamonds-trefoil-3.svg =================================================================== --- trunk/puzzler/docs/images/iamonds/hexiamonds-trefoil-3.svg 2016-11-30 23:28:41 UTC (rev 638) +++ trunk/puzzler/docs/images/iamonds/hexiamonds-trefoil-3.svg 2016-12-01 14:53:21 UTC (rev 639) Property changes on: trunk/puzzler/docs/images/iamonds/hexiamonds-trefoil-3.svg ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/svg+xml \ No newline at end of property Modified: trunk/puzzler/docs/solid-pentominoes.txt =================================================================== --- trunk/puzzler/docs/solid-pentominoes.txt 2016-11-30 23:28:41 UTC (rev 638) +++ trunk/puzzler/docs/solid-pentominoes.txt 2016-12-01 14:53:21 UTC (rev 639) @@ -343,6 +343,25 @@ (`X3D model <images/cubes/solid-pentominoes-square-tower-4.x3d>`__) +* Stairstep walls: + + .. list-table:: + :class: borderless + + * - .. figure:: images/cubes/solid-pentominoes-stairstep-walls-1.png + + `34 solutions + <../solutions/ominoes/cubes/solid-pentominoes-stairstep-walls-1.txt>`__ + (`X3D model + <images/cubes/solid-pentominoes-stairstep-walls-1.x3d>`__) + + - .. figure:: images/cubes/solid-pentominoes-stairstep-walls-2.png + + `1 solution + <../solutions/ominoes/cubes/solid-pentominoes-stairstep-walls-2.txt>`__ + (`X3D model + <images/cubes/solid-pentominoes-stairstep-walls-2.x3d>`__) + .. _Kadon's Quintillions: http://gamepuzzles.com/polycube.htm#Q .. |c| unicode:: U+00A9 .. copyright sign Modified: trunk/puzzler/puzzler/puzzles/hexiamonds.py =================================================================== --- trunk/puzzler/puzzler/puzzles/hexiamonds.py 2016-11-30 23:28:41 UTC (rev 638) +++ trunk/puzzler/puzzler/puzzles/hexiamonds.py 2016-12-01 14:53:21 UTC (rev 639) @@ -594,7 +594,9 @@ holes = set(((0,3,0),(0,5,0),(3,0,0),(5,0,0),(3,5,0),(5,3,0))) def coordinates(self): - return sorted(set(self.coordinates_semiregular_hexagon(7, 1)) - self.holes) + return sorted( + set(self.coordinates_semiregular_hexagon(7, 1)) + - self.holes) def customize_piece_data(self): self.piece_data['I6'][-1]['rotations'] = None @@ -1240,6 +1242,31 @@ self.piece_data['P6'][-1]['rotations'] = (0, 1) +class HexiamondsSpinner4(Hexiamonds): + + """ + 4 solutions + + Design from `Kadon's Iamond Hex`_ booklet. + """ + + width = 8 + height = 8 + + def coordinates(self): + coords = ( + set(list(self.coordinates_hexagon(2, offset=(0,3,0))) + + list(self.coordinates_hexagon(2, offset=(4,0,0))) + + list(self.coordinates_hexagon(2, offset=(3,4,0))) + + list(self.coordinates_semiregular_hexagon(3, 2, + offset=(2,2,0)))) + - set(((4,4,0), (3,5,1), (3,3,1), (5,3,1)))) + return sorted(coords) + + def customize_piece_data(self): + self.piece_data['P6'][-1]['rotations'] = (0, 1) + + class HexiamondsSpinner_x1(Hexiamonds): """0 solutions""" @@ -1592,6 +1619,29 @@ self.piece_data['P6'][-1]['flips'] = None +class HexiamondsInfinity2(Hexiamonds): + + """ + 33 solutions + + Design from `Kadon's "Iamond Hex"`_ booklet. + """ + + width = 8 + height = 6 + + def coordinates(self): + coords = ( + set(list(self.coordinates_elongated_hexagon(2, 3, offset=(3,0,0))) + + list(self.coordinates_elongated_hexagon(2, 3))) + - set(((2,2,1), (2,3,0), (5,2,1), (5,3,0)))) + return sorted(coords) + + def customize_piece_data(self): + self.piece_data['P6'][-1]['rotations'] = (0, 1, 2) + self.piece_data['P6'][-1]['flips'] = None + + class HexiamondsBumpyTrefoil(Hexiamonds): """ @@ -1619,6 +1669,20 @@ self.piece_data['P6'][-1]['flips'] = None +class HexiamondsTrefoil3(HexiamondsTrefoil2): + + """ + 2 solutions + + Design from `Kadon's Iamond Hex`_ booklet. + """ + + height = 8 + width = 8 + + holes = set(((0,4,0),(2,2,0),(2,4,0),(4,0,0),(4,2,0),(4,4,0))) + + class HexiamondsKnobbyBone(Hexiamonds): """ @@ -1687,6 +1751,48 @@ self.piece_data['P6'][-1]['rotations'] = (0, 1) +class HexiamondsNearHexagram1(Hexiamonds): + + """ + 2 solutions + + Design from `Kadon's Iamond Hex`_ booklet. + """ + + height = 9 + width = 9 + + def coordinates(self): + coords = ( + set(list(self.coordinates_semiregular_hexagon(6, 1, offset=(2,2,0))) + + list(self.coordinates_inverted_triangle(7))) + - set(((4,4,1),))) + return sorted(coords) + + def customize_piece_data(self): + self.piece_data['P6'][-1]['flips'] = None + self.piece_data['P6'][-1]['rotations'] = (0, 1) + + +class HexiamondsNearHexagram_x2(Hexiamonds): + + """0 solutions""" + + height = 10 + width = 10 + + def coordinates(self): + coords = ( + set(list(self.coordinates_triangle(8, offset=(2,2,0))) + + list(self.coordinates_inverted_triangle(7))) + - set(self.coordinates_triangle(2, offset=(4,4,0)))) + return sorted(coords) + + def customize_piece_data(self): + self.piece_data['P6'][-1]['flips'] = None + self.piece_data['P6'][-1]['rotations'] = (0, 1) + + class OneSidedHexiamondsOBeirnesHexagon(OneSidedHexiamonds): """ Modified: trunk/puzzler/puzzler/puzzles/solid_pentominoes.py =================================================================== --- trunk/puzzler/puzzler/puzzles/solid_pentominoes.py 2016-11-30 23:28:41 UTC (rev 638) +++ trunk/puzzler/puzzler/puzzles/solid_pentominoes.py 2016-12-01 14:53:21 UTC (rev 639) @@ -1277,3 +1277,61 @@ def customize_piece_data(self): self.piece_data['P'][-1]['flips'] = None self.piece_data['P'][-1]['rotations'] = (0, 1) + + +class SolidPentominoesStairstepWalls1(SolidPentominoes): + + """34 solutions""" + + width = 8 + height = 8 + depth = 6 + + transform_solution_matrix = Puzzle3D.cycle_xyz_transform + + holes = set() + + def coordinates(self): + coords = set() + for i in range(self.depth): + coords.update( + set(self.coordinates_cuboid(1, 8-i, 1, offset=(0,0,i)))) + coords.update( + set(self.coordinates_cuboid(8-i, 1, 1, offset=(0,0,i)))) + coords -= self.holes + return sorted(coords) + + def customize_piece_data(self): + self.piece_data['P'][-1]['axes'] = (0,) + + +class SolidPentominoesStairstepWalls2(SolidPentominoesStairstepWalls1): + + """1 solution""" + + depth = 8 + + holes = set( + list(SolidPentominoes.coordinates_cuboid(1, 2, 1, offset=(0,1,0))) + + list(SolidPentominoes.coordinates_cuboid(2, 1, 1, offset=(1,0,0)))) + + +class SolidPentominoesStairstepWalls_x3(SolidPentominoesStairstepWalls1): + + """0 solutions""" + + depth = 7 + + holes = set( + list(SolidPentominoes.coordinates_cuboid(1, 2, 1, offset=(0,2,0))) + + list(SolidPentominoes.coordinates_cuboid(2, 1, 1, offset=(2,0,0)))) + + holes = set( + list(SolidPentominoes.coordinates_cuboid(1, 2, 1, offset=(0,3,0))) + + list(SolidPentominoes.coordinates_cuboid(2, 1, 1, offset=(3,0,0)))) + + holes = set( + list(SolidPentominoes.coordinates_cuboid(1, 2, 1, offset=(0,4,0))) + + list(SolidPentominoes.coordinates_cuboid(2, 1, 1, offset=(4,0,0)))) + + holes = set(SolidPentominoes.coordinates_cuboid(2, 2, 1)) Added: trunk/solutions/cubes/solid-pentominoes-stairstep-walls-1.txt =================================================================== --- trunk/solutions/cubes/solid-pentominoes-stairstep-walls-1.txt (rev 0) +++ trunk/solutions/cubes/solid-pentominoes-stairstep-walls-1.txt 2016-12-01 14:53:21 UTC (rev 639) @@ -0,0 +1,258 @@ +solving SolidPentominoesStairstepWalls1: + +solution 1: +3,0,0 4,0,0 5,0,0 6,0,0 7,0,0 I +4,0,2 4,0,3 5,0,1 5,0,2 6,0,1 W +0,5,0 0,5,1 0,6,0 0,6,1 0,7,0 P +1,0,0 2,0,0 2,0,1 3,0,1 4,0,1 N +1,0,4 2,0,3 2,0,4 2,0,5 3,0,4 X +0,0,3 0,0,4 0,0,5 1,0,3 1,0,5 U +1,0,1 1,0,2 2,0,2 3,0,2 3,0,3 Z +0,1,5 0,2,3 0,2,4 0,2,5 0,3,4 F +0,0,2 0,1,2 0,1,3 0,1,4 0,2,2 T +0,4,0 0,4,1 0,4,2 0,4,3 0,5,2 Y +0,1,1 0,2,1 0,3,1 0,3,2 0,3,3 V +0,0,0 0,0,1 0,1,0 0,2,0 0,3,0 L + +P +P P +P P Y +Y Y Y Y +L V V V F +L V T F F F +L V T T T F +L N N I I I I I L Z N N N W W T Z Z Z W W U U X Z W U X X X U U X + +solution 2: +3,0,0 4,0,0 5,0,0 6,0,0 7,0,0 I +4,0,2 4,0,3 5,0,1 5,0,2 6,0,1 W +0,5,0 0,5,1 0,6,0 0,6,1 0,7,0 P +2,0,1 3,0,1 3,0,2 3,0,3 4,0,1 T +0,0,0 0,1,0 0,2,0 1,0,0 2,0,0 V +0,1,4 0,2,3 0,2,4 0,2,5 0,3,4 X +0,0,3 0,0,4 0,0,5 0,1,3 0,1,5 U +1,0,5 2,0,3 2,0,4 2,0,5 3,0,4 F +1,0,1 1,0,2 1,0,3 1,0,4 2,0,2 Y +0,3,0 0,4,0 0,4,1 0,4,2 0,5,2 Z +0,1,2 0,2,2 0,3,2 0,3,3 0,4,3 N +0,0,1 0,0,2 0,1,1 0,2,1 0,3,1 L + +P +P P +P P Z +Z Z Z N +Z L N N X +V L N X X X +V L N U X U +V V V I I I I I L Y T T T W W L Y Y T W W U Y F T W U Y F F U F F + +solution 3: +3,0,0 4,0,0 5,0,0 6,0,0 7,0,0 I +4,0,2 4,0,3 5,0,1 5,0,2 6,0,1 W +0,4,0 0,5,0 0,6,0 0,6,1 0,7,0 Y +1,0,0 2,0,0 2,0,1 3,0,1 4,0,1 N +1,0,4 2,0,3 2,0,4 2,0,5 3,0,4 X +0,0,3 0,0,4 0,0,5 1,0,3 1,0,5 U +1,0,1 1,0,2 2,0,2 3,0,2 3,0,3 Z +0,1,5 0,2,3 0,2,4 0,2,5 0,3,4 F +0,0,2 0,1,2 0,1,3 0,1,4 0,2,2 T +0,1,1 0,2,1 0,3,1 0,3,2 0,3,3 V +0,0,0 0,0,1 0,1,0 0,2,0 0,3,0 L +0,4,1 0,4,2 0,4,3 0,5,1 0,5,2 P + +Y +Y Y +Y P P +Y P P P +L V V V F +L V T F F F +L V T T T F +L N N I I I I I L Z N N N W W T Z Z Z W W U U X Z W U X X X U U X + +solution 4: +4,0,1 5,0,1 6,0,0 6,0,1 7,0,0 N +2,0,0 3,0,0 3,0,1 4,0,0 5,0,0 Y +0,3,0 0,4,0 0,5,0 0,6,0 0,7,0 I +0,4,1 0,4,2 0,5,1 0,5,2 0,6,1 P +3,0,3 3,0,4 4,0,2 4,0,3 5,0,2 W +0,2,1 0,3,1 0,3,2 0,3,3 0,4,3 Z +0,0,0 0,1,0 0,1,1 0,1,2 0,2,0 T +0,0,2 0,0,3 0,1,3 0,2,2 0,2,3 U +0,0,5 0,1,5 0,2,5 1,0,5 2,0,5 V +0,0,4 0,1,4 0,2,4 0,3,4 1,0,4 L +1,0,3 2,0,2 2,0,3 2,0,4 3,0,2 F +0,0,1 1,0,0 1,0,1 1,0,2 2,0,1 X + +I +I P +I P P +I P P Z +I Z Z Z L +T Z U U L V +T T T U L V +T X Y Y Y Y N N X X X Y N N N U X F F W W U F F W W L L F W V V V + +solution 5: +5,0,1 5,0,2 6,0,0 6,0,1 7,0,0 W +0,3,0 0,4,0 0,5,0 0,6,0 0,7,0 I +0,4,1 0,4,2 0,5,1 0,5,2 0,6,1 P +3,0,0 4,0,0 4,0,1 4,0,2 5,0,0 T +0,1,4 0,2,3 0,2,4 0,2,5 0,3,4 X +0,0,3 0,0,4 0,0,5 0,1,3 0,1,5 U +0,1,2 0,2,2 0,3,2 0,3,3 0,4,3 N +0,0,0 0,1,0 0,2,0 1,0,0 2,0,0 V +0,0,1 0,0,2 0,1,1 0,2,1 0,3,1 L +1,0,1 1,0,2 1,0,3 1,0,4 2,0,2 Y +2,0,1 3,0,1 3,0,2 3,0,3 4,0,3 Z +1,0,5 2,0,3 2,0,4 2,0,5 3,0,4 F + +I +I P +I P P +I P P N +I L N N X +V L N X X X +V L N U X U +V V V T T T W W L Y Z Z T W W L Y Y Z T W U Y F Z Z U Y F F U F F + +solution 6: +5,0,1 5,0,2 6,0,0 6,0,1 7,0,0 W +0,3,0 0,4,0 0,5,0 0,6,0 0,7,0 I +0,4,1 0,4,2 0,5,1 0,5,2 0,6,1 P +3,0,0 4,0,0 4,0,1 4,0,2 5,0,0 T +1,0,4 2,0,3 2,0,4 2,0,5 3,0,4 X +0,0,3 0,0,4 0,0,5 1,0,3 1,0,5 U +1,0,2 2,0,2 3,0,2 3,0,3 4,0,3 N +0,0,0 0,1,0 0,2,0 1,0,0 2,0,0 V +0,0,1 0,0,2 1,0,1 2,0,1 3,0,1 L +0,1,1 0,1,2 0,1,3 0,1,4 0,2,2 Y +0,2,1 0,3,1 0,3,2 0,3,3 0,4,3 Z +0,1,5 0,2,3 0,2,4 0,2,5 0,3,4 F + +I +I P +I P P +I P P Z +I Z Z Z F +V Z Y F F F +V Y Y Y Y F +V V V T T T W W L L L L T W W L N N N T W U U X N N U X X X U U X + +solution 7: +5,0,1 5,0,2 6,0,0 6,0,1 7,0,0 W +0,3,0 0,4,0 0,5,0 0,6,0 0,7,0 I +0,4,1 0,4,2 0,5,1 0,5,2 0,6,1 P +2,0,0 3,0,0 3,0,1 4,0,0 5,0,0 Y +3,0,3 3,0,4 4,0,1 4,0,2 4,0,3 N +0,2,1 0,3,1 0,3,2 0,3,3 0,4,3 Z +0,0,0 0,1,0 0,1,1 0,1,2 0,2,0 T +0,0,2 0,0,3 0,1,3 0,2,2 0,2,3 U +0,0,5 0,1,5 0,2,5 1,0,5 2,0,5 V +0,0,4 0,1,4 0,2,4 0,3,4 1,0,4 L +1,0,3 2,0,2 2,0,3 2,0,4 3,0,2 F +0,0,1 1,0,0 1,0,1 1,0,2 2,0,1 X + +I +I P +I P P +I P P Z +I Z Z Z L +T Z U U L V +T T T U L V +T X Y Y Y Y W W X X X Y N W W U X F F N W U F F N N L L F N V V V + +solution 8: +5,0,1 5,0,2 6,0,0 6,0,1 7,0,0 W +0,3,0 0,4,0 0,5,0 0,6,0 0,7,0 I +0,3,1 0,4,1 0,5,1 0,5,2 0,6,1 Y +3,0,0 4,0,0 4,0,1 4,0,2 5,0,0 T +2,0,2 3,0,2 3,0,3 3,0,4 4,0,3 F +0,0,1 0,1,1 1,0,1 2,0,1 3,0,1 L +0,0,0 0,1,0 0,2,0 1,0,0 2,0,0 V +0,0,3 1,0,2 1,0,3 1,0,4 2,0,3 X +0,0,4 0,0,5 1,0,5 2,0,4 2,0,5 U +0,0,2 0,1,2 0,1,3 0,2,3 0,3,3 N +0,1,4 0,1,5 0,2,4 0,2,5 0,3,4 P +0,2,1 0,2,2 0,3,2 0,4,2 0,4,3 Z + +I +I Y +I Y Y +I Y Z Z +I Y Z N P +V Z Z N P P +V L N N P P +V V V T T T W W L L L L T W W N X F F T W X X X F F U X U F U U U + +solution 9: +5,0,1 5,0,2 6,0,0 6,0,1 7,0,0 W +0,3,0 0,4,0 0,5,0 0,6,0 0,7,0 I +0,3,1 0,4,1 0,5,1 0,5,2 0,6,1 Y +3,0,0 4,0,0 4,0,1 4,0,2 5,0,0 T +2,0,3 3,0,2 3,0,3 3,0,4 4,0,3 X +0,0,4 0,0,5 1,0,5 2,0,4 2,0,5 U +0,0,3 1,0,2 1,0,3 1,0,4 2,0,2 F +0,0,0 0,1,0 0,2,0 1,0,0 2,0,0 V +0,0,1 0,1,1 1,0,1 2,0,1 3,0,1 L +0,0,2 0,1,2 0,1,3 0,2,3 0,3,3 N +0,1,4 0,1,5 0,2,4 0,2,5 0,3,4 P +0,2,1 0,2,2 0,3,2 0,4,2 0,4,3 Z + +I +I Y +I Y Y +I Y Z Z +I Y Z N P +V Z Z N P P +V L N N P P +V V V T T T W W L L L L T W W N F F X T W F F X X X U F U X U U U + +solution 10: +5,0,1 5,0,2 6,0,0 6,0,1 7,0,0 W +0,4,1 0,5,1 0,6,0 0,6,1 0,7,0 N +0,1,0 0,2,0 0,3,0 0,4,0 0,5,0 I +3,0,0 4,0,0 4,0,1 4,0,2 5,0,0 T +0,3,1 0,3,2 0,4,2 0,4,3 0,5,2 F +1,0,3 2,0,3 3,0,2 3,0,3 4,0,3 Y +0,0,4 0,1,4 1,0,4 2,0,4 3,0,4 L +0,0,5 0,1,5 0,2,5 1,0,5 2,0,5 V +1,0,1 2,0,0 2,0,1 2,0,2 3,0,1 X +0,0,0 0,0,1 0,0,2 1,0,0 1,0,2 U +0,0,3 0,1,1 0,1,2 0,1,3 0,2,1 Z +0,2,2 0,2,3 0,2,4 0,3,3 0,3,4 P + +N +N N +I N F +I N F F +I F F P P +I Z P P P V +I Z Z Z L V +U U X T T T W W U X X X T W W U U X Y T W Z Y Y Y Y L L L L V V V + +... + +solution 34: +4,0,0 5,0,0 6,0,0 6,0,1 7,0,0 Y +0,5,1 0,5,2 0,6,0 0,6,1 0,7,0 W +0,3,1 0,4,0 0,4,1 0,4,2 0,5,0 F +0,1,0 0,1,1 0,2,0 0,2,1 0,3,0 P +0,2,3 0,3,2 0,3,3 0,3,4 0,4,3 X +0,1,2 0,1,3 0,1,4 0,2,2 0,2,4 U +0,0,5 0,1,5 0,2,5 1,0,5 2,0,5 V +0,0,0 0,0,1 0,0,2 0,0,3 0,0,4 I +3,0,0 3,0,1 4,0,1 5,0,1 5,0,2 Z +1,0,0 1,0,1 1,0,2 1,0,3 2,0,0 L +2,0,1 2,0,2 2,0,3 3,0,2 4,0,2 T +1,0,4 2,0,4 3,0,3 3,0,4 4,0,3 N + +W +W W +F W W +F F F X +P F X X X +P P U X U V +P P U U U V +I L L Z Y Y Y Y I L T Z Z Z Y I L T T T Z I L T N N I N N N V V V + +34 solutions, 56,035 searches, duration 0:00:12.982265 Property changes on: trunk/solutions/cubes/solid-pentominoes-stairstep-walls-1.txt ___________________________________________________________________ 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/solutions/cubes/solid-pentominoes-stairstep-walls-2.txt =================================================================== --- trunk/solutions/cubes/solid-pentominoes-stairstep-walls-2.txt (rev 0) +++ trunk/solutions/cubes/solid-pentominoes-stairstep-walls-2.txt 2016-12-01 14:53:21 UTC (rev 639) @@ -0,0 +1,49 @@ +solving SolidPentominoesStairstepWalls2: + +solution 1: +0,3,0 0,4,0 0,5,0 0,6,0 0,7,0... [truncated message content] |