barretina 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a14199b8ed783109c50e50c1e6450a253d569175f59c9c7e617f426c066f90e
-  data.tar.gz: d876a0ae30b5e760cb7092d79dc853e0aff3356ceadfa854f09344bddedac232
+  metadata.gz: ffc7c0e9a4bd67952488271345c86b2ac78177de604ca0c66df617c2243c8be4
+  data.tar.gz: 578af134723316525a9c79de0094c8395d43671e67ea17cbe19c74a1d2b5d492
 SHA512:
-  metadata.gz: ab8ed15ac6d25231aba161fd7012650228f5e3bb2d99891b5216ba9748eb686b72a2141ad97178174cf351abdb8439af580c0bb9fd0e2a574b0e559ff359ccea
-  data.tar.gz: a4b839a148076f4fc73fbb811301b32946ea9fcd2f53e01fd16f2d93620a2c97e23ba80d62874ca25fe467b28e344eeac10840deba89e62b3871c6ca865a3810
+  metadata.gz: 869f990d92768bf90b2cdbafddc91afba9bac0220bce72e8967c6413e44e329b54e6f26f05a78202a4861f990d37c83540decd03666a4032be840033e78ad4e5
+  data.tar.gz: 1769112e3d0abe5967e7a11d425481d3156d44d5d515f98c3a89e9158be7513e9b7a58498f335ff2d4f42906b039f6164cff569f32e034272d354d5e24120204

data/Gemfile

@@ -4,6 +4,4 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "ruby2d", "~> 0.12.1"
-
-gem "irb", "~> 1.15"
+gem "minitest", "~> 5.25"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    barretina (0.1.0)
+    barretina (0.1.2)
       irb (~> 1.15)
       ruby2d (~> 0.12.1)
 
@@ -9,22 +9,23 @@ GEM
   remote: https://rubygems.org/
   specs:
     date (3.4.1)
-    erb (5.0.1)
-    io-console (0.8.0)
+    erb (5.0.2)
+    io-console (0.8.1)
     irb (1.15.2)
       pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
+    minitest (5.25.5)
     pp (0.6.2)
       prettyprint
     prettyprint (0.2.0)
     psych (5.2.6)
       date
       stringio
-    rdoc (6.14.0)
+    rdoc (6.14.2)
       erb
       psych (>= 4.0.0)
-    reline (0.6.1)
+    reline (0.6.2)
       io-console (~> 0.5)
     ruby2d (0.12.1)
     stringio (3.1.7)
@@ -35,8 +36,7 @@ PLATFORMS
 
 DEPENDENCIES
   barretina!
-  irb (~> 1.15)
-  ruby2d (~> 0.12.1)
+  minitest (~> 5.25)
 
 BUNDLED WITH
    2.6.9

data/README.md

@@ -1,4 +1,4 @@
-Barretina
+Barretina v0.2.0
 =========
 **WORK IN PROGRESS**
 
@@ -18,6 +18,13 @@ I write in a diary every big commit, and I summarize the evolution of the projec
 
 [If you feel some interest, take a look to it now: it's free!](diary.md)
 
+## Index of contents
+
+- [BCM: Barretina Console Mode](#bcm-barretina-console-mode)
+    - [Run BCM](#run-bcm)
+- [Tests](#tests)
+    - [Run tests](#run-tests)
+
 ## BCM: Barretina Console Mode
 
 BCM is a way to run all Barretina's code without the graphic interface. I created with the intention to test while I work on this project.
@@ -38,3 +45,26 @@ bcm:002:0> q = VectorSpace::Vector.new 2, -3
 bcm:003:0> p + q
 -> #<Vector (3, 2)>
 ```
+
+## Tests
+
+I use [Minitest](https://github.com/minitest/minitest) to create some unit tests.
+
+### Run tests
+
+At the moment, you can run the tests manually as a Ruby file. Eg:
+
+```
+$ ruby test/barretina/vector_space/test_vector.rb
+Run options: --seed 5323
+
+# Running:
+
+.........
+
+Finished in 0.003157s, 2851.0290 runs/s, 19006.8599 assertions/s.
+
+9 runs, 60 assertions, 0 failures, 0 errors, 0 skips
+```
+
+Eventually, I will reorganize in a Rake file.

data/bin/barretina

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'barretina'
+require 'barretina/canvas'
+
+set(
+  title: Barretina::TITLE,
+  background: '#AAAAAA',
+  diagnostics: true,
+  width: 1000,
+  height: 600,
+  # viewport_width: 500,
+  # viewport_height: 300,
+  resizable: true
+)
+
+show

data/bin/bcm

@@ -5,6 +5,8 @@ require 'bundler/setup'
 require 'barretina'
 require 'irb'
 
+include Barretina::VectorSpace
+include Barretina::VectorSpace2D
 
 puts "\e[1mBCM\e[0m - Barretina Console Mode"
 

data/lib/barretina/canvas.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require 'ruby2d'

data/lib/barretina/vector_space/line.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Barretina
+  module VectorSpace
+    class Line
+      attr_accessor :p, :q
+
+      def initialize p, q
+        @p = p
+        @q = q
+      end
+
+      def length
+        v = @q - @p
+        Math.sqrt( v.coordenates.map{ |n| n**2 }.sum )
+      end
+
+      def == line
+        @p == line.p && @q == line.q
+      end
+
+      def != line
+        @p != line.p || @q != line.q
+      end
+
+      def to_s
+        "#{@p}-#{@q}"
+      end
+
+      private
+        def inspect
+          "#<Line #{self}>"
+        end
+    end
+  end
+end

data/lib/barretina/vector_space/vector.rb

@@ -1,57 +1,65 @@
 # frozen_string_literal: true
 
-module VectorSpace
-  class Vector
-    attr_accessor :coordenates
-
-    def initialize *args
-      @coordenates = args
-    end
-
-    def dimension
-      coordenates.count
-    end
+module Barretina
+  module VectorSpace
+    class Vector
+      def self.[](*args)
+        Vector.new *args
+      end
 
-    def + vector
-      add(vector, &:sum)
-    end
+      attr_accessor :coordenates
 
-    def - vector
-      add(vector) { |array| array.inject(:-) }
-    end
-
-    def * scalar
-      Vector.new *coordenates.map { |c| c * scalar }
-    rescue => e
-      raise "Scalar value must be a Numeric instance (recomended Integer or Float), not a #{scalar.class}" unless scalar.is_a? Numeric
-      raise e
-    end
+      def initialize *args
+        @coordenates = args
+      end
 
-    def == vector
-      coordenates == vector.coordenates
-    rescue => e
-      raise "Impossible compare a #{vector.class} to a SpaceVector::Vector" unless vector.is_a? Vector
-      raise e
-    end
+      def dimension
+        coordenates.count
+      end
 
-    def != vector
-      !(self==vector)
-    end
+      def + vector
+        add(vector, &:sum)
+      end
 
-    def to_s
-      "(#{coordenates.join(', ')})"
-    end
+      def - vector
+        add(vector) { |array| array.inject(:-) }
+      end
 
-    private
-      def inspect
-        "#<Vector #{self}>"
+      def * scalar
+        Vector.new *coordenates.map { |c| c * scalar }
+      rescue => e
+        raise "Scalar value must be a Numeric instance (recomended Integer or Float), not a #{scalar.class}" unless scalar.is_a? Numeric
+        raise e
       end
 
-      def add vector, &block
-        Vector.new *[coordenates, vector.coordenates].transpose.map(&block)
+      def == vector
+        coordenates == vector.coordenates
       rescue => e
-        raise "Impossible add or substract a #{vector.class} to a SpaceVector::Vector" unless vector.is_a? Vector
+        raise "Impossible compare a #{vector.class} to a SpaceVector::Vector" unless vector.is_a? Vector
         raise e
       end
+
+      def != vector
+        !(self==vector)
+      end
+
+      def to_s
+        "(#{coordenates.join(', ')})"
+      end
+
+      private
+        def inspect
+          "#<Vector #{self}>"
+        end
+
+        def add vector, &block
+          Vector.new *[coordenates, vector.coordenates].transpose.map(&block)
+        rescue IndexError => e
+          raise IndexError, "Impossible add or substract vectors with different dimesions"
+        rescue => e
+          raise "Impossible add or substract a #{vector.class} to a SpaceVector::Vector" unless vector.is_a? Vector
+          raise e
+        end
+    end
   end
 end

data/lib/barretina/vector_space.rb

@@ -1,5 +1,9 @@
-require_relative 'vector_space/extenders'
+# frozen_string_literal: true
+
 require_relative 'vector_space/vector'
+require_relative 'vector_space/line'
 
-module VectorSpace
+module Barretina
+  module VectorSpace
+  end
 end

data/lib/barretina/vector_space_2d/line_2d.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Barretina
+  module VectorSpace2D
+    class Line2D < VectorSpace::Line
+      def length
+        v = @q - @p
+        Math.sqrt( v.x**2 + v.y**2 )
+      end
+    end
+  end
+end

data/lib/barretina/vector_space_2d/polygon.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Barretina
+  module VectorSpace2D
+    class Polygon
+      attr_reader :lines, :vertices
+
+      def initialize *vertices
+        @vertices = vertices
+        generate_lines
+      end
+
+      def add_vertex vector
+        @vertices << vector
+        generate_lines
+      end
+
+      def insert_vertex vector, index
+        @vertices.insert index, vector
+        generate_lines
+      end
+
+      private
+        def generate_lines
+          @lines = []
+          @vertices.each_with_index do |v, i|
+            @lines << Line2D.new(v, @vertices[i-1])
+          end
+        end
+
+        def inspect
+          "#<Polygon #{@vertices.join(' ')}>"
+        end
+    end
+  end
+end

data/lib/barretina/vector_space_2d/vector_2d.rb

@@ -0,0 +1,71 @@
+module Barretina
+  module VectorSpace2D
+    class Vector2D < VectorSpace::Vector
+      class << self
+        def [](x, y)
+          Vector2D.new x, y
+        end
+
+        def zero
+          Vector2D.new 0, 0
+        end
+      end
+
+      def initialize x, y
+        @coordenates = [x, y]
+      end
+
+      def coordenates= coor
+        @coordenates = coor[0..1]
+      end
+
+      def x
+        @coordenates[0]
+      end
+
+      def y
+        @coordenates[1]
+      end
+
+      def x= x
+        @coordenates[0] = x
+      end
+
+      def y= y
+        @coordenates[1] = y
+      end
+
+      def + vector
+        Vector2D.new( x + vector.x, y + vector.y )
+      end
+
+      def - vector
+        Vector2D.new( x - vector.x, y - vector.y )
+      end
+
+      def * scalar
+        Vector2D.new( x * scalar, y * scalar)
+      end
+
+      def == vector
+        x == vector.x && y == vector.y
+      end
+
+      def != vector
+        x != vector.x || y != vector.y
+      end
+
+      def add! vector
+        @coordenates = [ x + vector.x, y + vector.y ]
+      end
+
+      def substract! vector
+        @coordenates = [ x - vector.x, y - vector.y ]
+      end
+
+      def scalar! scalar
+        @coordenates = [ x * scalar, y * scalar ]
+      end
+    end
+  end
+end

data/lib/barretina/vector_space_2d.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require_relative 'vector_space'
+require_relative 'vector_space_2d/vector_2d'
+require_relative 'vector_space_2d/line_2d'
+require_relative 'vector_space_2d/polygon'
+
+module Barretina
+  module VectorSpace2D
+  end
+end

data/lib/barretina/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Barretina
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/barretina.rb

@@ -1 +1,8 @@
-require 'barretina/vector_space'
+# frozen_string_literal: true
+
+require 'barretina/vector_space'
+require 'barretina/vector_space_2d'
+
+module Barretina
+  TITLE = "Barretina v#{VERSION}"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: barretina
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Ricard Ferrero
@@ -54,11 +54,17 @@ files:
 - Gemfile.lock
 - LICENSE
 - README.md
+- bin/barretina
 - bin/bcm
 - lib/barretina.rb
+- lib/barretina/canvas.rb
 - lib/barretina/vector_space.rb
-- lib/barretina/vector_space/extenders.rb
+- lib/barretina/vector_space/line.rb
 - lib/barretina/vector_space/vector.rb
+- lib/barretina/vector_space_2d.rb
+- lib/barretina/vector_space_2d/line_2d.rb
+- lib/barretina/vector_space_2d/polygon.rb
+- lib/barretina/vector_space_2d/vector_2d.rb
 - lib/barretina/version.rb
 homepage: https://github.com/ricard-ferrero/barretina
 licenses:

data/lib/barretina/vector_space/extenders.rb

@@ -1,11 +0,0 @@
-[Integer, Float].each do |numerical|
-  numerical.class_eval do
-    alias_method :__multiply__, :*
-    private :__multiply__
-
-    def * n
-      return n * self if n.is_a? VectorSpace::Vector
-      __multiply__ n
-    end
-  end
-end