twisty_puzzles 0.0.25 → 0.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bdb18c89f68fabb32390a700b044586d879472b35a120fa953daf9dd8fe92c6
-  data.tar.gz: 59033222dd6581dc53383e05a2f5886aee43beeb93578d2db8a7b455133ad07a
+  metadata.gz: 4a36579770d4f4a738e61f718667325433469a295d7f131f7fa3b3ea770f7917
+  data.tar.gz: fc9f222127a4ab7f3af88cd6fd41b5ca18005e02e531eaba4be3fbbaa5030fde
 SHA512:
-  metadata.gz: 0aabba50c1c8d8a5edec9359a06be002fc13bf9a9171578920357eafbbb90d96e82fe8c3f3455e95c70080e1e86d974a9ab260fbc0d7e6827c5c1cd2d9c13086
-  data.tar.gz: 8c9004e6132a9174c5f1e92c8b116bd3d7cc6158e858bcff762f8b7d42a1656795af73243664b0e4186c212536ac43628820e37a8b9ae9b61f5b4db9d9a2af16
+  metadata.gz: 8bfe24af1bbc9d601ef76c7838167c126a223248a87086bc516d78adcee3ab82f64545a173b3e9774bab5b40a4fce6498a21b659d4b92f45654802e251ec97d2
+  data.tar.gz: e8e21f651133dc55e41d099ea3c9f484ff0ad49a7d9375ce7aef27ae3eb143fa70dc24c47788bf43463bc25063ce6aa9cbe0e35a0cb94c1e5260d1dc7a257f54

data/lib/twisty_puzzles/abstract_direction.rb

@@ -4,7 +4,7 @@ module TwistyPuzzles
   # Base class for directions.
   class AbstractDirection
     include Comparable
-    POSSIBLE_DIRECTION_NAMES = [[''], ['2', '2\''], ['\'', '3', '’']].freeze
+    POSSIBLE_DIRECTION_NAMES = [[''], ['2', '2\''], ['\'', '3', '’', '‘', '´', '`']].freeze
     SIMPLE_DIRECTION_NAMES = (['0'] + POSSIBLE_DIRECTION_NAMES.map(&:first)).freeze
     POSSIBLE_SKEWB_DIRECTION_NAMES = [['', '2\''], ['\'', '2']].freeze
     SIMPLE_SKEWB_DIRECTION_NAMES = (['0'] + POSSIBLE_SKEWB_DIRECTION_NAMES.map(&:first)).freeze

data/lib/twisty_puzzles/algorithm.rb

@@ -20,7 +20,9 @@ module TwistyPuzzles
       @moves = moves
     end
 
-    EMPTY = Algorithm.new([])
+    def self.empty
+      Algorithm.new([])
+    end
 
     # Creates a one move algorithm.
     def self.move(move)

data/lib/twisty_puzzles/cancellation_helper.rb

@@ -43,7 +43,7 @@ module TwistyPuzzles
       raise TypeError unless algorithm.is_a?(Algorithm)
 
       CubeState.check_cube_size(cube_size)
-      alg = Algorithm::EMPTY
+      alg = Algorithm.empty
       algorithm.moves.each do |m|
         alg = push_with_cancellation(alg, m, cube_size)
       end
@@ -107,7 +107,7 @@ module TwistyPuzzles
     def self.rotation_sequences
       @rotation_sequences ||=
         begin
-          trivial_rotation_algs = [Algorithm::EMPTY]
+          trivial_rotation_algs = [Algorithm.empty]
           single_rotation_algs = Rotation::NON_ZERO_ROTATIONS.map { |e| Algorithm.move(e) }
           combined_rotation_algs = self.combined_rotation_algs
           rotation_algs = trivial_rotation_algs + single_rotation_algs + combined_rotation_algs

data/lib/twisty_puzzles/color_scheme.rb

@@ -57,7 +57,7 @@ module TwistyPuzzles
     end
 
     def colors
-      @face_symbols_to_colors.values
+      @face_symbols_to_colors.to_a.sort_by(&:first).map(&:last)
     end
 
     def turned(top_color, front_color)

