coords 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ef9b5e2c1c4abd073f48762963efacecefaf883
-  data.tar.gz: 93f89db2a8d99ffedfaf63490a3a496f5f35501d
+  metadata.gz: 71f88964e9d3049a37804c1c9db1401aefb8f163
+  data.tar.gz: 2bcbd911f75fa84b05482d8994ee1956bf53dca7
 SHA512:
-  metadata.gz: 0584d5390b17ca055081f9b1ef8dbe340971aa2e067be870b6f55b01ffa17e20ef6d2714bfe91d780683c3381bb65723503d90d189d48aec2d446a0b01e45d8b
-  data.tar.gz: b0791aab99ca15f1ba2c88935ef4844cce8ab5e9d4b1050f400e7a085fb0888072284a2df4587085e9ec028f5675a34ea43b8be8ef84ada67f0a873096e19ad2
+  metadata.gz: 28d4fe183b98a0b10c3ffb8e44035beb0042235722e98fa1f3a9c922bc66a38553332c584fed6db370fe18da846777fa3e824207b2851f882bf9ad24e3272471
+  data.tar.gz: a8077a0ea3ae2a4af4e8a1cfd09e18356c9cd1f920b063450cd649b52421bea3e31fa5b8c3798668fe6e29edc7dd8e1dc737d3ecc486d6982f2c30ba3a2d1805

data/lib/coords/cartesian2d.rb

@@ -30,11 +30,11 @@ module Coords
       radius = Math.sqrt((x ** 2) + (y ** 2));
       theta = Math.atan2(y, x);
 
-      Polar.new(radius.round(15), theta.round(15))
+      Polar.new(radius.round(12), theta.round(12))
     end
 
     def ==(point)
-      x.round(15) == point.x.round(15) && y.round(15) == point.y.round(15)
+      x.round(12) == point.x.round(12) && y.round(12) == point.y.round(12)
     end
 
     def translate(x2, y2)
@@ -56,8 +56,8 @@ module Coords
 
     def rotate!(theta)
       tmp_x = x
-      @x = ((x * Math.cos(theta)) - (y * Math.sin(theta))).round(15)
-      @y = ((tmp_x * Math.sin(theta)) + (y * Math.cos(theta))).round(15)
+      @x = ((x * Math.cos(theta)) - (y * Math.sin(theta))).round(12)
+      @y = ((tmp_x * Math.sin(theta)) + (y * Math.cos(theta))).round(12)
     end
 
     def reflect(type = 'origin')

data/lib/coords/cartesian3d.rb

@@ -23,15 +23,17 @@ module Coords
       theta = Math.acos(z / radius)
       phi = Math.atan2(y, x)
 
-      Spherical.new(radius, theta, phi)
+      Spherical.new(radius.round(12), theta.round(12), phi.round(12))
     end
 
     def ==(point)
-      x.round(15) == point.x.round(15) && y.round(15) == point.y.round(15) && z.round(15) == point.z.round(15)
+      x.round(12) == point.x.round(12) && y.round(12) == point.y.round(12) && z.round(12) == point.z.round(12)
     end
 
     def translate(x2, y2, z2)
-      Cartesian3d.new(x + x2, y + y2, z + z2)
+      translated_point = Cartesian3d.new(x, y, z)
+      translated_point.translate!(x2, y2, z2)
+      translated_point
     end
 
     def translate!(x2, y2, z2)
@@ -39,5 +41,32 @@ module Coords
       @z += z2
     end
 
+    def rotate(rZ = 0, rX = 0, rY = 0)
+      rotated_point = Cartesian3d.new(x, y, z)
+      rotated_point.rotate!(rZ, rX, rY)
+      rotated_point
+    end
+
+    def rotate!(rZ = 0, rX = 0, rY = 0)
+      d = Math.hypot(y, x)
+      theta = Math.atan2(y, x) + rZ
+      @x = d * Math.cos(theta)
+      @y = d * Math.sin(theta)
+
+      d = Math.hypot(y, z)
+      theta = Math.atan2(z, y) + rX
+      @y = d * Math.cos(theta)
+      @z = d * Math.sin(theta)
+
+      d = Math.hypot(x, z)
+      theta = Math.atan2(x, z) + rY
+      @z = d * Math.cos(theta)
+      @x = d * Math.sin(theta)
+
+      @x = x.round(12)
+      @y = y.round(12)
+      @z = z.round(12)
+    end
+
   end
 end

data/lib/coords/polar.rb

@@ -35,11 +35,11 @@ module Coords
       x = radius * Math.cos(theta)
       y = radius * Math.sin(theta)
 
-      Cartesian2d.new(x.round(15), y.round(15))
+      Cartesian2d.new(x.round(12), y.round(12))
     end
 
     def ==(point)
-      radius.round(15) == point.radius.round(15) && theta.round(15) == point.theta.round(15)
+      radius.round(12) == point.radius.round(12) && theta.round(12) == point.theta.round(12)
     end
 
   end

data/lib/coords/spherical.rb

@@ -34,7 +34,7 @@ module Coords
     end
 
     def ==(point)
-      radius.round(15) == point.radius.round(15) && theta.round(15) == point.theta.round(15) && phi.round(15) == point.phi.round(15)
+      radius.round(12) == point.radius.round(12) && theta.round(12) == point.theta.round(12) && phi.round(12) == point.phi.round(12)
     end
 
   end

data/lib/coords/version.rb

@@ -1,3 +1,3 @@
 module Coords
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/lib/coords/cartesian2d_spec.rb

@@ -3,17 +3,17 @@ require 'spec_helper'
 describe Coords::Cartesian2d do
   subject { Coords::Cartesian2d.new(1, 2) }
 
-  describe '#x' do
-    it 'returns value of x coordinate' do
-      expect(subject.x).to eq(1)
-    end
-  end
+  # describe '#x' do
+  #   it 'returns value of x coordinate' do
+  #     expect(subject.x).to eq(1)
+  #   end
+  # end
 
-  describe '#y' do
-    it 'returns value of y coordinate' do
-      expect(subject.y).to eq(2)
-    end
-  end
+  # describe '#y' do
+  #   it 'returns value of y coordinate' do
+  #     expect(subject.y).to eq(2)
+  #   end
+  # end
 
   describe '#distance_squared' do
     it 'returns squared distance between two points' do
@@ -38,8 +38,8 @@ describe Coords::Cartesian2d do
   describe '#to_polar' do
     it 'returns point in polar coordinate system' do
       polar = subject.to_polar
-      expect(polar.radius).to eq(2.23606797749979)
-      expect(polar.theta).to eq(1.10714871779409)
+      expect(polar.radius).to eq(2.2360679775)
+      expect(polar.theta).to eq(1.107148717794)
     end
   end
 
@@ -61,15 +61,6 @@ describe Coords::Cartesian2d do
     end
   end
 
-  # describe '#translate!' do
-  #   it 'translates values of original point' do
-  #     point2 = Coords::Cartesian2d.new(1, 2)
-  #     point2.translate!(3, 4)
-  #     expect(point2.x).to eq(4)
-  #     expect(point2.y).to eq(6)
-  #   end
-  # end
-
   describe '#rotate' do
     it 'rotates values to new point' do
       point2 = subject.rotate(Coords.radians(90))
@@ -80,15 +71,6 @@ describe Coords::Cartesian2d do
     end
   end
 
-  # describe '#rotate!' do
-  #   it 'rotates values of original point' do
-  #     point2 = Coords::Cartesian2d.new(1, 2)
-  #     point2.rotate!(Coords.radians(90))
-  #     expect(point2.x).to eq(-2)
-  #     expect(point2.y).to eq(1)
-  #   end
-  # end
-
   describe '#reflect' do
     it 'reflects values to new point by origin' do
       point2 = subject.reflect('origin')

data/spec/lib/coords/cartesian3d_spec.rb

@@ -25,9 +25,9 @@ describe Coords::Cartesian3d do
   describe '#to_spherical' do
     it 'returns point in spherical coordinate system' do
       spherical = subject.to_spherical
-      expect(spherical.radius).to eq(3.7416573867739413)
-      expect(spherical.theta).to eq(0.6405223126794245)
-      expect(spherical.phi).to eq(1.1071487177940904)
+      expect(spherical.radius).to eq(3.741657386774)
+      expect(spherical.theta).to eq(0.640522312679)
+      expect(spherical.phi).to eq(1.107148717794)
     end
   end
 
@@ -51,13 +51,15 @@ describe Coords::Cartesian3d do
     end
   end
 
-  describe '#translate!' do
-    it 'translates values of original point' do
-      point2 = Coords::Cartesian3d.new(1, 2, 3)
-      point2.translate!(3, 4, 5)
-      expect(point2.x).to eq(4)
-      expect(point2.y).to eq(6)
-      expect(point2.z).to eq(8)
+  describe '#rotate' do
+    it 'rotates values to new point' do
+      point2 = subject.rotate(Coords.radians(90), Coords.radians(90), Coords.radians(90))
+      expect(subject.x).to eq(1)
+      expect(subject.y).to eq(2)
+      expect(subject.z).to eq(3)
+      expect(point2.x).to eq(1)
+      expect(point2.y).to eq(-3)
+      expect(point2.z).to eq(2)
     end
   end
 end

data/spec/lib/coords/polar_spec.rb

@@ -38,8 +38,8 @@ describe Coords::Polar do
   describe '#to_cartesian' do
     it 'returns point in cartesian coordinate system' do
       cart = subject.to_cartesian
-      expect(cart.x).to eq(-0.416146836547142)
-      expect(cart.y).to eq(0.909297426825682)
+      expect(cart.x).to eq(-0.416146836547)
+      expect(cart.y).to eq(0.909297426826)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coords
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Craig Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-14 00:00:00.000000000 Z
+date: 2015-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler