twisty_puzzles 0.0.5 → 0.0.10

data/ext/twisty_puzzles/native/skewb_coordinate.c

@@ -56,17 +56,6 @@ size_t center_sticker_index(const face_index_t on_face_index) {
   return on_face_index * skewb_stickers_per_face;
 }
 
-static VALUE part_type_from_symbol(const VALUE part_type_symbol) {
-  Check_Type(face_symbol, T_SYMBOL);
-  if (SYM2ID(part_type_symbol) == center_part_type_id) {
-    return CENTER;
-  } else if (SYM2ID(part_type_symbol) == corner_part_type_id) {
-    return CORNER;
-  } else {
-    rb_raise(rb_eArgError, "Invalid part type symbol %+"PRIsVALUE"", part_type_symbol);
-  }
-}
-
 static VALUE part_type_to_symbol(const SkewbPartType part_type) {
   // Caching these keys isn't easy because the garbage collector will get them.
   switch (part_type) {

data/ext/twisty_puzzles/native/skewb_layer_fingerprint.c

@@ -32,7 +32,7 @@ static ID times = 848;
 
 typedef struct {
   Corner corner_pairs[max_corner_pair_group_size][2];
-  int num_corner_pairs;
+  size_t num_corner_pairs;
   // Number of different group fingerprints. This can be used to merge several group fingerprints.
   int num_group_fingerprints;
 } CornerPairGroup;
@@ -55,7 +55,7 @@ static bool has_color_at(const ActualCornerStickers actual, const size_t index,
 }
 
 typedef struct {
-  int layer_index;
+  size_t layer_index;
   bool is_oriented;
   bool is_present;
 } ActualCornerStickersInfo;
@@ -268,4 +268,5 @@ void init_skewb_layer_fingerprint_method_under(const VALUE module) {
   plus = rb_intern("+");
   times = rb_intern("*");
   rb_define_singleton_method(module, "skewb_layer_fingerprint", skewb_layer_fingerprint, 2);
+  init_corner_pair_groups();
 }

data/ext/twisty_puzzles/native/skewb_state.c

@@ -43,8 +43,6 @@ static int SkewbState_replace_face(const VALUE key, const VALUE value, const VAL
 
 static VALUE SkewbState_initialize(const VALUE self, const VALUE stickers) {
   Check_Type(stickers, T_HASH);
-  SkewbStateData* data;
-  GetSkewbStateData(self, data);
   if (RHASH_SIZE(stickers) != skewb_faces) {
     rb_raise(rb_eTypeError, "Skewbs must have %d faces. Got %ld.", skewb_faces, RHASH_SIZE(stickers));
   }

data/ext/twisty_puzzles/native/utils.c

@@ -64,7 +64,7 @@ int log2_64_floor(uint64_t value) {
     return tab64[((uint64_t)((value - (value >> 1))*0x07EDD5E59A4E28C2)) >> 58];
 }
 
-uint64_t iexp(const uint64_t base, uint32_t exp) {
+uint64_t iexp(const uint64_t base, const uint32_t exp) {
   uint64_t result = 1;
   for (uint32_t m = 1 << 31; m; m >>= 1) {
     result = result * result;
@@ -74,3 +74,9 @@ uint64_t iexp(const uint64_t base, uint32_t exp) {
   }
   return result;
 }
+
+void check_cube_size(const long cube_size) {
+  if (cube_size <= 0) {
+    rb_raise(rb_eArgError, "Cube size must be positive. Got %ld.", cube_size);
+  }
+}

data/ext/twisty_puzzles/native/utils.h

@@ -5,11 +5,8 @@
 
 #define MIN(a, b) ((a) > (b) ? (b) : (a))
 #define MAX(a, b) ((a) > (b) ? (a) : (b))
-#define FALSE 0
-#define TRUE 1
 #define CROP_MOD(a, b) (((a) % (b) + (b)) % (b))
 
-typedef char bool;
 typedef char direction_t;
 
 typedef struct {
@@ -29,3 +26,5 @@ int color_eq(VALUE left, VALUE right);
 int log2_64_floor(uint64_t value);
 
 uint64_t iexp(uint64_t base, uint32_t exp);
+
+void check_cube_size(long cube_size);

data/lib/twisty_puzzles/abstract_move.rb

@@ -143,6 +143,10 @@ module TwistyPuzzles
       prepend_slice_move(other, cube_size)
     end
 
+    def prepend_slice_move(_other, _cube_size)
+      raise NotImplementedError, "#{self.class}#prepend_slice_move is not implemented"
+    end
+
     private
 
     def move_count_internal(metric, slice_factor, direction_factor)
@@ -150,8 +154,7 @@ module TwistyPuzzles
       when :qtm then slice_factor * direction_factor
       when :htm then slice_factor
       when :stm then 1
-      when :qstm then direction_factor
-      when :sqtm then direction_factor
+      when :qstm, :sqtm then direction_factor
       else raise ArgumentError, "Invalid move metric #{metric.inspect}."
       end
     end

data/lib/twisty_puzzles/abstract_move_parser.rb

@@ -20,7 +20,7 @@ module TwistyPuzzles
     end
 
     def parse_named_captures(match)
-      present_named_captures = match.named_captures.reject { |_n, v| v.nil? }
+      present_named_captures = match.named_captures.compact
       present_named_captures.map do |name, string|
         key = parse_part_key(name).to_sym
         value = parse_move_part(name, string)
@@ -31,14 +31,14 @@ module TwistyPuzzles
     def parse_move(move_string)
       match = move_string.match(regexp)
       if !match || !match.pre_match.empty? || !match.post_match.empty?
-        raise ArgumentError("Invalid move #{move_string}.")
+        raise ArgumentError, "Invalid move #{move_string}."
       end
 
       parsed_parts = parse_named_captures(match)
       move_type_creators.each do |parser|
         return parser.create(parsed_parts) if parser.applies_to?(parsed_parts)
       end
-      raise "No move type creator applies to #{parsed_parts}"
+      raise ArgumentError, "No move type creator applies to #{parsed_parts}"
     end
   end
 end

data/lib/twisty_puzzles/algorithm.rb

@@ -128,7 +128,7 @@ module TwistyPuzzles
       AbstractMove.check_move_metric(metric)
       return 0 if empty?
 
-      @moves.map { |m| m.move_count(cube_size, metric) }.reduce(:+)
+      @moves.sum { |m| m.move_count(cube_size, metric) }
     end
 
     def *(other)

data/lib/twisty_puzzles/algorithm_transformation.rb

@@ -4,28 +4,36 @@ require 'twisty_puzzles/cube_direction'
 require 'twisty_puzzles/rotation'
 
 module TwistyPuzzles
-  AlgorithmTransformation =
-    Struct.new(:rotation, :mirror, :mirror_normal_face) do
-      def transformed(algorithm)
-        algorithm = algorithm.mirror(mirror_normal_face) if mirror
-        algorithm.rotate_by(rotation)
-      end
+  # A transformation consisting of mirroring and rotating that can be applied to an algorithm.
+  class AlgorithmTransformation
+    def initialize(rotation, mirror, mirror_normal_face)
+      @rotation = rotation
+      @mirror = mirror
+      @mirror_normal_face = mirror_normal_face
+    end
 
-      def identity?
-        rotation.identity? && !mirror
-      end
+    attr_reader :rotation, :mirror, :mirror_normal_face
 
-      # Returns algorithm transformations that mirror an algorithm and rotate it around a face.
-      def self.around_face(face)
-        around_face_rotations = CubeDirection::ALL_DIRECTIONS.map { |d| Rotation.new(face, d) }
-        mirror_normal_face = face.neighbors.first
-        around_face_rotations.product([true, false]).map do |r, m|
-          AlgorithmTransformation.new(r, m, mirror_normal_face)
-        end
-      end
+    def transformed(algorithm)
+      algorithm = algorithm.mirror(mirror_normal_face) if mirror
+      algorithm.rotate_by(rotation)
+    end
 
-      def self.around_face_without_identity(face)
-        around_face(face).reject(&:identity?)
+    def identity?
+      rotation.identity? && !mirror
+    end
+
+    # Returns algorithm transformations that mirror an algorithm and rotate it around a face.
+    def self.around_face(face)
+      around_face_rotations = CubeDirection::ALL_DIRECTIONS.map { |d| Rotation.new(face, d) }
+      mirror_normal_face = face.neighbors.first
+      around_face_rotations.product([true, false]).map do |r, m|
+        AlgorithmTransformation.new(r, m, mirror_normal_face)
       end
     end
+
+    def self.around_face_without_identity(face)
+      around_face(face).reject(&:identity?)
+    end
+  end
 end

data/lib/twisty_puzzles/axis_face_and_direction_move.rb

@@ -11,6 +11,7 @@ module TwistyPuzzles
       raise TypeError, "Unsuitable axis face #{axis_face}." unless axis_face.is_a?(Face)
       raise TypeError unless direction.is_a?(CubeDirection)
 
+      super()
       @axis_face = axis_face
       @direction = direction
     end
@@ -54,7 +55,9 @@ module TwistyPuzzles
         self
       else
         rotation_neighbors = rotation.axis_face.neighbors
-        face_index = rotation_neighbors.index(@axis_face) || raise
+        face_index = rotation_neighbors.index(@axis_face)
+        raise unless face_index
+
         new_axis_face =
           rotation_neighbors[(face_index + rotation.direction.value) % rotation_neighbors.length]
         fields = replace_once(identifying_fields, @axis_face, new_axis_face)

data/lib/twisty_puzzles/cancellation_helper.rb

@@ -135,7 +135,7 @@ module TwistyPuzzles
     def self.alg_plus_cancelled_move(algorithm, move, cube_size)
       if move.is_a?(Rotation) && (tail_rotations = num_tail_rotations(algorithm)) >= 2
         Algorithm.new(algorithm.moves[0...-tail_rotations]) +
-          cancelled_rotations(algorithm.moves[-tail_rotations..-1] + [move])
+          cancelled_rotations(algorithm.moves[-tail_rotations..] + [move])
       else
         Algorithm.new(algorithm.moves[0...-1]) +
           algorithm.moves[-1].join_with_cancellation(move, cube_size)

data/lib/twisty_puzzles/color_scheme.rb

@@ -37,7 +37,7 @@ module TwistyPuzzles
     end
 
     def part_for_colors(part_type, colors)
-      raise ArgumentError unless part_type.is_a?(Class)
+      raise ArgumentError unless part_type.is_a?(Class) && (part_type < Part)
 
       part_type.for_face_symbols(colors.map { |c| face_symbol(c) })
     end
@@ -56,7 +56,7 @@ module TwistyPuzzles
       raise ArgumentError unless colors.include?(top_color)
       raise ArgumentError unless colors.include?(front_color)
 
-      # Note: The reason that this is so complicated is that we want it to still work if the
+      # NOTE: The reason that this is so complicated is that we want it to still work if the
       # chirality corner gets exchanged.
 
       # Do the obvious and handle opposites of the top and front color so we have no
@@ -95,10 +95,12 @@ module TwistyPuzzles
 
     def chirality_corner_source_and_unknown_index(obvious_turned_face_symbols_to_colors)
       corner_matcher =
-        CornerMatcher.new(CHIRALITY_FACE_SYMBOLS.map do |s|
-                            # This will return nil for exactly one face that we don't know yet.
-                            @colors_to_face_symbols[obvious_turned_face_symbols_to_colors[s]]
-                          end)
+        CornerMatcher.new(
+          CHIRALITY_FACE_SYMBOLS.map do |s|
+            # This will return nil for exactly one face that we don't know yet.
+            @colors_to_face_symbols[obvious_turned_face_symbols_to_colors[s]]
+          end
+        )
 
       # There should be exactly one corner that gets mapped to the chirality corner.
       chirality_corner_source =

data/lib/twisty_puzzles/commutator.rb

@@ -10,6 +10,10 @@ module TwistyPuzzles
     def cancellations(other, cube_size, metric = :htm)
       algorithm.cancellations(other.algorithm, cube_size, metric)
     end
+
+    def algorithm
+      raise NotImplementedError
+    end
   end
 
   # Algorithm that is used like a commutator but actually isn't one.
@@ -17,6 +21,7 @@ module TwistyPuzzles
     def initialize(algorithm)
       raise ArgumentError unless algorithm.is_a?(Algorithm)
 
+      super()
       @algorithm = algorithm
     end
 
@@ -47,6 +52,7 @@ module TwistyPuzzles
       raise ArgumentError unless first_part.is_a?(Algorithm)
       raise ArgumentError unless second_part.is_a?(Algorithm)
 
+      super()
       @first_part = first_part
       @second_part = second_part
     end
@@ -85,6 +91,7 @@ module TwistyPuzzles
         raise ArgumentError, 'Inner commutator has to be a commutator.'
       end
 
+      super()
       @setup = setup
       @inner_commutator = inner_commutator
     end

data/lib/twisty_puzzles/compiled_algorithm.rb

@@ -26,10 +26,10 @@ module TwistyPuzzles
     def inverse
       @inverse ||=
         begin
-                              alg = self.class.new(@native.inverse)
-                              alg.inverse = self
-                              alg
-                            end
+          alg = self.class.new(@native.inverse)
+          alg.inverse = self
+          alg
+        end
     end
 
     def +(other)

data/lib/twisty_puzzles/coordinate.rb

@@ -90,7 +90,7 @@ module TwistyPuzzles
       base_coordinate = Coordinate.from_indices(
         part.solved_face, cube_size, *part.base_index_on_face(cube_size, incarnation_index)
       )
-      other_face_symbols = part.corresponding_part.face_symbols[1..-1]
+      other_face_symbols = part.corresponding_part.face_symbols[1..]
       match_coordinate_internal(base_coordinate, other_face_symbols)
     end
 
@@ -99,7 +99,7 @@ module TwistyPuzzles
     def self.solved_positions(part, cube_size, incarnation_index)
       solved_coordinate = solved_position(part, cube_size, incarnation_index)
       other_coordinates =
-        part.face_symbols[1..-1].map.with_index do |f, i|
+        part.face_symbols[1..].map.with_index do |f, i|
           face = Face.for_face_symbol(f)
           # The reverse is important for edge like parts. We are not in the same position as usual
           # solved pieces would be.
@@ -109,7 +109,7 @@ module TwistyPuzzles
           base_coordinate = Coordinate.from_indices(face, cube_size, *base_indices)
           other_face_symbols = [part.face_symbols[0]] +
                                part.corresponding_part.face_symbols[1...i + 1] +
-                               part.corresponding_part.face_symbols[i + 2..-1]
+                               part.corresponding_part.face_symbols[i + 2..]
           match_coordinate_internal(base_coordinate, other_face_symbols)
         end
       [solved_coordinate] + other_coordinates
@@ -276,7 +276,7 @@ module TwistyPuzzles
       @native = native
     end
 
-    attr_reader :native
+    attr_reader :native, :coordinate
 
     private_class_method :new
 
@@ -311,7 +311,5 @@ module TwistyPuzzles
     def face
       @face ||= Face.for_face_symbol(@native.face)
     end
-
-    attr_reader :coordinate
   end
 end

data/lib/twisty_puzzles/cube.rb

@@ -64,10 +64,18 @@ module TwistyPuzzles
       true
     end
 
+    def num_incarnations(_cube_size)
+      1
+    end
+
     def base_index_on_face(cube_size, incarnation_index)
       base_index_on_other_face(solved_face, cube_size, incarnation_index)
     end
 
+    def base_index_on_other_face(face, cube_size, incarnation_index)
+      raise NotImplementedError
+    end
+
     def self.for_face_symbols_internal(face_symbols)
       raise unless face_symbols.length == self::FACES
 
@@ -82,6 +90,10 @@ module TwistyPuzzles
       self::ELEMENTS[index]
     end
 
+    def self.valid?(_face_symbols)
+      false
+    end
+
     def <=>(other)
       @piece_index <=> other.piece_index
     end
@@ -97,7 +109,7 @@ module TwistyPuzzles
     end
 
     def inspect
-      self.class.to_s + '(' + @face_symbols.map(&:to_s).join(', ') + ')'
+      "#{self.class}(#{@face_symbols.map(&:to_s).join(', ')})"
     end
 
     def to_s
@@ -110,7 +122,7 @@ module TwistyPuzzles
     # Rotate a piece such that the given face symbol is the first face symbol.
     def rotate_face_symbol_up(face_symbol)
       index = @face_symbols.index(face_symbol)
-      raise "Part #{self} doesn't have face symbol #{c}." unless index
+      raise "Part #{self} doesn't have face symbol #{face_symbol}." unless index
 
       rotate_by(index)
     end
@@ -133,10 +145,6 @@ module TwistyPuzzles
       (0...@face_symbols.length).map { |i| rotate_by(i) }
     end
 
-    def self.create_for_face_symbols(face_symbols)
-      new(face_symbols)
-    end
-
     def self.parse(piece_description)
       face_symbols =
         piece_description.upcase.strip.split('').map do |e|
@@ -338,10 +346,6 @@ module TwistyPuzzles
       find_only(self::ELEMENTS) { |e| e.corresponding_part == corresponding_part }
     end
 
-    def self.create_for_face_symbols(face_symbols)
-      new(self::CORRESPONDING_PART_CLASS.create_for_face_symbols(face_symbols))
-    end
-
     def face_symbol
       @face_symbols[0]
     end
@@ -365,7 +369,7 @@ module TwistyPuzzles
     attr_reader :corresponding_part
 
     def inspect
-      self.class.to_s + '(' + face_symbol.to_s + ', ' + @corresponding_part.inspect + ')'
+      "#{self.class}(#{face_symbol}, #{@corresponding_part.inspect})"
     end
 
     def rotate_by(_number)
@@ -514,7 +518,7 @@ module TwistyPuzzles
     end
 
     def num_incarnations(cube_size)
-      [cube_size / 2 - 1, 0].max
+      cube_size > 3 ? cube_size / 2 - 1 : 0
     end
 
     # One index of such a piece on a on a NxN face.
@@ -530,14 +534,6 @@ module TwistyPuzzles
   class Corner < Part
     FACES = 3
 
-    def self.create_for_face_symbols(face_symbols)
-      piece_candidates =
-        face_symbols[1..-1].permutation.map do |cs|
-          new([face_symbols[0]] + cs)
-        end
-      find_only(piece_candidates, &:valid?)
-    end
-
     def self.for_face_symbols(face_symbols)
       unless face_symbols.length == FACES
         raise "Invalid number of face_symbols to create a corner: #{face_symbols.inspect}"
@@ -621,7 +617,7 @@ module TwistyPuzzles
     ELEMENTS = generate_parts
 
     def num_incarnations(cube_size)
-      [cube_size / 2 - 1, 0].max
+      cube_size > 3 ? cube_size / 2 - 1 : 0
     end
 
     # One index of such a piece on a on a NxN face.
@@ -644,10 +640,10 @@ module TwistyPuzzles
     end
 
     def num_incarnations(cube_size)
-      if cube_size.even?
+      if cube_size.even? || cube_size <= 3
         0
       else
-        [cube_size / 2 - 1, 0].max
+        cube_size / 2 - 1
       end
     end