grid_generator 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c33e9c431f4c4150d7c1c5290b62fe5affad86f9bc8bff8270af5ba6afcb0be0
-  data.tar.gz: 612becd6432cb6009d7d23aecd834a7b4d7cd0f5bca2623a81ac31bda0d83885
+  metadata.gz: 9d34bf3e232b6ba728e1dfb968dc9f176932955a8ef93d9b796c5233f6ed495d
+  data.tar.gz: f135d7666604b09947e3be7465bdeb4831b8d1b0d49aca20ee4d17346fa53e61
 SHA512:
-  metadata.gz: bc79e92443cc6d6eb1d7215ea519fdfeb93d12f7532b061e2d5f3fb3ca605d7961546d3e02a8687cbcb1a538036b54ecb42a133875b5a849df38f2f6ff203bc3
-  data.tar.gz: cc9b3660c6b3cb0a8043ecae38fcc91982989eddb09a664cb56ae0b980e327444929412bc239acc26d326c6ed2668acc8d69f97ed01589521418da4bb75fce92
+  metadata.gz: 12f2aea851e3975e67ba4ed59451f6810f1f6c9b7cecee1cac673139b1fb3c76ae2b70b8bb0b37d9bee41fd198674308536c1ae74aa657a3de9f1055c1cec034
+  data.tar.gz: dd555ce643c53dda16d03d49e6373f140cbedd6fcaccbf2a53447b72a68c781d144b6b78d4be362d7e830ce539b4b44d9a27d19b530a958f9af8f2f2d6287ec8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    grid_generator (0.2.9)
+    grid_generator (0.2.10)
       matrix (~> 0.4.2)
 
 GEM

data/lib/grid_generator/cubic/bordered_grid.rb

@@ -1,3 +1,5 @@
+require 'matrix'
+require_relative '../line'
 require_relative '../face_parser'
 require_relative 'facing_square_factory'
 
@@ -73,23 +75,33 @@ module GridGenerator
   
       def rows
         Array.new(height) do |i|
-          GridGenerator::BaseLine.new(
-            x1: x,
-            y1: unit_y(i+1),
-            x2: max_x,
-            y2: unit_y(i+1)
-          ) 
+          a = Matrix.column_vector([
+            x,
+            unit_y(i+1),
+          ])
+
+          b = Matrix.column_vector([
+            max_x,
+            unit_y(i+1)
+          ])
+
+          GridGenerator::Line.new(a: a, b: b)
         end
       end
   
       def columns 
         Array.new(width) do |i|
-          GridGenerator::BaseLine.new(
-            x1: unit_x(i+1),
-            y1: y,
-            x2: unit_x(i+1),
-            y2: max_y
-          ) 
+          a = Matrix.column_vector([
+            unit_x(i+1),
+            y,
+          ])
+
+          b = Matrix.column_vector([
+            unit_x(i+1),
+            max_y
+          ])
+
+          GridGenerator::Line.new(a: a, b: b)
         end
       end
   

data/lib/grid_generator/cubic/facing_grid.rb

@@ -1,5 +1,6 @@
+require 'matrix'
 require_relative '../face_parser'
-require_relative '../base_line'
+require_relative '../line'
 require_relative 'facing_square_factory'
 
 module GridGenerator
@@ -54,23 +55,33 @@ module GridGenerator
   
       def rows
         Array.new(height) do |i|
-          GridGenerator::BaseLine.new( 
-            x1: x,
-            y1: unit_y(i+1),
-            x2: max_x,
-            y2: unit_y(i+1)
-          ) 
+          a = Matrix.column_vector([
+            x,
+            unit_y(i+1),
+          ])
+
+          b = Matrix.column_vector([
+            max_x,
+            unit_y(i+1)
+          ])
+
+          GridGenerator::Line.new(a: a, b: b) 
         end
       end
   
       def columns 
         Array.new(width) do |i|
-          GridGenerator::BaseLine.new(
-            x1: unit_x(i+1),
-            y1: y,
-            x2: unit_x(i+1),
-            y2: max_y
-          ) 
+          a = Matrix.column_vector([
+            unit_x(i+1),
+            y,
+          ])
+
+          b = Matrix.column_vector([
+            unit_x(i+1),
+            max_y
+          ])
+
+          GridGenerator::Line.new(a: a, b: b)
         end
       end
   

data/lib/grid_generator/cubic/grid.rb

@@ -1,5 +1,5 @@
 require 'matrix'
-require_relative '../base_line'
+require_relative '../line'
 
 module GridGenerator
   module Cubic
@@ -93,23 +93,33 @@ module GridGenerator
   
       def rows
         Array.new(height) do |i|
-          GridGenerator::BaseLine.new(
-            x1: row_line_start(i+1)[0,0],
-            y1: row_line_start(i+1)[1,0],
-            x2: row_line_end(i+1)[0,0],
-            y2: row_line_end(i+1)[1,0]
-          )
+          a = Matrix.column_vector([
+            row_line_start(i+1)[0,0],
+            row_line_start(i+1)[1,0],
+          ])
+
+          b = Matrix.column_vector([
+            row_line_end(i+1)[0,0],
+            row_line_end(i+1)[1,0]
+          ])
+
+          GridGenerator::Line.new(a: a, b: b)
         end
       end
   
       def columns 
         Array.new(width) do |i|
-          GridGenerator::BaseLine.new(
-            x1: column_line_start(i+1)[0,0],
-            y1: column_line_start(i+1)[1,0],
-            x2: column_line_end(i+1)[0,0],
-            y2: column_line_end(i+1)[1,0]
-          )
+          a = Matrix.column_vector([
+            column_line_start(i+1)[0,0],
+            column_line_start(i+1)[1,0],
+          ])
+
+          b = Matrix.column_vector([
+            column_line_end(i+1)[0,0],
+            column_line_end(i+1)[1,0]
+          ])
+
+          GridGenerator::Line.new(a: a, b: b)
         end
       end
   

data/lib/grid_generator/line.rb

@@ -0,0 +1,32 @@
+module GridGenerator
+  class Line
+    def initialize(a:, b:)
+      @a, @b = a, b
+    end
+
+    attr_reader :a, :b
+
+    def ==(other)
+      self.class == other.class &&
+        self.a == other.a &&
+        self.b == other.b
+    end
+
+    def x1
+      a[0,0]
+    end
+
+    def y1
+      a[1,0]
+    end
+
+    def x2
+      b[0,0]
+    end
+
+    def y2
+      b[1,0]
+    end
+  end
+end
+

data/lib/grid_generator/megaminx/face_projection.rb

@@ -1,6 +1,7 @@
 require 'matrix'
 require_relative '../rotator'
 require_relative '../helper'
+require_relative '../line'
 
 module GridGenerator
   module Megaminx
@@ -90,14 +91,9 @@ module GridGenerator
       def connecting_lines
         pentagon_points.each_with_index.map do |p, i|
           d = decagon_points[i*2]
-          offset_p = p + offset
-          offset_d = d + offset
-          GridGenerator::BaseLine.new(
-            x1: offset_p[0,0],
-            y1: offset_p[1,0],
-            x2: offset_d[0,0],
-            y2: offset_d[1,0]
-          )
+          line_start = p + offset
+          line_end = d + offset
+          GridGenerator::Line.new(a: line_start, b: line_end) 
         end
       end
       
@@ -115,12 +111,7 @@ module GridGenerator
           line_start = ab_intervals.last + offset
           line_end = cd_intervals.first + offset
 
-          GridGenerator::BaseLine.new(
-            x1: line_start[0,0],
-            y1: line_start[1,0],
-            x2: line_end[0,0],
-            y2: line_end[1,0]
-          )
+          GridGenerator::Line.new(a: line_start, b: line_end)
         end
       end
 
@@ -138,12 +129,7 @@ module GridGenerator
           line_start = ab_intervals.last + offset
           line_end = cd_intervals.first + offset
 
-          GridGenerator::BaseLine.new(
-            x1: line_start[0,0],
-            y1: line_start[1,0],
-            x2: line_end[0,0],
-            y2: line_end[1,0]
-          )
+          GridGenerator::Line.new(a: line_start, b: line_end)
         end
       end
 

data/lib/grid_generator/pyraminx/face.rb

@@ -1,6 +1,7 @@
 require_relative 'triangle_factory'
 require_relative '../rotator'
 require_relative '../scaler'
+require_relative '../line'
 
 module GridGenerator
   module Pyraminx
@@ -78,12 +79,7 @@ module GridGenerator
           transformed_1 = rotator.rotate(scaled_1) + offset
           transformed_2 = rotator.rotate(scaled_2) + offset
 
-          GridGenerator::BaseLine.new( 
-            x1: transformed_1[0,0],
-            y1: transformed_1[1,0],
-            x2: transformed_2[0,0],
-            y2: transformed_2[1,0]
-          )
+          GridGenerator::Line.new(a: transformed_1, b: transformed_2) 
         end
       end
 
@@ -112,12 +108,7 @@ module GridGenerator
           transformed_1 = rotator.rotate(scaled_1) + offset
           transformed_2 = rotator.rotate(scaled_2) + offset
 
-          GridGenerator::BaseLine.new( 
-            x1: transformed_1[0,0],
-            y1: transformed_1[1,0],
-            x2: transformed_2[0,0],
-            y2: transformed_2[1,0]
-          )
+          GridGenerator::Line.new(a: transformed_1, b: transformed_2) 
         end
       end
 
@@ -146,12 +137,7 @@ module GridGenerator
           transformed_1 = rotator.rotate(scaled_1) + offset
           transformed_2 = rotator.rotate(scaled_2) + offset
 
-          GridGenerator::BaseLine.new( 
-            x1: transformed_1[0,0],
-            y1: transformed_1[1,0],
-            x2: transformed_2[0,0],
-            y2: transformed_2[1,0]
-          )
+          GridGenerator::Line.new(a: transformed_1, b: transformed_2) 
         end
       end
 

data/lib/grid_generator/skewb/left_skewb_grid.rb

@@ -1,4 +1,4 @@
-require_relative '../base_line'
+require_relative '../line'
 require_relative 'skewb_grid'
 require_relative 'left_element_factory'
 
@@ -20,23 +20,33 @@ module GridGenerator
   
       def rows
         Array.new(side_size) do |i|
-          GridGenerator::BaseLine.new( 
-            x1: x + (2*i)*units,
-            y1: y + (3*i+2)*units,
-            x2: x + (2*i+2)*units,
-            y2: y + (3*i+1)*units
-          ) 
+          a = Matrix.column_vector([
+            x + (2*i)*units,
+            y + (3*i+2)*units,
+          ])
+
+          b = Matrix.column_vector([
+            x + (2*i+2)*units,
+            y + (3*i+1)*units
+          ])
+
+          GridGenerator::Line.new(a: a, b: b) 
         end
       end
   
       def columns
         Array.new(side_size) do |i|
-          GridGenerator::BaseLine.new( 
-            x1: x + (2*i)*units,
-            y1: y + (-1*i+2)*units,
-            x2: x + (i+1)*2*units,
-            y2: y + (-1*i+5)*units
-          ) 
+          a = Matrix.column_vector([
+            x + (2*i)*units,
+            y + (-1*i+2)*units,
+          ])
+
+          b = Matrix.column_vector([
+            x + (i+1)*2*units,
+            y + (-1*i+5)*units
+          ])
+
+          GridGenerator::Line.new(a: a, b: b) 
         end
       end
     end

data/lib/grid_generator/skewb/right_skewb_grid.rb

@@ -1,3 +1,4 @@
+require_relative '../line'
 require_relative '../base_element'
 require_relative 'skewb_grid.rb'
 require_relative 'right_element_factory.rb'
@@ -20,23 +21,33 @@ module GridGenerator
   
       def rows
         Array.new(side_size) do |i|
-          GridGenerator::BaseLine.new( 
-            x1: x + (2*i)*units,
-            y1: y + (i+4)*units,
-            x2: x + (2*i+2)*units,
-            y2: y + (i+1)*units
-          ) 
+          a = Matrix.column_vector([
+            x + (2*i)*units,
+            y + (i+4)*units,
+          ])
+
+          b = Matrix.column_vector([
+            x + (2*i+2)*units,
+            y + (i+1)*units
+          ])
+
+          GridGenerator::Line.new(a: a, b: b) 
         end
       end
   
       def columns
         Array.new(side_size) do |i|
-          GridGenerator::BaseLine.new( 
-            x1: x + (2*i)*units,
-            y1: y + (-3*i+4)*units,
-            x2: x + (i+1)*2*units,
-            y2: y + (-3*i+5)*units
-          ) 
+          a = Matrix.column_vector([
+            x + (2*i)*units,
+            y + (-3*i+4)*units,
+          ])
+
+          b = Matrix.column_vector([
+            x + (i+1)*2*units,
+            y + (-3*i+5)*units
+          ])
+
+          GridGenerator::Line.new(a: a, b: b) 
         end
       end
     end

data/lib/grid_generator/skewb/top_skewb_grid.rb

@@ -1,3 +1,4 @@
+require_relative '../line'
 require_relative '../base_element'
 require_relative 'skewb_grid'
 require_relative 'top_element_factory'
@@ -20,23 +21,33 @@ module GridGenerator
   
       def rows
         Array.new(side_size) do |i|
-          GridGenerator::BaseLine.new( 
-            x1: x + 2*units,
-            y1: y + (2*i+1)*units,
-            x2: x + 6*units,
-            y2: y + (2*i+1)*units
-          ) 
+          a = Matrix.column_vector([
+            x + 2*units,
+            y + (2*i+1)*units,
+          ])
+
+          b = Matrix.column_vector([
+            x + 6*units,
+            y + (2*i+1)*units
+          ])
+
+          GridGenerator::Line.new(a: a, b: b) 
         end
       end
   
       def columns
         Array.new(side_size) do |i|
-          GridGenerator::BaseLine.new( 
-            x1: x + (4*i+2)*units,
-            y1: y + units,
-            x2: x + (4*i+2)*units,
-            y2: y + 3*units
-          ) 
+          a = Matrix.column_vector([
+            x + (4*i+2)*units,
+            y + units,
+          ])
+
+          b = Matrix.column_vector([
+            x + (4*i+2)*units,
+            y + 3*units
+          ])
+
+          GridGenerator::Line.new(a: a, b: b) 
         end
       end
     end

data/lib/grid_generator/square_one/face.rb

@@ -1,4 +1,4 @@
-require_relative '../base_line'
+require_relative '../line'
 require_relative '../square_one_face_parser'
 require_relative 'element_factory'
 
@@ -42,21 +42,31 @@ module GridGenerator
       end
   
       def forward_axis
-        GridGenerator::BaseLine.new( 
-          x1: x+half_face_size+half_edge_width,
-          y1: y,
-          x2: x+half_face_size-half_edge_width,
-          y2: y+face_size
-        ) 
+        a = Matrix.column_vector([
+          x+half_face_size+half_edge_width,
+          y,
+        ])
+
+        b = Matrix.column_vector([
+          x+half_face_size-half_edge_width,
+          y+face_size
+        ])
+
+        GridGenerator::Line.new(a: a, b: b) 
       end
   
       def back_axis
-        GridGenerator::BaseLine.new( 
-          x1: x+half_face_size-half_edge_width,
-          y1: y,
-          x2: x+half_face_size+half_edge_width,
-          y2: y+face_size
-        ) 
+        a = Matrix.column_vector([
+          x+half_face_size-half_edge_width,
+          y,
+        ])
+
+        b = Matrix.column_vector([
+          x+half_face_size+half_edge_width,
+          y+face_size
+        ])
+
+        GridGenerator::Line.new(a: a, b: b) 
       end
   
       def element_shapes

data/lib/grid_generator/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GridGenerator
-  VERSION = "0.2.9"
+  VERSION = "0.2.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grid_generator
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - Mark Humphreys
@@ -46,7 +46,6 @@ files:
 - lib/grid_generator/arrows/horizontal_arrow.rb
 - lib/grid_generator/arrows/vertical_arrow.rb
 - lib/grid_generator/base_element.rb
-- lib/grid_generator/base_line.rb
 - lib/grid_generator/cubic/bordered_grid.rb
 - lib/grid_generator/cubic/facing_grid.rb
 - lib/grid_generator/cubic/facing_square_factory.rb
@@ -59,6 +58,7 @@ files:
 - lib/grid_generator/cubic/units_factory.rb
 - lib/grid_generator/face_parser.rb
 - lib/grid_generator/helper.rb
+- lib/grid_generator/line.rb
 - lib/grid_generator/megaminx/common.rb
 - lib/grid_generator/megaminx/element_factory.rb
 - lib/grid_generator/megaminx/face.rb

data/lib/grid_generator/base_line.rb

@@ -1,26 +0,0 @@
-module GridGenerator
-  class BaseLine
-    def initialize(x1:, y1:, x2:, y2:)
-      @x1, @y1 = x1, y1
-      @x2, @y2 = x2, y2
-    end
-
-    attr_reader :x1, :y1, :x2, :y2
-
-    def ==(other)
-      self.x1 == other.x1 &&
-        self.y1 == other.y1 &&
-        self.x2 == other.x2 &&
-        self.y2 == other.y2
-    end
-
-    def as_json
-      {
-        "x1" => x1,
-        "y1" => y1,
-        "x2" => x2,
-        "y2" => y2
-      }
-    end
-  end
-end