twisty_puzzles 0.0.29 → 0.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a36579770d4f4a738e61f718667325433469a295d7f131f7fa3b3ea770f7917
-  data.tar.gz: fc9f222127a4ab7f3af88cd6fd41b5ca18005e02e531eaba4be3fbbaa5030fde
+  metadata.gz: c7f97b7d7ae5e18648c974e310b3be824bcf266da8900bbf074ccb31d8a8868a
+  data.tar.gz: cd7012646185d4a85afca5b5919c5a42b90cfb27189cc9691de14b8d5dcaedc8
 SHA512:
-  metadata.gz: 8bfe24af1bbc9d601ef76c7838167c126a223248a87086bc516d78adcee3ab82f64545a173b3e9774bab5b40a4fce6498a21b659d4b92f45654802e251ec97d2
-  data.tar.gz: e8e21f651133dc55e41d099ea3c9f484ff0ad49a7d9375ce7aef27ae3eb143fa70dc24c47788bf43463bc25063ce6aa9cbe0e35a0cb94c1e5260d1dc7a257f54
+  metadata.gz: f46a05e2f8795ddd034867219c20b344eab78c864a71a0be29bf1dd69b4412337e9a28951f8042eb5d648c490118328e0b0b542714d4fa6011335cf147456d33
+  data.tar.gz: f356c2e2568a73b18c64a01c00067f334eef196ff1215de4465539a02c44523ef02a95d9e2fc03a007ccc1c3c396682e4c773745dbb5aa5951215756c8106600

data/lib/twisty_puzzles/cube.rb

@@ -74,7 +74,7 @@ module TwistyPuzzles
 
     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?)
+        (cube_size.even? ? exists_on_even_cube_sizes? : exists_on_odd_cube_sizes?)
     end
 
     def num_incarnations(_cube_size)
@@ -122,7 +122,7 @@ module TwistyPuzzles
     end
 
     def inspect
-      "#{self.class}(#{@face_symbols.map(&:to_s).join(', ')})"
+      @inspect ||= "#{self.class.name.split('::').last}(#{@face_symbols.map(&:to_s).join(', ')})"
     end
 
     def to_s
@@ -390,7 +390,8 @@ module TwistyPuzzles
     attr_reader :corresponding_part
 
     def inspect
-      "#{self.class}(#{face_symbol}, #{@corresponding_part.inspect})"
+      @inspect ||=
+        "#{self.class.name.split('::').last}(#{face_symbol}, #{@corresponding_part.inspect})"
     end
 
     def rotate_by(_number)

data/lib/twisty_puzzles/part_cycle.rb

@@ -17,10 +17,11 @@ module TwistyPuzzles
 
     RAW_DATA_RESERVED = [' ', '(', ')'].freeze
 
-    def initialize(parts, twist=0)
+    def initialize(parts, twist = 0)
       raise ArgumentError if parts.empty?
       raise TypeError unless twist.is_a?(Integer)
       raise ArgumentError if twist.negative?
+      raise ArgumentError if twist >= parts.first.rotations.length
 
       check_types(parts, Part)
       check_type_consistency(parts)
@@ -32,13 +33,18 @@ module TwistyPuzzles
     attr_reader :parts, :twist
 
     def eql?(other)
-      self.class.equal?(other.class) && @parts == other.parts
+      self.class.equal?(other.class) && @parts == other.parts && @twist == other.twist
     end
 
     alias == eql?
 
+    def inspect
+      @inspect ||=
+        "#{self.class.name.split('::').last}(#{@parts.map(&:inspect).join(', ')}#{twist_suffix})"
+    end
+
     def hash
-      @hash ||= ([self.class] + @parts).hash
+      @hash ||= [self.class, @parts, @twist].hash
     end
 
     def part_type
@@ -46,15 +52,16 @@ module TwistyPuzzles
     end
 
     def contains_any_part?(parts)
-      !(@parts & parts).empty?
+      parts.any? { |p| contains?(p) }
     end
 
     def to_s
-      @parts.join(' ')
+      @to_s ||= @parts.join(' ')
     end
 
     def to_raw_data
-      "#{simple_class_name(part_type)}(#{self})"
+      @to_raw_data ||=
+        "#{simple_class_name(part_type)}(#{self}#{twist_suffix})"
     end
 
     def length
@@ -70,7 +77,7 @@ module TwistyPuzzles
     end
 
     def <=>(other)
-      @parts <=> other.parts
+      [part_type, @parts, @twist] <=> [other.part_type, other.parts, other.twist]
     end
 
     def canonicalize
@@ -94,7 +101,7 @@ module TwistyPuzzles
 
       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)
+      rotate_by(index).map_rotate_by(map_rotate_by_number)
     end
 
     def equivalent?(other)
@@ -102,14 +109,22 @@ module TwistyPuzzles
     end
 
     def inverse
-      self.class.new([@parts[0]] + @parts[1..].reverse)
+      inverse_twist = @twist.zero? ? @twist : parts.first.rotations.length - @twist
+      self.class.new([@parts[0]] + @parts[1..].reverse, inverse_twist)
     end
 
     def self.from_raw_data(data)
-      raw_part_type, raw_parts = data.match(/(.*)\((.*)\)/).captures
+      raw_part_type, raw_parts, raw_twist = data.match(/^(.*)\((.*?)(?:, (.+))?\)$/).captures
       part_type = PART_TYPES.find { |p| simple_class_name(p) == raw_part_type }
+      twist = raw_twist ? Integer(raw_twist) : 0
       parts = raw_parts.split.map { |r| part_type.parse(r) }
-      new(parts)
+      new(parts, twist)
+    end
+
+    private
+
+    def twist_suffix
+      @twist.positive? ? ", #{@twist}" : ''
     end
 
     def check_type_consistency(parts)

data/lib/twisty_puzzles/sticker_cycle.rb

@@ -7,6 +7,7 @@ require 'twisty_puzzles/reversible_applyable'
 
 module TwistyPuzzles
   # A sticker cycle that can be applied to a cube state.
+  # TODO: Deprecate
   class StickerCycle
     include ReversibleApplyable
 
@@ -55,6 +56,7 @@ module TwistyPuzzles
   end
 
   # A set of disjoint sticker cycles that can be applied to a cube state together
+  # TODO: Deprecate
   class StickerCycles
     include ReversibleApplyable
 
@@ -64,7 +66,10 @@ module TwistyPuzzles
         raise TypeError unless c.is_a?(StickerCycle)
 
         c.native.coordinates.each do |s|
-          raise ArgumentError unless affected_set.add?(s)
+          unless affected_set.add?(s)
+            raise ArgumentError,
+                  'There is an intersection between part cycles'
+          end
         end
       end
       @cube_size = cube_size

data/lib/twisty_puzzles/sticker_cycle_factory.rb

@@ -6,6 +6,7 @@ require 'twisty_puzzles/cube'
 
 module TwistyPuzzles
   # Factory for sticker cycles given part cycles.
+  # TODO: Deprecate
   class StickerCycleFactory
     include Utils::ArrayHelper
 

data/lib/twisty_puzzles/version.rb

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

metadata

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