data/lib/twisty_puzzles/coordinate.rb

@@ -173,6 +173,10 @@ module TwistyPuzzles
       @native = native
     end
 
+    def to_s
+      "#{self.class}(#{face}, #{cube_size}, #{x}, #{y})"
+    end
+
     attr_reader :native
 
     def face

data/lib/twisty_puzzles/cube.rb

@@ -72,6 +72,11 @@ module TwistyPuzzles
       true
     end
 
+    def self.exists_on_cube_size?(cube_size)
+      cube_size >= min_cube_size && cube_size <= max_cube_size &&
+        (cube_size % 2 == 0 ? self.exists_on_even_cube_sizes? : self.exists_on_odd_cube_sizes?)
+    end
+
     def num_incarnations(_cube_size)
       1
     end
@@ -286,7 +291,7 @@ module TwistyPuzzles
     # lie where the given other face currently is.
     def rotation_to(other)
       if other == self
-        Algorithm::EMPTY
+        Algorithm.empty
       else
         # There can be multiple solutions.
         axis_face =
@@ -470,7 +475,6 @@ module TwistyPuzzles
   # Represents one wing or the position of one wing on the cube.
   class Wing < Part
     extend EdgeLike
-    WING_BASE_INDEX_INVERTED_FACE_SYMBOLS = %i[U R B].freeze
     FACES = 2
 
     ELEMENTS = generate_parts
@@ -479,10 +483,6 @@ module TwistyPuzzles
       4
     end
 
-    def self.exists_on_odd_cube_sizes?
-      false
-    end
-
     def self.max_parseable_face_symbols
       FACES + 1
     end
@@ -543,8 +543,7 @@ module TwistyPuzzles
 
     # One index of such a piece on a on a NxN face.
     def base_index_on_other_face(face, _cube_size, incarnation_index)
-      # TODO: Make this more elegant than hardcoding
-      inverse = WING_BASE_INDEX_INVERTED_FACE_SYMBOLS.include?(face.face_symbol)
+      inverse = face.piece_index.even?
       coordinates = [0, 1 + incarnation_index]
       inverse ? coordinates.reverse : coordinates
     end

data/lib/twisty_puzzles/part_cycle.rb

@@ -17,16 +17,19 @@ module TwistyPuzzles
 
     RAW_DATA_RESERVED = [' ', '(', ')'].freeze
 
-    def initialize(parts)
+    def initialize(parts, twist=0)
       raise ArgumentError if parts.empty?
+      raise TypeError unless twist.is_a?(Integer)
+      raise ArgumentError if twist.negative?
 
       check_types(parts, Part)
       check_type_consistency(parts)
 
       @parts = parts
+      @twist = twist
     end
 
-    attr_reader :parts
+    attr_reader :parts, :twist
 
     def eql?(other)
       self.class.equal?(other.class) && @parts == other.parts
@@ -79,6 +82,21 @@ module TwistyPuzzles
         end.min
     end
 
+    # Note that this returns the same answer for all rotations of one part.
+    def contains?(part)
+      @parts.any? { |p| p.turned_equals?(part) }
+    end
+
+    # Returns an equivalent cycle that starts with the given part.
+    # Raises an error if the cycle doesn't contain the given part.
+    def start_with(part)
+      raise ArgumentError unless contains?(part)
+
+      index = @parts.find_index { |p| p.turned_equals?(part) }
+      map_rotate_by_number = @parts[index].rotations.index(part)
+      rotate_by(@parts.length - index).map_rotate_by(map_rotate_by_number)
+    end
+
     def equivalent?(other)
       self == other || canonicalize == other.canonicalize
     end

data/lib/twisty_puzzles/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TwistyPuzzles
-  VERSION = '0.0.25'
+  VERSION = '0.0.29'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twisty_puzzles
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.29
 platform: ruby
 authors:
 - Bernhard F. Brodowsky
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-10 00:00:00.000000000 Z
+date: 2021-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize