twisty_puzzles 0.0.11 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f6166de8734039f856869be9f20b6109c194556094bc281ae3138ada4a1ad27
-  data.tar.gz: 6a19cc1ad482ec49831c057d944b9055f70c206882ac618892b0336e8d047e3b
+  metadata.gz: d5631e9c30819f3520d04ed81aa9b1ceebbee7a3da5c3b51bf2a81947f8fb3a1
+  data.tar.gz: fc4769b6c1ebab5d14cb64ddb3e39356a408750d1d0c7954d4929156296b9f9e
 SHA512:
-  metadata.gz: 3ba31f44cb0df6f836d9a9b9908550cd2d6ca0ede672d4784f084b609e1249fd0e8e0f8d6cdc0b09e8faba6a462d49966c698b9d5601a4901aa0ee4eb8bc95c1
-  data.tar.gz: 16727e63c37191c99ed1c185c851c8a541c97f110505f2c6ae5eeeabb186c11c35173d35c2441cc8c15318dd88f380656afc04690d5bb4eaa9b359b9a2725de3
+  metadata.gz: c941aaef4dbf2bc8d580d712d669042061c20670aadcf2ee353f353eae4eb31713de9d4791f6d8126e4427ef9e7125562e26b53c85f0a92e09bfe120e8f24f04
+  data.tar.gz: 5e943e567b069fd2b2e21c77fdc7a48ad3e81fb365832439cd1f402da838b5771bc7af4b2293bf635fa1b6de158ddfbea78f9981e690ce3e72a6149c6b042bd2

data/lib/twisty_puzzles/algorithm.rb

@@ -133,9 +133,12 @@ module TwistyPuzzles
 
     def *(other)
       raise TypeError unless other.is_a?(Integer)
-      raise ArgumentError if other.negative?
 
-      self.class.new(@moves * other)
+      if other.negative?
+        inverse * -other
+      else
+        self.class.new(@moves * other)
+      end
     end
 
     def compiled_for_skewb

data/lib/twisty_puzzles/commutator.rb

@@ -83,6 +83,21 @@ module TwistyPuzzles
     end
   end
 
+  # Slash commutator of the form A B A2 B' A.
+  class SlashCommutator < PureCommutator
+    def inverse
+      SlashCommutator.new(first_part.inverse, second_part)
+    end
+
+    def to_s
+      "[#{@first_part}/#{@second_part}]"
+    end
+
+    def algorithm
+      first_part + second_part + (first_part * 2) + second_part.inverse + first_part
+    end
+  end
+
   # Setup commutator of the form A B A'.
   class SetupCommutator < Commutator
     def initialize(setup, inner_commutator)

data/lib/twisty_puzzles/coordinate.rb

@@ -28,7 +28,7 @@ module TwistyPuzzles
 
     # Middle coordinate for uneven numbers, the one before for even numbers
     def self.middle_or_before(cube_size)
-      cube_size - cube_size / 2 - 1
+      cube_size - (cube_size / 2) - 1
     end
 
     # Middle coordinate for uneven numbers, the one after for even numbers
@@ -38,7 +38,7 @@ module TwistyPuzzles
 
     # The last coordinate that is strictly before the middle
     def self.last_before_middle(cube_size)
-      cube_size / 2 - 1
+      (cube_size / 2) - 1
     end
 
     def self.canonicalize(index, cube_size)
@@ -310,7 +310,7 @@ module TwistyPuzzles
 
     def self.for_corner(corner)
       native = Native::SkewbCoordinate.for_corner(corner.face_symbols)
-      new(Face.for_face_symbol(corner.face_symbols.first), 1 + corner.piece_index % 4, native)
+      new(Face.for_face_symbol(corner.face_symbols.first), 1 + (corner.piece_index % 4), native)
     end
 
     def hash

data/lib/twisty_puzzles/cube.rb

@@ -34,6 +34,14 @@ module TwistyPuzzles
 
     attr_reader :piece_index, :face_symbols
 
+    def self.min_parseable_face_symbols
+      self::FACES
+    end
+
+    def self.max_parseable_face_symbols
+      self::FACES
+    end
+
     def self.generate_parts
       valid_face_symbol_combinations =
         FACE_SYMBOLS.permutation(self::FACES).select do |p|
@@ -147,7 +155,7 @@ module TwistyPuzzles
 
     def self.parse(piece_description)
       face_symbols =
-        piece_description.upcase.strip.split('').map do |e|
+        piece_description.upcase.strip.chars.map do |e|
           FACE_SYMBOLS[FACE_NAMES.index(e)]
         end
       for_face_symbols(face_symbols)
@@ -327,6 +335,14 @@ module TwistyPuzzles
   class MoveableCenter < Part
     FACES = 1
 
+    def self.min_parseable_face_symbols
+      self::CORRESPONDING_PART_CLASS::FACES
+    end
+
+    def self.max_parseable_face_symbols
+      self::CORRESPONDING_PART_CLASS::FACES
+    end
+
     def self.min_cube_size
       4
     end
@@ -467,11 +483,15 @@ module TwistyPuzzles
       false
     end
 
+    def self.max_parseable_face_symbols
+      FACES + 1
+    end
+
     def self.for_face_symbols(face_symbols)
       # One additional face symbol is usually mentioned for wings.
       raise unless face_symbols.length == FACES || face_symbols.length == FACES + 1
 
-      if face_symbols.length == 3
+      if face_symbols.length == FACES + 1
         for_corner_face_symbols(face_symbols)
       else
         for_face_symbols_internal(face_symbols)
@@ -518,7 +538,7 @@ module TwistyPuzzles
     end
 
     def num_incarnations(cube_size)
-      cube_size > 3 ? cube_size / 2 - 1 : 0
+      cube_size > 3 ? (cube_size / 2) - 1 : 0
     end
 
     # One index of such a piece on a on a NxN face.
@@ -617,7 +637,7 @@ module TwistyPuzzles
     ELEMENTS = generate_parts
 
     def num_incarnations(cube_size)
-      cube_size > 3 ? cube_size / 2 - 1 : 0
+      cube_size > 3 ? (cube_size / 2) - 1 : 0
     end
 
     # One index of such a piece on a on a NxN face.
@@ -643,7 +663,7 @@ module TwistyPuzzles
       if cube_size.even? || cube_size <= 3
         0
       else
-        cube_size / 2 - 1
+        (cube_size / 2) - 1
       end
     end
 

data/lib/twisty_puzzles/cube_move.rb

@@ -68,8 +68,8 @@ module TwistyPuzzles
 
     def equivalent_slice_move?(other, cube_size)
       cube_size == 3 && other.slice_index == 1 &&
-        (@axis_face == other.axis_face && @direction == other.direction ||
-         @axis_face == other.axis_face.opposite && @direction == other.direction.inverse)
+        ((@axis_face == other.axis_face && @direction == other.direction) ||
+         (@axis_face == other.axis_face.opposite && @direction == other.direction.inverse))
     end
   end
 

data/lib/twisty_puzzles/cube_print_helper.rb

@@ -72,9 +72,9 @@ module TwistyPuzzles
     def skewb_ascii_art_line(first_color, middle_color, last_color, num_first_color)
       raise if num_first_color > SKEWB_FACE_SIZE / 2
 
-      first_color * num_first_color +
-        middle_color * (SKEWB_FACE_SIZE - 2 * num_first_color) +
-        last_color * num_first_color
+      (first_color * num_first_color) +
+        (middle_color * (SKEWB_FACE_SIZE - (2 * num_first_color))) +
+        (last_color * num_first_color)
     end
 
     def skewb_ascii_art(center_color, corner_colors)
@@ -116,7 +116,7 @@ module TwistyPuzzles
       front_face = face_lines(cube_state, :F, 1, 3) { |c| color_character(c, color_mode) }
       right_face = face_lines(cube_state, :R, 1, 3) { |c| color_character(c, color_mode) }
       pll_line = front_face.first + right_face.first
-      (top_face + [pll_line] * 3).join("\n")
+      (top_face + ([pll_line] * 3)).join("\n")
     end
 
     def cube_string(cube_state, color_mode)
@@ -150,7 +150,7 @@ module TwistyPuzzles
     end
 
     def pad_lines(lines, padding)
-      lines.map { |line| empty_name * padding + line }
+      lines.map { |line| (empty_name * padding) + line }
     end
 
     def zip_concat_lines(*args)

data/lib/twisty_puzzles/parser.rb

@@ -16,6 +16,12 @@ module TwistyPuzzles # rubocop:disable Style/Documentation
     OPENING_PAREN = '('
     CLOSING_BRACKET = ']'
     CLOSING_PAREN = ')'
+    SLASH = '/'
+    COMMA = ','
+    SETUP_SEPARATORS = %w[; :].freeze
+    PURE_SEPARATORS = [SLASH, COMMA].freeze
+    SEPARATORS = (SETUP_SEPARATORS + PURE_SEPARATORS).freeze
+
     TIMES = '*'
 
     def initialize(alg_string, move_parser)
@@ -77,8 +83,8 @@ module TwistyPuzzles # rubocop:disable Style/Documentation
     end
 
     # Parses at least one move.
-    def parse_nonempty_moves
-      moves = parse_moves
+    def parse_nonempty_moves_with_triggers
+      moves = parse_moves_with_triggers
       complain('move') if moves.empty?
       moves
     end
@@ -117,10 +123,26 @@ module TwistyPuzzles # rubocop:disable Style/Documentation
       if @scanner.peek(1) == OPENING_BRACKET
         parse_commutator_internal
       else
-        FakeCommutator.new(parse_moves_with_triggers)
+        parse_commutator_no_brackets
       end
     end
 
+    def parse_commutator_no_brackets
+      setup_or_first_part_or_algorithm = parse_moves_with_triggers
+      skip_spaces
+      if @scanner.eos? || !SEPARATORS.include?(@scanner.peek(1))
+        return FakeCommutator.new(setup_or_first_part_or_algorithm)
+      end
+
+      setup_or_first_part = setup_or_first_part_or_algorithm
+      complain('move') if setup_or_first_part.empty?
+      separator = parse_separator
+      comm = parse_commutator_internal_after_separator(setup_or_first_part, separator)
+      skip_spaces
+      complain('end of commutator') unless @scanner.eos?
+      comm
+    end
+
     def parse_algorithm
       skip_spaces
       parse_moves_with_triggers
@@ -131,40 +153,77 @@ module TwistyPuzzles # rubocop:disable Style/Documentation
       if @scanner.peek(1) == OPENING_BRACKET
         parse_pure_commutator
       else
-        FakeCommutator.new(parse_moves_with_triggers)
+        parse_pure_commutator_no_brackets
       end
     end
 
     def parse_pure_commutator
       skip_spaces
       parse_open_bracket
-      first_part = parse_nonempty_moves
+      first_part = parse_nonempty_moves_with_triggers
       skip_spaces
-      complain('middle of pure commutator') unless @scanner.getch == ','
-      second_part = parse_nonempty_moves
+      separator = parse_pure_separator
+      second_part = parse_nonempty_moves_with_triggers
       skip_spaces
       parse_close_bracket
-      PureCommutator.new(first_part, second_part)
+      pseudo_pure_commutator(separator, first_part, second_part)
+    end
+
+    def parse_pure_commutator_no_brackets
+      first_part_or_algorithm = parse_moves_with_triggers
+      skip_spaces
+      if @scanner.eos? || !PURE_SEPARATORS.include?(@scanner.peek(1))
+        return FakeCommutator.new(first_part_or_algorithm)
+      end
+
+      first_part = first_part_or_algorithm
+      complain('move') if first_part.empty?
+      separator = parse_pure_separator
+      second_part = parse_nonempty_moves_with_triggers
+      skip_spaces
+      pseudo_pure_commutator(separator, first_part, second_part)
+    end
+
+    def parse_pure_separator
+      separator = @scanner.getch
+      complain('middle of pure commutator') unless PURE_SEPARATORS.include?(separator)
+      separator
     end
 
     def parse_commutator_internal_after_separator(setup_or_first_part, separator)
-      if [':', ';'].include?(separator)
+      if SETUP_SEPARATORS.include?(separator)
         inner_commutator = parse_setup_commutator_inner
         SetupCommutator.new(setup_or_first_part, inner_commutator)
-      elsif separator == ','
-        second_part = parse_nonempty_moves
-        PureCommutator.new(setup_or_first_part, second_part)
+      elsif PURE_SEPARATORS.include?(separator)
+        second_part = parse_nonempty_moves_with_triggers
+        pseudo_pure_commutator(separator, setup_or_first_part, second_part)
       else
         complain('end of setup or middle of pure commutator') unless @scanner.eos?
       end
     end
 
+    def pseudo_pure_commutator(separator, first_part, second_part)
+      if separator == COMMA
+        PureCommutator.new(first_part, second_part)
+      elsif separator == SLASH
+        SlashCommutator.new(first_part, second_part)
+      else
+        complain('middle of pure commutator') unless PURE_SEPARATORS.include?(separator)
+      end
+    end
+
+    def parse_separator
+      separator = @scanner.getch
+      complain('separator between commutator parts') unless SEPARATORS.include?(separator)
+      separator
+    end
+
     def parse_commutator_internal
       skip_spaces
       parse_open_bracket
-      setup_or_first_part = parse_nonempty_moves
+      setup_or_first_part = parse_nonempty_moves_with_triggers
       skip_spaces
-      separator = @scanner.getch
+      separator = parse_separator
       comm = parse_commutator_internal_after_separator(setup_or_first_part, separator)
       skip_spaces
       parse_close_bracket

data/lib/twisty_puzzles/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twisty_puzzles
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.15
 platform: ruby
 authors:
 - Bernhard F. Brodowsky
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-04 00:00:00.000000000 Z
+date: 2021-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize