epimath100 2.0.2 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2858403c795608ec9b39cd293c128f4aa9cf38f1
-  data.tar.gz: f36ad6e002039349af59f7a5054e2d114c206ed3
+  metadata.gz: 5491284570b5ab89257d29563128f7a65320a0c4
+  data.tar.gz: a1ac48f035dc440e35107f58bd937061bdc63f81
 SHA512:
-  metadata.gz: 17c97f882a7535ab1ca039f51ea545f6d991f7637391f4748500826fa3a3d1a9ce110f42505064367474c8e13c191bce5383f25360508df75bcc539301e72ae6
-  data.tar.gz: dcda0c27dd1baf1de371af4dfc1f59708245a65a9965fbaefacd3a1806c7a3edf4e9abffe898bbf4c51c4341e857bea1cc52a90e2304447d416664ccd3e16606
+  metadata.gz: 10bb395846cda35964f85f9c4a27ddbe6cf868257bd6d564968dcd707024874fb10c82a871213bf3f912e22afffdd40ae6c7b3d7da9fa650b1dc2b85f8332fc2
+  data.tar.gz: f8a942b99203d52218e3105a829fbdfe25fa7eb91b3bc35200a3153725871b6f4c6e6d455f0535be95754918953ef6f6dd57a304469dd4cb68442842225cd240

data/lib/epimath100/line.class.rb

@@ -11,15 +11,23 @@ class Line
   # == Parameters:
   # point::
   #     Any point on the line. It must be a Point (../point/point.class.rb)
-  # vector::
+  # param2::
   #     Any vector director of the line. It must be a Vector (../vector/vector.class.rb)
-  def initialize point, vector
-    Error.call "Line::new : '#{point}' is not a Point" if !point.is_a?Point
-    Error.call "Line::new : '#{vector}' is not a Vector" if !vector.is_a?Vector
-    Error.call "Line::new : '#{vector}' can't be Null" if vector.nil?
-
+  #     It also can be a 2sd point of the line
+  def initialize point, param2
     @point = point
-    @v_dir = vector
+    if param2.is_a?Vector
+      @v_dir = param2
+    elsif param2.is_a?Point
+      #coef = (param2.y - point.y) / (param2.x - coef.x)
+      #ordo = point.y - coef * point.x
+      @v_dir = Vector.new(param2.x - point.x, param2.y - point2.y)
+    else
+      Error.call "Line::new : '#{@vector}' is neither a Vector or a Point"
+    end
+    Error.call "Line::new : '#{@point}' is not a Point" if !@point.is_a?Point
+    Error.call "Line::new : '#{@vector}' can't be Null" if @vector.nil?
+
     @equ_para = Line::parametric @point, @v_dir
   end
 

data/lib/epimath100/point.class.rb

@@ -1,40 +1,64 @@
 #encoding: utf-8
 
-gem 'myerror'
+require 'myerror'
 
 module EpiMath
+extend MyError
+
 class Point
-  def initialize x, y, z
-    if !x.is_a?Numeric or !y.is_a?Numeric or !z.is_a?Numeric
-      Error.call "Point::new : a passed argument is not a valid number"
-    end
-    @coord = {:x => x.to_f, :y => y.to_f, :z => z.to_f}
+  def initialize x, y, z=nil
+    MyError::Error.call "Point::new : a passed argument is not a valid number" if (!x.is_a?Numeric or !y.is_a?Numeric or (z != nil and !z.is_a?Numeric))
+    @coord = {:x => x.to_f, :y => y.to_f}
+    @coord[:z] = z.to_f if z != nil
+  end
+
+  def self.new_a p
+    MyError::Error.call "Point::new_a : not a valid array of coord" if !p.is_a?Array or p.size < 2
+    return Point.new(*p)
   end
 
+  # TODO : do not modify @
   def +(p)
     if p.is_a?Point
-      @coord.x += p.x
-      @coord.y += p.y
-      @coord.z += p.z
+      @coord[:x] += p.x
+      @coord[:y] += p.y
+      @coord[:z] += p.z if p.z or @coord[:z]
     elsif p.is_a?Numeric
-      @coord.x += p
-      @coord.y += p
-      @coord.z += p
+      @coord[:x] += p
+      @coord[:y] += p
+      @coord[:z] += p if @coord[:z]
     else
-      Error.call "Point::+ : passed argument is invalid"
+      MyError::Error.call "Point::+ : passed argument is invalid (#{p.class})"
     end
+    return self
+  end
+
+  def -(p)
+    p_ = Point.new(-self.x, -self.y)
+    p_ = Point.new(-self.x, -self.y, -self.z) if self.z
+    p_ = p_ + p
+    return p_
   end
 
   def *(p)
-    Error.call "Point::+ : passed argument is invalid" if !p.is_a?Numeric
+    MyError::Error.call "Point::* : passed argument is invalid" if !p.is_a?Numeric
 
-    @coord.x *= p
-    @coord.y *= p
-    @coord.z *= p
+    @coord[:x] *= p
+    @coord[:y] *= p
+    @coord[:z] *= p if @coord[:z]
+    return self
+  end
+
+  def ==(p)
+    MyError::Error.call "Point::== : passed argument is invalid" if !p.is_a?Point
+    return true if p.x == self.x and p.y == self.y and p.z == self.z
+    return false
   end
 
   def to_s
-    "(#{self.x}; #{self.y}; #{self.z})"
+    str  = "(#{self.x}; #{self.y}"
+    str += "; #{self.z}" if self.z
+    str += ")"
   end
 
   def x
@@ -48,5 +72,36 @@ class Point
   def z
     @coord[:z]
   end
+
+  def x= v
+    @coord[:x] = v
+  end
+
+  def y= v
+    @coord[:y] = v
+  end
+
+  def z= v
+    @coord[:z] = v
+  end
+
+  def self.get_middle(a, b)
+    return Point.get_in(a, b, 0.5)
+  end
+
+  def self.get_in(a, b, p)
+    MyError::Error.call "Point::get_in : an argument is not a Point" if !a.is_a?Point or !b.is_a?Point
+
+    if a.x != b.x and p.is_a?Float and p >= 0 and p <= 1
+      coef = ((b.y-a.y) / (b.x-a.x))
+      ordonnee = a.y - coef * a.x
+      min = [b.x, a.x].min
+      max = [b.x, a.x].max
+      mid = (max - min) * p
+      return Point.new(min + mid, coef * (mid + min) + ordonnee)
+    end
+    return nil
+  end
+
 end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: epimath100
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.5
 platform: ruby
 authors:
 - poulet_a
@@ -79,6 +79,6 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Fix function
+summary: Better point
 test_files: []
 has_rdoc: