cartesius 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 69e7a9e2b6c6f4edb2bcc0cd73e5f909ee2eed07
-  data.tar.gz: 4eda3671a45184320a8485a0bd389df017bc8b8f
+SHA256:
+  metadata.gz: 1a2864a5e8f19fdf96b0dc7f1bcd71b773b7407de108a7619a7739321eaaccab
+  data.tar.gz: 96a0970a6fb936d2851ad2438765bf87e9fc0b6f9e53a955e522100556bc423b
 SHA512:
-  metadata.gz: 005e1721917eb39048995f4567a084c53ec9bdc66f2d95ca78ae2a827ae9bb19561747072ac257f697c46d2fc572e2a4175c897feedd929408a7d1fe438cbc8b
-  data.tar.gz: 01db7a237a5fa5edc13314dee6503120f9e232f65665e1cba2a3c9d830c1d9bbf68da95f367bc634e3af493d51b3e004eff202b9f4250665504e212643a8c8b0
+  metadata.gz: 4730b97e60e48b29feb4f33cee385876227a3f7929be22b9c5d4caa5cf1d1cb39147b73ba8655c54f141e048a9c3048b7c1e324474218644e391dea0d38c0c24
+  data.tar.gz: 3d2bda2e42c5bb140c57c5aaf1313839ec72ead6e10ae5777f2ed04f3e51a074d38adef229aada5b5e505943af1d1480e22e36d4fcd530bd067170dd8c0f0d8b

data/lib/cartesius/angle.rb

@@ -1,3 +1,6 @@
+require('cartesius/neighbourhoods')
+require('cartesius/tolerance')
+
 module Cartesius
   class Angle
     NULL, RIGHT, FLAT, FULL = 0, 90, 180, 360
@@ -7,6 +10,7 @@ module Cartesius
     private_constant(:FULL)
 
     def initialize(angle)
+      validation(angle)
       @angle = angle
     end
 
@@ -46,8 +50,8 @@ module Cartesius
       by_degrees(FULL)
     end
 
-    def degrees(precision = 3)
-      @angle.round(precision)
+    def degrees
+      @angle
     end
 
     def radiants(precision = 3)
@@ -55,38 +59,44 @@ module Cartesius
     end
 
     def null?
-      degrees == NULL
+      OpenNeighbourhood.new(NULL, Tolerance::TOLERANCE).include?(degrees)
     end
 
     def acute?
-      degrees > NULL and degrees < RIGHT
+      CloseNeighbourhood.new(45, 45 - Tolerance::TOLERANCE).include?(degrees)
     end
 
     def right?
-      degrees == RIGHT
+      OpenNeighbourhood.new(RIGHT, Tolerance::TOLERANCE).include?(degrees)
     end
 
     def obtuse?
-      degrees > RIGHT and degrees < FLAT
+      CloseNeighbourhood.new(135, 45 - Tolerance::TOLERANCE).include?(degrees)
     end
 
     def flat?
-      degrees == FLAT
+      OpenNeighbourhood.new(FLAT, Tolerance::TOLERANCE).include?(degrees)
     end
 
     def full?
-      degrees == FULL
+      OpenNeighbourhood.new(FULL, Tolerance::TOLERANCE).include?(degrees)
     end
 
-    def congruent?(angle)
-      angle.instance_of?(self.class) and
-          angle.degrees == degrees
+    def congruent?(other)
+      other.instance_of?(self.class) &&
+          OpenNeighbourhood.new(NULL, Tolerance::TOLERANCE).include?((other.degrees - degrees).abs)
     end
 
     alias_method(:eql?, :congruent?)
 
     private
 
+    def validation(angle)
+      if angle < NULL || angle > FULL
+        raise ArgumentError.new('Invalid angle!')
+      end
+    end
+
     def hash
       @angle.hash
     end

data/lib/cartesius/circumference.rb

@@ -59,13 +59,13 @@ module Cartesius
     end
 
     def congruent?(circumference)
-      circumference.instance_of?(self.class) and
+      circumference.instance_of?(self.class) &&
           circumference.radius == radius
     end
 
     def == (circumference)
-      circumference.instance_of?(self.class) and
-          circumference.center == center and circumference.radius == radius
+      circumference.instance_of?(self.class) &&
+          circumference.center == center && circumference.radius == radius
     end
 
     def self.build_by(center, radius)

data/lib/cartesius/cramer.rb

@@ -0,0 +1,67 @@
+require('matrix')
+
+class Cramer
+
+  def self.solution1(row1, known_term)
+    matrix = Matrix.rows([row1])
+
+    determinant = matrix.determinant
+    if determinant.zero?
+      raise ArgumentError.new('The determinant is zero!')
+    end
+
+    x1 = Rational(
+        Matrix.columns([known_term]).determinant,
+        determinant
+    )
+
+    [x1]
+  end
+
+  def self.solution2(row1, row2, known_term)
+    matrix = Matrix.rows([row1, row2])
+
+    determinant = matrix.determinant
+    if determinant.zero?
+      raise ArgumentError.new('The determinant is zero!')
+    end
+
+    x1 = Rational(
+        Matrix.columns([known_term, matrix.column(1)]).determinant,
+        determinant
+    )
+
+    x2 = Rational(
+        Matrix.columns([matrix.column(0), known_term]).determinant,
+        determinant
+    )
+
+    [x1, x2]
+  end
+
+  def self.solution3(row1, row2, row3, known_term)
+    matrix = Matrix.rows([row1, row2, row3])
+
+    determinant = matrix.determinant
+    if determinant.zero?
+      raise ArgumentError.new('The determinant is zero!')
+    end
+
+    x1 = Rational(
+        Matrix.columns([known_term, matrix.column(1), matrix.column(2)]).determinant,
+        determinant
+    )
+
+    x2 = Rational(
+        Matrix.columns([matrix.column(0), known_term, matrix.column(2)]).determinant,
+        determinant
+    )
+
+    x3 = Rational(
+        Matrix.columns([matrix.column(0), matrix.column(1), known_term]).determinant,
+        determinant
+    )
+
+    [x1, x2, x3]
+  end
+end

data/lib/cartesius/determinator.rb

@@ -0,0 +1,30 @@
+module Determinator
+
+  def center
+    Cartesius::Point.new(
+        x: Rational(-@x_coeff, (2 * @x2_coeff)),
+        y: Rational(-@y_coeff, (2 * @y2_coeff))
+    )
+  end
+
+  def to_equation
+    equationfy(
+        'x^2' => @x2_coeff, 'y^2' => @y2_coeff, 'x' => @x_coeff, 'y' => @y_coeff, '1' => @k_coeff
+    )
+  end
+
+  private
+
+  def a2
+    Rational((determinator - @k_coeff).abs, (@x2_coeff).abs)
+  end
+
+  def b2
+    Rational((determinator - @k_coeff).abs, (@y2_coeff).abs)
+  end
+
+  def determinator
+    (@x2_coeff * (center.x**2)) + (@y2_coeff * (center.y**2))
+  end
+
+end

data/lib/cartesius/ellipse.rb

@@ -48,15 +48,15 @@ module Cartesius
         raise ArgumentError.new('Axes must be different!')
       end
 
-      if major_axis.inclined? or minor_axis.inclined?
+      if major_axis.inclined? || minor_axis.inclined?
         raise ArgumentError.new('Axes must not be inclined!')
       end
 
-      if major_axis.horizontal? and minor_axis.horizontal?
+      if major_axis.horizontal? && minor_axis.horizontal?
         raise ArgumentError.new('Axes can not be both horizontal!')
       end
 
-      if major_axis.vertical? and minor_axis.vertical?
+      if major_axis.vertical? && minor_axis.vertical?
         raise ArgumentError.new('Axes can not be both vertical!')
       end
 
@@ -78,7 +78,7 @@ module Cartesius
     end
 
     def self.by_points(center:, point1:, point2:)
-      if center == point1 or center == point2 or point1 == point2
+      if center == point1 || center == point2 || point1 == point2
         raise ArgumentError.new('Points must be different!')
       end
 
@@ -151,13 +151,13 @@ module Cartesius
     end
 
     def congruent?(ellipse)
-      ellipse.instance_of?(self.class) and
+      ellipse.instance_of?(self.class) &&
           ellipse.eccentricity == eccentricity
     end
 
     def == (ellipse)
-      ellipse.instance_of?(self.class) and
-          ellipse.focus1 == focus1 and ellipse.focus2 == focus2 and ellipse.distance == distance
+      ellipse.instance_of?(self.class) &&
+          ellipse.focus1 == focus1 && ellipse.focus2 == focus2 && ellipse.distance == distance
     end
 
     def self.build_by(a2, b2, center)
@@ -169,7 +169,7 @@ module Cartesius
     private
 
     def validation
-      if @x2_coeff <= 0 or @y2_coeff <= 0 or @x2_coeff == @y2_coeff or determinator <= @k_coeff
+      if @x2_coeff <= 0 || @y2_coeff <= 0 || @x2_coeff == @y2_coeff || determinator <= @k_coeff
         raise ArgumentError.new('Invalid coefficients!')
       end
     end

data/lib/cartesius/hyperbola.rb

@@ -55,15 +55,15 @@ module Cartesius
         raise ArgumentError.new('Axes must be different!')
       end
 
-      if transverse_axis.inclined? or not_transverse_axis.inclined?
+      if transverse_axis.inclined? || not_transverse_axis.inclined?
         raise ArgumentError.new('Axes must not be inclined!')
       end
 
-      if transverse_axis.horizontal? and not_transverse_axis.horizontal?
+      if transverse_axis.horizontal? && not_transverse_axis.horizontal?
         raise ArgumentError.new('Axes can not be both horizontal!')
       end
 
-      if transverse_axis.vertical? and not_transverse_axis.vertical?
+      if transverse_axis.vertical? && not_transverse_axis.vertical?
         raise ArgumentError.new('Axes can not be both vertical!')
       end
 
@@ -87,7 +87,7 @@ module Cartesius
     end
 
     def self.by_points(center:, vertex:, point:)
-      if center == vertex or center == point or vertex == point
+      if center == vertex || center == point || vertex == point
         raise ArgumentError.new('Points must be different!')
       end
 
@@ -181,13 +181,13 @@ module Cartesius
     end
 
     def congruent?(hyperbola)
-      hyperbola.instance_of?(self.class) and
+      hyperbola.instance_of?(self.class) &&
           hyperbola.eccentricity == eccentricity
     end
 
     def == (hyperbola)
-      hyperbola.instance_of?(self.class) and
-          hyperbola.focus1 == focus1 and hyperbola.focus2 == focus2 and hyperbola.distance == distance
+      hyperbola.instance_of?(self.class) &&
+          hyperbola.focus1 == focus1 && hyperbola.focus2 == focus2 && hyperbola.distance == distance
     end
 
     def self.build_by(a2, b2, center, position)
@@ -199,7 +199,7 @@ module Cartesius
     private
 
     def validation
-      if signum(@x2_coeff * @y2_coeff) >= 0 or determinator == @k_coeff
+      if signum(@x2_coeff * @y2_coeff) >= 0 || determinator == @k_coeff
         raise ArgumentError.new('Invalid coefficients!')
       end
     end

data/lib/cartesius/line.rb

@@ -102,11 +102,11 @@ module Cartesius
     end
 
     def inclined?
-      ascending? or descending?
+      ascending? || descending?
     end
 
     def ascending?
-      slope != VERTICAL_SLOPE and slope > HORIZONTAL_SLOPE
+      slope != VERTICAL_SLOPE && slope > HORIZONTAL_SLOPE
     end
 
     def descending?
@@ -156,14 +156,14 @@ module Cartesius
     end
 
     def == (line)
-      line.instance_of?(self.class) and
-          line.slope == slope and line.known_term == known_term
+      line.instance_of?(self.class) &&
+          line.slope == slope && line.known_term == known_term
     end
 
     private
 
     def validation
-      if @x_coeff.zero? and @y_coeff.zero?
+      if @x_coeff.zero? && @y_coeff.zero?
         raise ArgumentError.new('Invalid coefficients!')
       end
     end

data/lib/cartesius/neighbourhoods.rb

@@ -0,0 +1,31 @@
+class OpenNeighbourhood
+  def initialize(center, width)
+    @center = center
+    @width = width
+  end
+
+  def include?(value)
+    (value > @center - @width) && (value < @center + @width)
+  end
+end
+
+class CloseNeighbourhood
+  def initialize(center, width)
+    @center = center
+    @width = width
+  end
+
+  def include?(value)
+    (value >= @center - @width) && (value <= @center + @width)
+  end
+end
+
+class InfinityNeighbourhood
+  def initialize(width)
+    @width = width
+  end
+
+  def include?(value)
+    (value < -@width) && (value > @width)
+  end
+end

data/lib/cartesius/numerificator.rb

@@ -0,0 +1,66 @@
+module Numerificator
+
+  private
+
+  def equationfy(coefficients)
+    coefficients.delete_if {|_, value| value.zero?}
+
+    if coefficients.first.last < 0
+      coefficients.each {|k, v| coefficients[k] = -v}
+    end
+
+    equation = []
+    coefficients.each do |key, value|
+      if key == '1'
+        equation << [monomial(value)]
+      else
+        equation << [monomial(value, key)]
+      end
+    end
+    equation << ['=', '0']
+
+    equation.join(' ')
+  end
+
+  def stringfy(number)
+    if number.denominator == 1
+      return number.numerator.to_s
+    end
+    number.to_s
+  end
+
+  # TODO: test
+  def numberfy(numerator, denominator)
+    if denominator == 1
+      numerator
+    elsif denominator == -1
+      -numerator
+    else
+      Rational(numerator, denominator)
+    end
+  end
+
+  def monomial(number_part, letter_part = nil)
+    number_string = if number_part.denominator == 1
+                      number_part.numerator.abs.to_s
+                    else
+                      "(#{number_part.abs})"
+                    end
+    "#{signum_symbol(number_part)}#{number_string}#{letter_part}"
+  end
+
+  def signum(number)
+    number < 0 ? -1 : 1
+  end
+
+  def signum_symbol(number)
+    number >= 0 ? '+' : '-'
+  end
+
+  def normalize(*coefficients)
+    sign = signum(coefficients.first.to_r)
+    coefficients.map! {|coefficient| sign * coefficient.to_r}
+  end
+
+
+end

data/lib/cartesius/parabola.rb

@@ -71,13 +71,13 @@ module Cartesius
     end
 
     def congruent?(parabola)
-      parabola.instance_of?(self.class) and
+      parabola.instance_of?(self.class) &&
           parabola.eccentricity == eccentricity
     end
 
     def == (parabola)
-      parabola.instance_of?(self.class) and
-          parabola.focus == focus and parabola.directrix == directrix
+      parabola.instance_of?(self.class) &&
+          parabola.focus == focus && parabola.directrix == directrix
     end
 
     private

data/lib/cartesius/point.rb

@@ -1,3 +1,4 @@
+require('cartesius/neighbourhoods')
 require('cartesius/numerificator')
 
 module Cartesius
@@ -34,8 +35,8 @@ module Cartesius
     end
 
     def == (point)
-      point.instance_of?(self.class) and
-          point.x == @x and point.y == @y
+      point.instance_of?(self.class) &&
+          point.x == @x && point.y == @y
     end
 
     alias_method(:eql?, :==)

data/lib/cartesius/segment.rb

@@ -35,17 +35,19 @@ module Cartesius
     end
 
     def congruent?(segment)
-      segment.instance_of?(self.class) and
+      segment.instance_of?(self.class) &&
           segment.length == self.length
     end
 
     def == (segment)
-      segment.instance_of?(self.class) and (
-      (segment.extreme1 == extreme1 and segment.extreme2 == extreme2) or
-          (segment.extreme1 == extreme2 and segment.extreme2 == extreme1)
+      segment.instance_of?(self.class) && (
+      (segment.extreme1 == extreme1 && segment.extreme2 == extreme2) ||
+          (segment.extreme1 == extreme2 && segment.extreme2 == extreme1)
       )
     end
 
+    alias_method(:eql?, :congruent?)
+
     private
 
     def validation
@@ -54,6 +56,10 @@ module Cartesius
       end
     end
 
+    def hash
+      length.hash
+    end
+
   end
 
 end

data/lib/cartesius/tolerance.rb

@@ -0,0 +1,3 @@
+module Tolerance
+  TOLERANCE = Rational(1, 100)
+end

data/lib/cartesius/triangle.rb

@@ -40,19 +40,19 @@ module Cartesius
     end
 
     def acute?
-      not rectangle? and not obtuse?
+      !rectangle? && !obtuse?
     end
 
-    def equilateral?(precision = 2)
-      sides_congruent(precision) == 1
+    def equilateral?
+      sides_congruent == 1
     end
 
-    def isosceles?(precision = 2)
-      equilateral? or sides_congruent(precision) == 2
+    def isosceles?
+      equilateral? || sides_congruent == 2
     end
 
-    def scalene?(precision = 2)
-      sides_congruent(precision) == 3
+    def scalene?
+      sides_congruent == 3
     end
 
     def perimeter
@@ -64,17 +64,17 @@ module Cartesius
     end
 
     def == (triangle)
-      triangle.instance_of?(self.class) and
+      triangle.instance_of?(self.class) &&
           triangle.vertices.values.to_set == vertices.values.to_set
     end
 
     def congruent? (triangle)
-      triangle.instance_of?(self.class) and
+      triangle.instance_of?(self.class) &&
           sides_length(triangle) == sides_length(self)
     end
 
     def similar?(triangle)
-      triangle.instance_of?(self.class) and
+      triangle.instance_of?(self.class) &&
           triangle.angles.values.to_set == angles.values.to_set
     end
 
@@ -94,11 +94,11 @@ module Cartesius
     end
 
     def sides_length(triangle)
-      triangle.sides.values.collect(&:length).sort
+      triangle.sides.values.collect(&:length)
     end
 
-    def sides_congruent(precision)
-      sides_length(self).map {|side| side.round(precision)}.uniq.count
+    def sides_congruent
+      sides_length(self).map {|s| s.round(3)}.to_set.count
     end
 
   end

data/lib/cartesius/validator.rb

@@ -0,0 +1,23 @@
+require('cartesius/line')
+
+module Cartesius
+
+  class Validator
+    def self.same_points(points)
+      if points.count != points.to_set.count
+        raise ArgumentError.new('Points must be distinct!')
+      end
+    end
+
+    # TODO: cambiare nome... ne bastano 3 allineati, ma se sono 4 per eccezione ne bastano tre allineati.
+    def self.aligned_points(points)
+      if points.count >= 3
+        line = Line.by_points(point1: points.shift, point2: points.pop)
+        points.each do |point|
+          raise ArgumentError.new('Points must not be aligned!') if line.include?(point)
+        end
+      end
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cartesius
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Mauro Quaglia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-05 00:00:00.000000000 Z
+date: 2019-10-09 00:00:00.000000000 Z
 dependencies: []
 description: The cartesian plan and its elements.
 email: mauroquaglia@libero.it
@@ -18,13 +18,19 @@ extra_rdoc_files: []
 files:
 - lib/cartesius/angle.rb
 - lib/cartesius/circumference.rb
+- lib/cartesius/cramer.rb
+- lib/cartesius/determinator.rb
 - lib/cartesius/ellipse.rb
 - lib/cartesius/hyperbola.rb
 - lib/cartesius/line.rb
+- lib/cartesius/neighbourhoods.rb
+- lib/cartesius/numerificator.rb
 - lib/cartesius/parabola.rb
 - lib/cartesius/point.rb
 - lib/cartesius/segment.rb
+- lib/cartesius/tolerance.rb
 - lib/cartesius/triangle.rb
+- lib/cartesius/validator.rb
 homepage: https://github.com/MauroQuaglia/cartesius
 licenses:
 - MIT
@@ -37,15 +43,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: The cartesian coordinate system.