twisty_puzzles 0.0.22 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b027980f0003ca98c1c331bf442b3ac511a0e3bdc6bf68df6a1cb863b7a7d0a1
-  data.tar.gz: c1ad15aef159ebe5fb99dd0a7fc299d88fd88ecdc0418a7e730150a3d5dc8448
+  metadata.gz: fa3e196d509ec1452a947269c43028b2ee5e3be803f4d3bf510ef5c170d01310
+  data.tar.gz: 704d10067e79b8d78e3eb5367795200695d4445a44873d198936136568ddc3e4
 SHA512:
-  metadata.gz: 10035a7afbb795b610d2e6c9408d86a13606327ba934c9a0e044a10fe316efa32eb25da74a3244d4762e8083aa0334b5e40f19cc6bbed9b1f0660b70e1df9122
-  data.tar.gz: 67434787b689f5466a66ff202d5a0da06c7d92c051f836ef3c09e638e9d82d9475b4e2f79089062561508da9dcc3f2025fcab1818aab5f891a7416e43ac2c56d
+  metadata.gz: 197fc8e07f87b42434f8b126fa9fdcec56a5a47f883d7faf892aecf9c440e01d97c991f15734bdfdda42ee95ca78660f2da7cde1d165c37f2613218532894361
+  data.tar.gz: 840a076a049ef64a39c82e4b8f6f9721d71be47bc8a232c278bd7f2cc67bd564e2f4dd566b59d1db14582ec6be2a6b4cc6c6001d2eafe51bcb7ce5335dda3bf9

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

@@ -286,7 +286,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 +470,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
@@ -543,8 +542,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
@@ -675,5 +673,5 @@ module TwistyPuzzles
 
   # TODO: Add obliques
 
-  PART_TYPES = [Corner, Edge, XCenter, TCenter, Face, Edge, Midge, Wing].freeze
+  PART_TYPES = [Corner, Edge, XCenter, TCenter, Face, Midge, Wing].freeze
 end

data/lib/twisty_puzzles/part_cycle.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'twisty_puzzles/utils/array_helper'
+require 'twisty_puzzles/utils/string_helper'
 require 'twisty_puzzles/sticker_cycle_factory'
 require 'twisty_puzzles/cube'
 
@@ -11,6 +12,8 @@ module TwistyPuzzles
   # Check StickerCycleFactory for making it concrete and applyable.
   class PartCycle
     include Utils::ArrayHelper
+    include Utils::StringHelper
+    extend Utils::StringHelper
 
     RAW_DATA_RESERVED = [' ', '(', ')'].freeze
 
@@ -39,21 +42,54 @@ module TwistyPuzzles
       @parts.first.class
     end
 
+    def contains_any_part?(parts)
+      !(@parts & parts).empty?
+    end
+
     def to_s
       @parts.join(' ')
     end
 
     def to_raw_data
-      "#{part_type}(#{self})"
+      "#{simple_class_name(part_type)}(#{self})"
     end
 
     def length
       @parts.length
     end
 
+    def rotate_by(number)
+      self.class.new(@parts.rotate(number))
+    end
+
+    def map_rotate_by(number)
+      self.class.new(@parts.map { |p| p.rotate_by(number) })
+    end
+
+    def <=>(other)
+      @parts <=> other.parts
+    end
+
+    def canonicalize
+      @canonicalize ||=
+        @parts.map.with_index do |part, index|
+          min_part = part.rotations.min
+          map_rotate_by_number = part.rotations.index(min_part)
+          rotate_by(index).map_rotate_by(map_rotate_by_number)
+        end.min
+    end
+
+    def equivalent?(other)
+      self == other || canonicalize == other.canonicalize
+    end
+
+    def inverse
+      self.class.new([@parts[0]] + @parts[1..].reverse)
+    end
+
     def self.from_raw_data(data)
       raw_part_type, raw_parts = data.match(/(.*)\((.*)\)/).captures
-      part_type = PART_TYPES.find { |p| p.name == raw_part_type }
+      part_type = PART_TYPES.find { |p| simple_class_name(p) == raw_part_type }
       parts = raw_parts.split.map { |r| part_type.parse(r) }
       new(parts)
     end

data/lib/twisty_puzzles/version.rb

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

metadata

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