gss_generator 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4868e0b7c76222b5191410a95508ad4bbfedae3c
-  data.tar.gz: 101d123737d65b5b2b7fdc72b6e302c45e53e987
+  metadata.gz: dcb0eb5d3947f39d7d397b800ecab0c7cec2de3a
+  data.tar.gz: 57a4f152cf75ecdd5b4fc699d1a4772ac7d85467
 SHA512:
-  metadata.gz: 4b8bdf6afa55a7244d59e63d97d3c736d40bce949b7a90caa012c85847b24998d685f250a5b8c693d36b907e48792d9ae955756d28b6d846d3b123d780080634
-  data.tar.gz: 80920acc43a63a223fe68ea43a7cf02a5404df5c74667d74a22e77a9d46e4198f2af8c00163ff081720a0bea1c97ca66ee5ba62f6a399e660cdb706734e30a07
+  metadata.gz: 8a5bf0fc925400d7eed9044ac3b0f6e052883bf7d59a54e58b13434b56cab265fd3112c52eab2b71b060f5c8700f82ff804af6353387a715d127ac37bb76e120
+  data.tar.gz: 926e844d43ef31040c1c8db4136f79dca04409c0232fa73cc0b7127452f5eb3a9dbd75d52899ac7bc0d3f9c8fdf908c0e6ae7847e2b971b2c859151d328df2da

data/exe/gss_gen

@@ -12,6 +12,9 @@ opts.banner = "Generate points with uniform distribution on the sphere."
 opts.on("-c", "--cartesian", "Cartesian coordinate."){|v|
   options[:cartesian] = true
 }
+opts.on("-r", "--relocate", "Relocate first and last point."){|v|
+  options[:relocation] = true
+}
 opts.on_tail("-h", "--help", "Show this message."){|v|
   print opts.help
   exit
@@ -25,13 +28,13 @@ opts.parse!
 r = ARGV.shift.to_f
 n = ARGV.shift.to_i
 
-gss = GSS::GSS.new
-points = gss.generate(r, n)
+gss = GSS::Generator.new
+points = gss.generate(n, options[:relocation])
 points.each do |p|
   if options[:cartesian]
-    coord = p.to_cartesian
+    coord = p.to_cartesian.map{|c| c * r }
     print coord.to_csv
   else
-    print [p.r, p.theta, p.phi].to_csv
+    print [r, p.theta, p.phi].to_csv
   end
 end

data/lib/gss.rb

@@ -1,5 +1,5 @@
 require "gss/version"
-require "gss/gss"
+require "gss/generator"
 
 module GSS
   # Your code goes here...

data/lib/gss/generator.rb

@@ -0,0 +1,45 @@
+# encoding: utf-8
+#
+# Generate points that distributed on unit sphere with Generalized Spiral Set.
+# cf. https://www.jstage.jst.go.jp/article/geoinformatics/12/1/12_1_3/_article/-char/ja/
+#
+
+require "gss/polar_point"
+
+
+module GSS
+
+  class Generator
+    def generate(n, relocation = false)
+      theta_1 = Math::PI
+      phi_1 = 0.0
+
+      points = []
+      points << PolarPoint.new(theta_1, phi_1)
+      2.upto(n) do |k|
+        h_k = -1.0 + 2.0 * (k - 1) / (n - 1)
+        theta_k = Math.acos(h_k)
+        phi_k = points.last.phi + 3.6 / Math.sqrt(n) * 1 / Math.sqrt(1 - h_k ** 2)
+        phi_k = phi_k.infinite? ? 0.0 : phi_k % (Math::PI * 2.0)
+        points << PolarPoint.new(theta_k, phi_k) 
+      end
+
+      if relocation
+        points[0] = relocate(points[1], points[2], points[4], points[5], points[6])
+        points[-1] = relocate(points[-2], points[-3], points[-5], points[-6], points[-7])
+      end
+
+      points
+    end
+
+    private
+
+      def relocate(p1, p2, p3, p4, p5)
+        c = [p1, p2, p3, p4, p5].map{|p| p.to_cartesian }
+        c = c.transpose.map{|l| l.inject(&:+) / 5.0 }
+        PolarPoint.from_cartesian(c[0], c[1], c[2])
+      end
+
+  end   # of class Generator
+
+end   # of module GSS

data/lib/gss/polar_point.rb

@@ -4,20 +4,25 @@
 module GSS
 
   class PolarPoint
-    attr_reader :r, :theta, :phi
+    attr_reader :theta, :phi
 
-    def initialize(r, theta, phi)
-      @r = r
+    def initialize(theta, phi)
       @theta = theta
       @phi = phi
     end
 
     def to_cartesian
-      x = @r * Math.sin(@theta) * Math.cos(@phi)
-      y = @r * Math.sin(@theta) * Math.sin(@phi)
-      z = @r * Math.cos(@theta)
+      x = Math.sin(@theta) * Math.cos(@phi)
+      y = Math.sin(@theta) * Math.sin(@phi)
+      z = Math.cos(@theta)
       [x, y, z]
     end
+
+    def self.from_cartesian(x, y, z)
+      theta = Math.acos(z / Math.sqrt(x * x + y * y + z * z))
+      phi = Math.atan2(y, x)
+      self.new(theta, phi)
+    end
   end   # of class PolarPoint
 
 end   # of module GSS

data/lib/gss/version.rb

@@ -1,3 +1,3 @@
 module GSS
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gss_generator
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - takatoh
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-21 00:00:00.000000000 Z
+date: 2017-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -57,7 +57,7 @@ files:
 - exe/gss_gen
 - gss_generator.gemspec
 - lib/gss.rb
-- lib/gss/gss.rb
+- lib/gss/generator.rb
 - lib/gss/polar_point.rb
 - lib/gss/version.rb
 homepage: https://github.com/takatoh/gss_generator

data/lib/gss/gss.rb

@@ -1,27 +0,0 @@
-# encoding: utf-8
-
-require "gss/polar_point"
-
-
-module GSS
-
-  class GSS
-    def generate(r, n)
-      theta_1 = Math::PI
-      phi_1 = 0.0
-
-      points = []
-      points << PolarPoint.new(r, theta_1, phi_1)
-      2.upto(n) do |k|
-        h_k = -1.0 + 2.0 * (k - 1) / (n - 1)
-        theta_k = Math.acos(h_k)
-        phi_k = points.last.phi + 3.6 / Math.sqrt(n) * 1 / Math.sqrt(1 - h_k ** 2)
-        phi_k = phi_k.infinite? ? 0.0 : phi_k % (Math::PI * 2.0)
-        points << PolarPoint.new(r, theta_k, phi_k) 
-      end
-
-      points
-    end
-  end   # of class GSS
-
-end   # of module GSS