twisty_puzzles 0.0.30 → 0.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0921468026dd18bfa906d172939b0856c6d98081eff7fe2013e168daa66f090
-  data.tar.gz: 91ef593d14bc93213d6703d508c392ba0ca24d05cd20bfc6936391f0afb7a2ad
+  metadata.gz: d97ccbff9f193fbb7406de38b04d408f48c2cf58c5a55bc6bb731b3585abc277
+  data.tar.gz: 987b9331d652a8e8e0637f0382a63ce80eb1378c87853b595ade065f77eb9a76
 SHA512:
-  metadata.gz: 5be09b84d72b7c36723fa4003fdb3ec7a8f068ae5c95e6e10956468f74c3730acb22de0e06b388a42b34c2b2af04bf62bf3cdedd5cf5d472fca70750f7735dd6
-  data.tar.gz: a842caaa9cebd5cdadc38cbf60c22439b49b1d923682fbfdd06a69ea92ccf3916c45bbe4c6c317f9fcc6b37d8d41fe81e9443717cf45c009548f474ad2c00142
+  metadata.gz: 00e6a30b9753bc955762a04858bcc88926daaaa6f7485453ae1e90c99011cb6b7b481e79f18947871f6fcdd4f3c2126653238b700c3bc970476e6263a1704e7f
+  data.tar.gz: 5d9f333c879419b5a9ec1e4a62dd70fb3c33f4bd1102578ad191113ea1e23a2ba073be4ecc0ce8c4827a4b427885463113b3bb0291b927f9c9bef183d054a6c6

data/lib/twisty_puzzles/cube.rb

@@ -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

@@ -21,6 +21,7 @@ module TwistyPuzzles
       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
@@ -62,15 +69,15 @@ module TwistyPuzzles
     end
 
     def rotate_by(number)
-      self.class.new(@parts.rotate(number))
+      self.class.new(@parts.rotate(number), @twist)
     end
 
     def map_rotate_by(number)
-      self.class.new(@parts.map { |p| p.rotate_by(number) })
+      self.class.new(@parts.map { |p| p.rotate_by(number) }, @twist)
     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.30'
+  VERSION = '0.0.34'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twisty_puzzles
 version: !ruby/object:Gem::Version
-  version: 0.0.30
+  version: 0.0.34
 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