mageo 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c25145113af4bf553c36dbeae137560f45487251
-  data.tar.gz: 01c62982a7e20692a3ef6297ed325a5970f202c6
+  metadata.gz: dc129222136be210ace8328833a4b272b80bab07
+  data.tar.gz: 386f5136658c132cf9c48320bcdf0495ab3b57be
 SHA512:
-  metadata.gz: 5e59acfee1e5a2741affdec6ee8ac81db8c7aebc16cd9108e985445f21261ece1d2b388dee0c65fdbb0c519c443c136b878e4394eec412175a6488ef086931ed
-  data.tar.gz: e15a17d70a9bf43ba50c6dff59bddb88bd65d36099a34d1bcc635fea161fd147349c07d070d178d8d248a49a60c97e10ade53d4ae9403de55b113db89ba5c4aa
+  metadata.gz: 230eb8e8e7a14edfaa68b5fc984c2e4fb8c791451c0db9fc844a8e09ba2afaa4414108f43c708e47356a0394c256e807174a0c87759001c9cf713d037e0f068f
+  data.tar.gz: 1a145a6ea3aa43da7e4aca3de2135315f31b33211d704185ff7d5beb25856b178e34e151aab5b887b121b6cc6d828479c81f0cefa0d1c47c5df0e1f408c382f6

data/CHANGES

@@ -1,15 +1,22 @@
 = mageo changelog
 
-== Master (for 0.0.6)
+<!-- master -->
 
-== Version (for 0.0.5) [2016-05-09] released
+== Version 0.1.0 [2016-07-12] released
+
+* Cylinder#initialize, argument positions to position0 and position1
+* Triangle#initialize, vertices to (v0, v1, v3)
+* Mageo::Tetrahedron; @vertex_indices_of_triangles was changed to VERTEX_INDICES_OF_TRIANGLES
+* Polyhedron and Octahedron class was obsoleted
+
+== Version 0.0.5 [2016-05-09] released
 * Bugfix of tests.
 * Delete meaningless codes.
 
-== Version (for 0.0.4) [2016-03-11] released
+== Version 0.0.4 [2016-03-11] released
 * Mageo::Vector3D#midpoint is added
 
-== Version (for 0.0.3) [2014-08-30] released
+== Version 0.0.3 [2014-08-30] released
 * Mageo::Vector3D#to_v3di is changed not to need an argument.
 * Mageo::Vector3D#internal_coordinates is added (old to_v3di(axes)).
 * Mageo::Polyhedron#translate  is added.
@@ -17,7 +24,7 @@
 * Mageo::Polyhedron#shared_vertices is added.
 * Update dependency on otehr gems.
 
-== Version (for 0.0.2) [2013-04-18] released
+== Version 0.0.2 [2013-04-18] released
 * Make a namespace 'Mageo'.
 * Most of classes are included into the namespace 'Mageo'.
 * Adjust to malge-0.0.8
@@ -25,7 +32,7 @@
 * Set default value of tolerance=0.0 in argument of Polyhedron#include?
 * Adjust to builtinextension-0.1.0.
 
-== Version (for 0.0.1)
+== Version 0.0.1
 * Change indent style from tab char to two spaces.
 * Adjust to malge 0.0.2.
 

data/Gemfile

@@ -6,7 +6,7 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "test-unit", "~> 3.1"
+  gem "test-unit", "~> 3.2"
   gem "rdoc", "~> 4.2"
   gem "bundler", "~> 1.11"
   gem "jeweler", "~> 2.0"

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.1.0

data/lib/mageo/cylinder.rb

@@ -9,10 +9,10 @@ class Mageo::Cylinder
 
   # 座標と半径
   # positions は 両底面の中心座標を入れた配列。
-  def initialize(position, radius)
+  def initialize(position0, position1, radius)
     @positions = [
-      Mageo::Vector3D[*position[0]],
-      Mageo::Vector3D[*position[1]]
+      Mageo::Vector3D[*position0],
+      Mageo::Vector3D[*position1]
     ]
     @radius = radius
   end

data/lib/mageo/octahedron.rb

@@ -1,55 +1,55 @@
 #! /usr/bin/env ruby
 # coding: utf-8
 
-# 3次元空間中の八面体を表現するクラス
-class Mageo::Octahedron < Mageo::Polyhedron
-
-  class InitializeError < Exception; end
-
-  #八面体は 6個の頂点で構成されるが、これを3組の対体角で指定する。
-  #e.g., 
-  #  [
-  #    [ [ -1,  0,  0 ], [  1,  0,  0 ] ],
-  #    [ [  0, -1,  0 ], [  0,  1,  0 ] ],
-  #    [ [  0,  0, -1 ], [  0,  0,  1 ] ],
-  #  ]
-  #
-  #凸包であることのチェックは難しいのでしない。
-  #TODO: 頂点が重複している、面上にあるなどのチェックも本来はすべきだが、入れていない。
-  def initialize( pairs )
-    raise InitializeError if pairs.class != Array
-    raise InitializeError if pairs.size != 3
-    pairs.each do |pair|
-      raise InitializeError unless pair.class == Array
-      raise InitializeError if pair.size != 2
-      pair.each do |pos|
-        raise InitializeError if pos.size != 3
-        raise InitializeError unless pos.methods.include?( :[] )
-        raise InitializeError unless pos.methods.include?( :map )
-      end
-    end
-
-    pairs.flatten.each do |vertex|
-      raise InitializeError if vertex.class == Mageo::Vector3DInternal
-    end
-
-
-    @vertices = []
-    pairs.each do |pair|
-      pair.each do |vertex|
-        @vertices << vertex.to_v3d
-      end
-    end
-
-    @vertex_indices_of_triangles = [
-      [ 0, 2, 4],
-      [ 0, 2, 5],
-      [ 0, 3, 4],
-      [ 0, 3, 5],
-      [ 1, 2, 4],
-      [ 1, 2, 5],
-      [ 1, 3, 4],
-      [ 1, 3, 5]
-    ]
-  end
-end
+## 3次元空間中の八面体を表現するクラス
+#class Mageo::Octahedron < Mageo::Polyhedron
+#
+#  class InitializeError < Exception; end
+#
+#  #八面体は 6個の頂点で構成されるが、これを3組の対体角で指定する。
+#  #e.g., 
+#  #  [
+#  #    [ [ -1,  0,  0 ], [  1,  0,  0 ] ],
+#  #    [ [  0, -1,  0 ], [  0,  1,  0 ] ],
+#  #    [ [  0,  0, -1 ], [  0,  0,  1 ] ],
+#  #  ]
+#  #
+#  #凸包であることのチェックは難しいのでしない。
+#  #TODO: 頂点が重複している、面上にあるなどのチェックも本来はすべきだが、入れていない。
+#  def initialize( pairs )
+#    raise InitializeError if pairs.class != Array
+#    raise InitializeError if pairs.size != 3
+#    pairs.each do |pair|
+#      raise InitializeError unless pair.class == Array
+#      raise InitializeError if pair.size != 2
+#      pair.each do |pos|
+#        raise InitializeError if pos.size != 3
+#        raise InitializeError unless pos.methods.include?( :[] )
+#        raise InitializeError unless pos.methods.include?( :map )
+#      end
+#    end
+#
+#    pairs.flatten.each do |vertex|
+#      raise InitializeError if vertex.class == Mageo::Vector3DInternal
+#    end
+#
+#
+#    @vertices = []
+#    pairs.each do |pair|
+#      pair.each do |vertex|
+#        @vertices << vertex.to_v3d
+#      end
+#    end
+#
+#    @vertex_indices_of_triangles = [
+#      [ 0, 2, 4],
+#      [ 0, 2, 5],
+#      [ 0, 3, 4],
+#      [ 0, 3, 5],
+#      [ 1, 2, 4],
+#      [ 1, 2, 5],
+#      [ 1, 3, 4],
+#      [ 1, 3, 5]
+#    ]
+#  end
+#end

data/lib/mageo/polyhedron.rb

@@ -5,6 +5,8 @@ require "rubygems"
 gem     "builtinextension"
 require "array/includeeql.rb"
 
+# This class is obsoleted.
+#
 # 多面体を表現する抽象クラス。
 # 面は必ず三角形で、たとえば四角形も2つの三角形であると考える。
 # initialize メソッドは subclass で再定義する。
@@ -20,105 +22,94 @@ require "array/includeeql.rb"
 #     see Mageo::Tetrahedron.rb
 #   - メインのテストは 四面体 Mageo::Tetrahedron クラスで行っている。
 class Mageo::Polyhedron
-  attr_reader :vertices
-
-  class TypeError < Exception; end
-
-  # initialize で例外を返すことでインスタンスを生成できない抽象クラスを表現。
-  # subclass で再定義する。
-  def initialize()
-    raise NotImplementedError, "need to define `initialize'"
-  end
-
-  def edges
-    results = []
-    triangles.each do |triangle|
-      triangle.edges.each do |edge|
-        results << edge unless results.include_eql?(edge)
-      end
-    end
-    return results
-  end
-
-  def triangles
-    results = @vertex_indices_of_triangles.map do |indices|
-      Mageo::Triangle.new( indices.map{|i| @vertices[i] } )
-    end
-    return results
-  end
-
-  #面で囲まれた空間の中にあれば true を返す。
-  def inside?( pos )
-    raise TypeError if pos.class == Mageo::Vector3DInternal
-
-    result = true
-    triangles.each do |triangle|
-      result = false unless triangle.same_side?( center, pos.to_v3d )
-    end
-    return result
-  end
-
-  def include?(pos, tolerance = 0.0)
-    raise TypeError if pos.class == Mageo::Vector3DInternal
-
-    return true if inside?( pos )
-    triangles.each do |triangle|
-      #pp pos
-      #pp triangle
-      return true if triangle.include?(pos.to_v3d, tolerance)
-    end
-    return false
-  end
-
-  # 体積を返す。
-  def volume
-    result = 0.0
-    @vertex_indices_of_triangles.each do |tri_vertices|
-      vectors =  tri_vertices.map { |i| @vertices[i] - center }
-      volume = Mageo::Vector3D.scalar_triple_product( *vectors ).abs
-      volume /= 6.0
-      result += volume
-    end
-    return result
-  end
-
-  #各頂点の座標の平均値を返す。
-  def center
-    tmp = Mageo::Vector3D[ 0.0, 0.0, 0.0 ]
-    @vertices.each do |vertex|
-      tmp += vertex
-    end
-    return tmp * ( 1.0 / @vertices.size.to_f ) # 座標の平均の算出
-  end
-
-  def translate!(vector)
-    @vertices.map! do |pos|
-      pos + vector
-    end
-  end
-
-  def translate(vector)
-    result = Marshal.load(Marshal.dump(self))
-    result.translate! vector
-    result
-  end
-
-  def shared_vertices(other, tolerance = 0.0)
-    results = []
-    @vertices.each do |sv|
-      flag = false
-      other.vertices.each do |ov|
-        flag = true if (ov - sv).r <= tolerance
-      end
-      results << sv if flag
-    end
-    results
-  end
-
-  #private
-
-  #def vertices_include?(vertex, vertices, tolerance)
-  #end
-
+#  attr_reader :vertices
+#
+#  class TypeError < StandardError; end
+#  class NotImplementError < StandardError; end
+#
+#  # initialize で例外を返すことでインスタンスを生成できない抽象クラスを表現。
+#  # subclass で再定義する。
+#  def initialize()
+#    raise NotImplementedError, "need to define `initialize'"
+#  end
+#
+#  def edges
+#    results = []
+#    triangles.each do |triangle|
+#      triangle.edges.each do |edge|
+#        results << edge unless results.include_eql?(edge)
+#      end
+#    end
+#    return results
+#  end
+#
+#  def triangles
+#    results = Mageo::Tetrahedron::VERTEX_INDICES_OF_TRIANGLES.map do |indices|
+#      Mageo::Triangle.new( *(indices.map{|i| @vertices[i] }) )
+#    end
+#    return results
+#  end
+#
+#  #面で囲まれた空間の中にあれば true を返す。
+#  def inside?( pos )
+#    raise TypeError if pos.class == Mageo::Vector3DInternal
+#
+#    result = true
+#    triangles.each do |triangle|
+#      result = false unless triangle.same_side?( center, pos.to_v3d )
+#    end
+#    return result
+#  end
+#
+#  def include?(pos, tolerance = 0.0)
+#    raise TypeError if pos.class == Mageo::Vector3DInternal
+#
+#    return true if inside?( pos )
+#    triangles.each do |triangle|
+#      #pp pos
+#      #pp triangle
+#      return true if triangle.include?(pos.to_v3d, tolerance)
+#    end
+#    return false
+#  end
+#
+#  #各頂点の座標の平均値を返す。
+#  def center
+#    tmp = Mageo::Vector3D[ 0.0, 0.0, 0.0 ]
+#    @vertices.each do |vertex|
+#      tmp += vertex
+#    end
+#    return tmp * ( 1.0 / @vertices.size.to_f ) # 座標の平均の算出
+#  end
+#
+#  def translate!(vector)
+#    @vertices.map! do |pos|
+#      pos + vector
+#    end
+#  end
+#
+#  def translate(vector)
+#    result = Marshal.load(Marshal.dump(self))
+#    result.translate! vector
+#    result
+#  end
+#
+#  def shared_vertices(other, tolerance = 0.0)
+#    results = []
+#    @vertices.each do |sv|
+#      flag = false
+#      other.vertices.each do |ov|
+#        flag = true if (ov - sv).r <= tolerance
+#      end
+#      results << sv if flag
+#    end
+#    results
+#  end
+#
+#  #private
+#
+#  #def vertices_include?(vertex, vertices, tolerance)
+#  #end
+#
 end
 

data/lib/mageo/tetrahedron.rb

@@ -4,33 +4,128 @@
 #
 # 直交座標系 3次元空間内の四面体を表現するクラス。
 #
-class Mageo::Tetrahedron < Mageo::Polyhedron
+#class Mageo::Tetrahedron < Mageo::Polyhedron
+class Mageo::Tetrahedron
 
   class InitializeError < Exception; end
 
-  # vertices には四面体の頂点を順不同で入れた Array。
-  def initialize( vertices )
-    raise InitializeError if vertices.class != Array
-    raise InitializeError if vertices.size != 4
-    vertices.each do |vertex|
-      raise InitializeError if vertex.size != 3
-      raise InitializeError unless vertex.methods.include?( :[] )
-      raise InitializeError unless vertex.methods.include?( :map )
+  VERTEX_INDICES_OF_TRIANGLES = [ [ 0, 1, 2 ], [ 1, 2, 3 ], [ 2, 3, 0 ], [ 3, 0, 1 ] ]
+
+  attr_reader :vertices
+
+  class TypeError < StandardError; end
+  class NotImplementError < StandardError; end
+
+  def edges
+    results = []
+    triangles.each do |triangle|
+      triangle.edges.each do |edge|
+        results << edge unless results.include_eql?(edge)
+      end
+    end
+    return results
+  end
+
+  def triangles
+    results = VERTEX_INDICES_OF_TRIANGLES.map do |indices|
+      Mageo::Triangle.new( *(indices.map{|i| @vertices[i] }) )
+    end
+    return results
+  end
+
+  #面で囲まれた空間の中にあれば true を返す。
+  def inside?( pos )
+    raise TypeError if pos.class == Mageo::Vector3DInternal
+
+    result = true
+    triangles.each do |triangle|
+      result = false unless triangle.same_side?( center, pos.to_v3d )
+    end
+    return result
+  end
+
+  def include?(pos, tolerance = 0.0)
+    raise TypeError if pos.class == Mageo::Vector3DInternal
+
+    return true if inside?( pos )
+    triangles.each do |triangle|
+      #pp pos
+      #pp triangle
+      return true if triangle.include?(pos.to_v3d, tolerance)
+    end
+    return false
+  end
+
+  #各頂点の座標の平均値を返す。
+  def center
+    tmp = Mageo::Vector3D[ 0.0, 0.0, 0.0 ]
+    @vertices.each do |vertex|
+      tmp += vertex
     end
+    return tmp * ( 1.0 / @vertices.size.to_f ) # 座標の平均の算出
+  end
+
+  def translate!(vector)
+    @vertices.map! do |pos|
+      pos + vector
+    end
+  end
+
+  def translate(vector)
+    result = Marshal.load(Marshal.dump(self))
+    result.translate! vector
+    result
+  end
+
+  def shared_vertices(other, tolerance = 0.0)
+    results = []
+    @vertices.each do |sv|
+      flag = false
+      other.vertices.each do |ov|
+        flag = true if (ov - sv).r <= tolerance
+      end
+      results << sv if flag
+    end
+    results
+  end
+
+  #private
+
+  #def vertices_include?(vertex, vertices, tolerance)
+  #end
+
+
+  ## v0, v1, v2, v3 are 四面体の頂点
+  def initialize( v0, v1, v2, v3 )
+    #raise InitializeError if vertices.class != Array
+    #raise InitializeError if vertices.size != 4
+    #vertices.each do |vertex|
+    #  raise InitializeError if vertex.size != 3
+    #  raise InitializeError unless vertex.methods.include?( :[] )
+    #  raise InitializeError unless vertex.methods.include?( :map )
+    #end
+    #@vertices = vertices.map { |vertex| vertex.to_v3d }
+    vertices = [v0, v1, v2, v3]
     vertices.each do |vertex|
       raise InitializeError if vertex.class == Mageo::Vector3DInternal
     end
 
-    @vertices = vertices.map { |vertex| vertex.to_v3d }
-
-    @vertex_indices_of_triangles = [
-      [ 0, 1, 2 ], 
-      [ 1, 2, 3 ],
-      [ 2, 3, 0 ], 
-      [ 3, 0, 1 ],
-    ]
+    @vertices = vertices.map {|v| v.to_v3d}
 
     raise InitializeError, "volume is zero." if volume == 0.0
   end
+
+  # 体積を返す
+  def volume
+    result = 0.0
+    [ [ 0, 1, 2 ], [ 1, 2, 3 ], [ 2, 3, 0 ], [ 3, 0, 1 ] ].each do |tri_vertices|
+      vectors =  tri_vertices.map { |i| @vertices[i] - center }
+      volume = Mageo::Vector3D.scalar_triple_product( *vectors ).abs
+      volume /= 6.0
+      result += volume
+    end
+    return result
+  end
+
 end
 

data/lib/mageo/triangle.rb

@@ -22,17 +22,19 @@ class Mageo::Triangle
   #座標が整数で入っていたとしても内部的には Float に変換して使用する。
   #3点が1直線上に並んでいて三角形を囲まない場合は
   #例外 Mageo::Triangle::LinearException を投げる。
-  def initialize( vertices )
-    raise InitializeError unless vertices.methods.include?( :size )
-    raise InitializeError if vertices.size != 3
-    vertices.each do |pos|
-      raise InitializeError if pos.size != 3
-      raise InitializeError unless pos.methods.include?( :[] )
-      raise InitializeError unless pos.methods.include?( :map )
-    end
-    @vertices = vertices.map do |pos| 
-      ( pos.map { |i| i.to_f }) . to_v3d
-    end
+  #def initialize( vertices )
+  def initialize( v0, v1, v2 )
+    #raise InitializeError unless vertices.methods.include?( :size )
+    #raise InitializeError if vertices.size != 3
+    #vertices.each do |pos|
+    #  raise InitializeError if pos.size != 3
+    #  raise InitializeError unless pos.methods.include?( :[] )
+    #  raise InitializeError unless pos.methods.include?( :map )
+    #end
+    #@vertices = vertices.map do |pos| 
+    #  ( pos.map { |i| i.to_f }) . to_v3d
+    #end
+    @vertices = [v0.to_v3d, v1.to_v3d, v2.to_v3d]
 
     #Checking on linear.
     edge1 = @vertices[1] - @vertices[0]

data/mageo.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: mageo 0.0.5 ruby lib
+# stub: mageo 0.1.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "mageo"
-  s.version = "0.0.5"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["ippei94da"]
-  s.date = "2016-05-09"
+  s.date = "2016-07-12"
   s.description = "MAth GEOmetry library to deal with 2 and 3 dimensional spaces.\n    Cartesian and internal coordinate systems can be used.\n    This includes besic objects in 3 dimensional space.\n  "
   s.email = "ippei94da@gmail.com"
   s.extra_rdoc_files = [
@@ -65,7 +65,7 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<test-unit>, ["~> 3.1"])
+      s.add_development_dependency(%q<test-unit>, ["~> 3.2"])
       s.add_development_dependency(%q<rdoc>, ["~> 4.2"])
       s.add_development_dependency(%q<bundler>, ["~> 1.11"])
       s.add_development_dependency(%q<jeweler>, ["~> 2.0"])
@@ -73,7 +73,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<builtinextension>, ["~> 0.1"])
       s.add_development_dependency(%q<malge>, ["~> 0.0"])
     else
-      s.add_dependency(%q<test-unit>, ["~> 3.1"])
+      s.add_dependency(%q<test-unit>, ["~> 3.2"])
       s.add_dependency(%q<rdoc>, ["~> 4.2"])
       s.add_dependency(%q<bundler>, ["~> 1.11"])
       s.add_dependency(%q<jeweler>, ["~> 2.0"])
@@ -82,7 +82,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<malge>, ["~> 0.0"])
     end
   else
-    s.add_dependency(%q<test-unit>, ["~> 3.1"])
+    s.add_dependency(%q<test-unit>, ["~> 3.2"])
     s.add_dependency(%q<rdoc>, ["~> 4.2"])
     s.add_dependency(%q<bundler>, ["~> 1.11"])
     s.add_dependency(%q<jeweler>, ["~> 2.0"])

data/test/test_cylinder.rb

@@ -9,7 +9,8 @@ require "helper"
 
 class TC_Cylinder < Test::Unit::TestCase
   def setup
-    @c00 = Mageo::Cylinder.new([[0.0, 1.0, 2.0], [1.0, 2.0, 3.0]], 3.0)
+    #@c00 = Mageo::Cylinder.new([[0.0, 1.0, 2.0], [1.0, 2.0, 3.0]], 3.0)
+    @c00 = Mageo::Cylinder.new([0.0, 1.0, 2.0], [1.0, 2.0, 3.0], 3.0)
   end
 
   def test_initialize

data/test/test_octahedron.rb

@@ -1,154 +1,150 @@
-#! /usr/bin/env ruby
-# coding: utf-8
-
-require "helper"
-#gem "builtinextension"
-#require "array/includeeql.rb"
-
-class Mageo::Octahedron
-  public :center
-end
-
-class TC_Octahedron < Test::Unit::TestCase
-  $tolerance = 10**(-10)
-
-  V_X_PLUS  = Mageo::Vector3D[  1,  0,  0 ]
-  V_Y_PLUS  = Mageo::Vector3D[  0,  1,  0 ]
-  V_Z_PLUS  = Mageo::Vector3D[  0,  0,  1 ]
-
-  V_X_MINUS = Mageo::Vector3D[ -1,  0,  0 ]
-  V_Y_MINUS = Mageo::Vector3D[  0, -1,  0 ]
-  V_Z_MINUS = Mageo::Vector3D[  0,  0, -1 ]
-
-  def setup
-    @o00 = Mageo::Octahedron.new(
-      [ [V_X_MINUS, V_X_PLUS ],
-        [V_Y_MINUS, V_Y_PLUS ],
-        [V_Z_MINUS, V_Z_PLUS ] ]
-    )
-    @o01 = Mageo::Octahedron.new(
-      [ [ [ -0.5,  0.5,  0.5 ], [  1.5,  0.5,  0.5 ] ],
-        [ [  0.5, -0.5,  0.5 ], [  0.5,  1.5,  0.5 ] ],
-        [ [  0.5,  0.5, -0.5 ], [  0.5,  0.5,  1.5 ] ] ]
-    )
-  end
-
-  def test_initialize
-    assert_raise( ArgumentError ){ Mageo::Octahedron.new }
-    assert_raise( ArgumentError ){ Mageo::Octahedron.new() }
-    assert_raise( Mageo::Octahedron::InitializeError ){ Mageo::Octahedron.new( nil ) }
-    assert_raise( Mageo::Octahedron::InitializeError ){ Mageo::Octahedron.new( [] ) }
-    assert_raise( Mageo::Octahedron::InitializeError ){ Mageo::Octahedron.new( [ 0, 1, 2 ] ) }
-    assert_raise( Mageo::Octahedron::InitializeError ){ Mageo::Octahedron.new( [ [], [], [] ] ) }
-    assert_raise( Mageo::Octahedron::InitializeError ){
-      Mageo::Octahedron.new( 
-        [ [ V_X_MINUS, V_X_PLUS ],
-          [ V_Y_MINUS, V_Y_PLUS ],
-          [ V_Z_MINUS, [  0,  0 ] ]
-        ]
-      )
-    }
-    assert_raise( Mageo::Octahedron::InitializeError ){
-      Mageo::Octahedron.new( 
-        [ [ V_X_MINUS, V_X_PLUS],
-          [ V_Y_MINUS, [  0,  1,  0, 2 ] ],
-          [ V_Z_MINUS, V_Z_PLUS ]
-        ]
-      )
-    }
-    assert_raise( Mageo::Octahedron::InitializeError ){
-      Mageo::Octahedron.new( 
-        [ [ V_X_MINUS, V_X_PLUS ],
-          [ V_Y_MINUS, V_Y_PLUS ],
-          [ V_Z_MINUS, V_Z_PLUS ],
-          [ [ -5, -5, -5 ], [  5,  5,  5 ] ]
-        ]
-      )
-    }
-
-    assert_raise( Mageo::Octahedron::InitializeError ){
-      Mageo::Octahedron.new(
-        [ [ Mageo::Vector3DInternal[ -0.5,  0.5,  0.5 ], Mageo::Vector3DInternal[  1.5,  0.5,  0.5 ] ],
-          [ Mageo::Vector3DInternal[  0.5, -0.5,  0.5 ], Mageo::Vector3DInternal[  0.5,  1.5,  0.5 ] ],
-          [ Mageo::Vector3DInternal[  0.5,  0.5, -0.5 ], Mageo::Vector3DInternal[  0.5,  0.5,  1.5 ] ] ]
-      )
-    }
-
-    assert_nothing_raised{
-      Mageo::Octahedron.new(
-        [ [ Mageo::Vector3D[ -0.5,  0.5,  0.5 ], Mageo::Vector3D[  1.5,  0.5,  0.5 ] ],
-          [ Mageo::Vector3D[  0.5, -0.5,  0.5 ], Mageo::Vector3D[  0.5,  1.5,  0.5 ] ],
-          [ Mageo::Vector3D[  0.5,  0.5, -0.5 ], Mageo::Vector3D[  0.5,  0.5,  1.5 ] ] ]
-      )
-    }
-  end
-
-  def test_inside?
-    assert_equal( true , @o00.inside?( [0.0, 0.2, 0.4] ) )
-    assert_equal( false, @o00.inside?( [1.0, 0.0, 0.0] ) ) #境界上
-    assert_equal( false, @o00.inside?( [2.0, 0.2, 0.4] ) )
-  end
-
-  def test_include?
-    assert_equal( true , @o00.include?( [0.0, 0.2, 0.4], $tolerance ) )
-    assert_equal( true , @o00.include?( [1.0, 0.0, 0.0], $tolerance ) ) #境界上
-    assert_equal( true , @o00.include?( [1.0, 0.0, 0.0] ) ) #境界上, no tolerance
-    assert_equal( false, @o00.include?( [2.0, 0.2, 0.4], $tolerance ) )
-  end
-
-  def test_volume
-    assert_in_delta( 8.0/6.0 , @o00.volume, $tolerance )
-  end
-
-  def test_center
-    assert_in_delta( 0.0, @o00.center[0], $tolerance)
-    assert_in_delta( 0.0, @o00.center[1], $tolerance)
-    assert_in_delta( 0.0, @o00.center[2], $tolerance)
-
-    assert_in_delta( 0.5, @o01.center[0], $tolerance)
-    assert_in_delta( 0.5, @o01.center[1], $tolerance)
-    assert_in_delta( 0.5, @o01.center[2], $tolerance)
-  end
-
-  def test_vertices
-    t = @o00.vertices
-    assert_equal(6, t.size)
-    assert_equal(V_X_MINUS, t[0])
-    assert_equal(V_X_PLUS , t[1])
-    assert_equal(V_Y_MINUS, t[2])
-    assert_equal(V_Y_PLUS , t[3])
-    assert_equal(V_Z_MINUS, t[4])
-    assert_equal(V_Z_PLUS , t[5])
-  end
-
-  def test_triangles
-    t = @o00.triangles
-    assert_equal(8, t.size)
-    assert_equal(true, t.include_eql?(Mageo::Triangle.new([V_X_PLUS, V_Y_PLUS, V_Z_PLUS])))
-    assert_equal(true, t.include_eql?(Mageo::Triangle.new([V_X_PLUS, V_Y_PLUS, V_Z_MINUS])))
-    assert_equal(true, t.include_eql?(Mageo::Triangle.new([V_X_PLUS, V_Y_MINUS, V_Z_PLUS])))
-    assert_equal(true, t.include_eql?(Mageo::Triangle.new([V_X_PLUS, V_Y_MINUS, V_Z_MINUS])))
-    assert_equal(true, t.include_eql?(Mageo::Triangle.new([V_X_MINUS, V_Y_PLUS, V_Z_PLUS])))
-    assert_equal(true, t.include_eql?(Mageo::Triangle.new([V_X_MINUS, V_Y_PLUS, V_Z_MINUS])))
-    assert_equal(true, t.include_eql?(Mageo::Triangle.new([V_X_MINUS, V_Y_MINUS, V_Z_PLUS])))
-    assert_equal(true, t.include_eql?(Mageo::Triangle.new([V_X_MINUS, V_Y_MINUS, V_Z_MINUS])))
-  end
-
-  def test_edges
-    t = @o00.edges
-    assert_equal(12, t.size)
-    assert_equal(true, (t.include_eql?(Mageo::Segment.new(V_X_PLUS , V_Y_PLUS))))
-    assert_equal(true, (t.include_eql?(Mageo::Segment.new(V_X_PLUS , V_Y_MINUS))))
-    assert_equal(true, (t.include_eql?(Mageo::Segment.new(V_X_PLUS , V_Z_PLUS))))
-    assert_equal(true, (t.include_eql?(Mageo::Segment.new(V_X_PLUS , V_Z_MINUS))))
-    assert_equal(true, (t.include_eql?(Mageo::Segment.new(V_X_MINUS, V_Y_PLUS))))
-    assert_equal(true, (t.include_eql?(Mageo::Segment.new(V_X_MINUS, V_Y_MINUS))))
-    assert_equal(true, (t.include_eql?(Mageo::Segment.new(V_X_MINUS, V_Z_PLUS))))
-    assert_equal(true, (t.include_eql?(Mageo::Segment.new(V_X_MINUS, V_Z_MINUS))))
-    assert_equal(true, (t.include_eql?(Mageo::Segment.new(V_Y_PLUS , V_Z_PLUS))))
-    assert_equal(true, (t.include_eql?(Mageo::Segment.new(V_Y_PLUS , V_Z_MINUS))))
-    assert_equal(true, (t.include_eql?(Mageo::Segment.new(V_Y_MINUS, V_Z_PLUS))))
-    assert_equal(true, (t.include_eql?(Mageo::Segment.new(V_Y_MINUS, V_Z_MINUS))))
-  end
-end
-
+##! /usr/bin/env ruby
+## coding: utf-8
+#
+#require "helper"
+##gem "builtinextension"
+##require "array/includeeql.rb"
+#
+#class Mageo::Octahedron
+#  public :center
+#end
+#
+#class TC_Octahedron < Test::Unit::TestCase
+#  $tolerance = 10**(-10)
+#
+#  V_X_PLUS  = Mageo::Vector3D[  1,  0,  0 ]
+#  V_Y_PLUS  = Mageo::Vector3D[  0,  1,  0 ]
+#  V_Z_PLUS  = Mageo::Vector3D[  0,  0,  1 ]
+#
+#  V_X_MINUS = Mageo::Vector3D[ -1,  0,  0 ]
+#  V_Y_MINUS = Mageo::Vector3D[  0, -1,  0 ]
+#  V_Z_MINUS = Mageo::Vector3D[  0,  0, -1 ]
+#
+#  def setup
+#    @o00 = Mageo::Octahedron.new(
+#      [ [V_X_MINUS, V_X_PLUS ],
+#        [V_Y_MINUS, V_Y_PLUS ],
+#        [V_Z_MINUS, V_Z_PLUS ] ]
+#    )
+#    @o01 = Mageo::Octahedron.new(
+#      [ [ [ -0.5,  0.5,  0.5 ], [  1.5,  0.5,  0.5 ] ],
+#        [ [  0.5, -0.5,  0.5 ], [  0.5,  1.5,  0.5 ] ],
+#        [ [  0.5,  0.5, -0.5 ], [  0.5,  0.5,  1.5 ] ] ]
+#    )
+#  end
+#
+#  def test_initialize
+#    assert_raise( ArgumentError ){ Mageo::Octahedron.new }
+#    assert_raise( ArgumentError ){ Mageo::Octahedron.new() }
+#    assert_raise( Mageo::Octahedron::InitializeError ){ Mageo::Octahedron.new( nil ) }
+#    assert_raise( Mageo::Octahedron::InitializeError ){ Mageo::Octahedron.new( [] ) }
+#    assert_raise( Mageo::Octahedron::InitializeError ){ Mageo::Octahedron.new( [ 0, 1, 2 ] ) }
+#    assert_raise( Mageo::Octahedron::InitializeError ){ Mageo::Octahedron.new( [ [], [], [] ] ) }
+#    assert_raise( Mageo::Octahedron::InitializeError ){
+#      Mageo::Octahedron.new( 
+#        [ [ V_X_MINUS, V_X_PLUS ],
+#          [ V_Y_MINUS, V_Y_PLUS ],
+#          [ V_Z_MINUS, [  0,  0 ] ]
+#        ]
+#      )
+#    }
+#    assert_raise( Mageo::Octahedron::InitializeError ){
+#      Mageo::Octahedron.new( 
+#        [ [ V_X_MINUS, V_X_PLUS],
+#          [ V_Y_MINUS, [  0,  1,  0, 2 ] ],
+#          [ V_Z_MINUS, V_Z_PLUS ]
+#        ]
+#      )
+#    }
+#    assert_raise( Mageo::Octahedron::InitializeError ){
+#      Mageo::Octahedron.new( 
+#        [ [ V_X_MINUS, V_X_PLUS ],
+#          [ V_Y_MINUS, V_Y_PLUS ],
+#          [ V_Z_MINUS, V_Z_PLUS ],
+#          [ [ -5, -5, -5 ], [  5,  5,  5 ] ]
+#        ]
+#      )
+#    }
+#
+#    assert_raise( Mageo::Octahedron::InitializeError ){
+#      Mageo::Octahedron.new(
+#        [ [ Mageo::Vector3DInternal[ -0.5,  0.5,  0.5 ], Mageo::Vector3DInternal[  1.5,  0.5,  0.5 ] ],
+#          [ Mageo::Vector3DInternal[  0.5, -0.5,  0.5 ], Mageo::Vector3DInternal[  0.5,  1.5,  0.5 ] ],
+#          [ Mageo::Vector3DInternal[  0.5,  0.5, -0.5 ], Mageo::Vector3DInternal[  0.5,  0.5,  1.5 ] ] ]
+#      )
+#    }
+#
+#    assert_nothing_raised{
+#      Mageo::Octahedron.new(
+#        [ [ Mageo::Vector3D[ -0.5,  0.5,  0.5 ], Mageo::Vector3D[  1.5,  0.5,  0.5 ] ],
+#          [ Mageo::Vector3D[  0.5, -0.5,  0.5 ], Mageo::Vector3D[  0.5,  1.5,  0.5 ] ],
+#          [ Mageo::Vector3D[  0.5,  0.5, -0.5 ], Mageo::Vector3D[  0.5,  0.5,  1.5 ] ] ]
+#      )
+#    }
+#  end
+#
+#  def test_inside?
+#    assert_equal( true , @o00.inside?( [0.0, 0.2, 0.4] ) )
+#    assert_equal( false, @o00.inside?( [1.0, 0.0, 0.0] ) ) #境界上
+#    assert_equal( false, @o00.inside?( [2.0, 0.2, 0.4] ) )
+#  end
+#
+#  def test_include?
+#    assert_equal( true , @o00.include?( [0.0, 0.2, 0.4], $tolerance ) )
+#    assert_equal( true , @o00.include?( [1.0, 0.0, 0.0], $tolerance ) ) #境界上
+#    assert_equal( true , @o00.include?( [1.0, 0.0, 0.0] ) ) #境界上, no tolerance
+#    assert_equal( false, @o00.include?( [2.0, 0.2, 0.4], $tolerance ) )
+#  end
+#
+#  def test_center
+#    assert_in_delta( 0.0, @o00.center[0], $tolerance)
+#    assert_in_delta( 0.0, @o00.center[1], $tolerance)
+#    assert_in_delta( 0.0, @o00.center[2], $tolerance)
+#
+#    assert_in_delta( 0.5, @o01.center[0], $tolerance)
+#    assert_in_delta( 0.5, @o01.center[1], $tolerance)
+#    assert_in_delta( 0.5, @o01.center[2], $tolerance)
+#  end
+#
+#  def test_vertices
+#    t = @o00.vertices
+#    assert_equal(6, t.size)
+#    assert_equal(V_X_MINUS, t[0])
+#    assert_equal(V_X_PLUS , t[1])
+#    assert_equal(V_Y_MINUS, t[2])
+#    assert_equal(V_Y_PLUS , t[3])
+#    assert_equal(V_Z_MINUS, t[4])
+#    assert_equal(V_Z_PLUS , t[5])
+#  end
+#
+#  def test_triangles
+#    t = @o00.triangles
+#    assert_equal(8, t.size)
+#    assert_equal(true, t.include_eql?(Mageo::Triangle.new([V_X_PLUS, V_Y_PLUS, V_Z_PLUS])))
+#    assert_equal(true, t.include_eql?(Mageo::Triangle.new([V_X_PLUS, V_Y_PLUS, V_Z_MINUS])))
+#    assert_equal(true, t.include_eql?(Mageo::Triangle.new([V_X_PLUS, V_Y_MINUS, V_Z_PLUS])))
+#    assert_equal(true, t.include_eql?(Mageo::Triangle.new([V_X_PLUS, V_Y_MINUS, V_Z_MINUS])))
+#    assert_equal(true, t.include_eql?(Mageo::Triangle.new([V_X_MINUS, V_Y_PLUS, V_Z_PLUS])))
+#    assert_equal(true, t.include_eql?(Mageo::Triangle.new([V_X_MINUS, V_Y_PLUS, V_Z_MINUS])))
+#    assert_equal(true, t.include_eql?(Mageo::Triangle.new([V_X_MINUS, V_Y_MINUS, V_Z_PLUS])))
+#    assert_equal(true, t.include_eql?(Mageo::Triangle.new([V_X_MINUS, V_Y_MINUS, V_Z_MINUS])))
+#  end
+#
+#  def test_edges
+#    t = @o00.edges
+#    assert_equal(12, t.size)
+#    assert_equal(true, (t.include_eql?(Mageo::Segment.new(V_X_PLUS , V_Y_PLUS))))
+#    assert_equal(true, (t.include_eql?(Mageo::Segment.new(V_X_PLUS , V_Y_MINUS))))
+#    assert_equal(true, (t.include_eql?(Mageo::Segment.new(V_X_PLUS , V_Z_PLUS))))
+#    assert_equal(true, (t.include_eql?(Mageo::Segment.new(V_X_PLUS , V_Z_MINUS))))
+#    assert_equal(true, (t.include_eql?(Mageo::Segment.new(V_X_MINUS, V_Y_PLUS))))
+#    assert_equal(true, (t.include_eql?(Mageo::Segment.new(V_X_MINUS, V_Y_MINUS))))
+#    assert_equal(true, (t.include_eql?(Mageo::Segment.new(V_X_MINUS, V_Z_PLUS))))
+#    assert_equal(true, (t.include_eql?(Mageo::Segment.new(V_X_MINUS, V_Z_MINUS))))
+#    assert_equal(true, (t.include_eql?(Mageo::Segment.new(V_Y_PLUS , V_Z_PLUS))))
+#    assert_equal(true, (t.include_eql?(Mageo::Segment.new(V_Y_PLUS , V_Z_MINUS))))
+#    assert_equal(true, (t.include_eql?(Mageo::Segment.new(V_Y_MINUS, V_Z_PLUS))))
+#    assert_equal(true, (t.include_eql?(Mageo::Segment.new(V_Y_MINUS, V_Z_MINUS))))
+#  end
+#end
+#

data/test/test_polar3d.rb

@@ -19,6 +19,10 @@ class TC_Polar3D < Test::Unit::TestCase
     @p3d03 = Mageo::Polar3D.new( 2.0, 0.25*PI, 0.25*PI)
   end
 
+  #def test_self_polar2cartesian
+  #  
+  #end
+
   def test_to_v3d
     assert_equal( Mageo::Vector3D, @p3d00.to_v3d.class )
     assert_in_delta( 0.0, @p3d00.to_v3d[0], $tolerance )
@@ -40,7 +44,6 @@ class TC_Polar3D < Test::Unit::TestCase
     assert_in_delta( 1.0 , @p3d03.to_v3d[0], $tolerance)
     assert_in_delta( 1.0 , @p3d03.to_v3d[1], $tolerance)
     assert_in_delta( Math::sqrt(2.0), @p3d03.to_v3d[2], $tolerance )
-
   end
 
   def test_minimize_phi!

data/test/test_polyhedron.rb

@@ -1,15 +1,15 @@
-#! /usr/bin/env ruby
-# coding: utf-8
-
-#require "test/unit"
-require "helper"
-#require 'mageo.rb'
-#require "mageo/polyhedron.rb"
-
-# initialize でインスタンスを生成できないことのみテストする。
-# その他の機能はサブクラスでテスト。
-class TC_Polyhedron < Test::Unit::TestCase
-  def test_initialize
-    assert_raise( NotImplementedError ) { Mageo::Polyhedron.new }
-  end
-end
+##! /usr/bin/env ruby
+## coding: utf-8
+#
+##require "test/unit"
+#require "helper"
+##require 'mageo.rb'
+##require "mageo/polyhedron.rb"
+#
+## initialize でインスタンスを生成できないことのみテストする。
+## その他の機能はサブクラスでテスト。
+#class TC_Polyhedron < Test::Unit::TestCase
+#  def test_initialize
+#    assert_raise( NotImplementedError ) { Mageo::Polyhedron.new }
+#  end
+#end

data/test/test_tetrahedron.rb

@@ -27,48 +27,42 @@ class TC_Tetrahedron < Test::Unit::TestCase
   V_13 = Mageo::Vector3D[10.0,20.0, 0.0]
 
   def setup
-    @t00 = Mageo::Tetrahedron.new( [ V_00, V_01, V_02, V_03 ])
-    @t01 = Mageo::Tetrahedron.new( [ V_10, V_11, V_12, V_13 ])
+    @t00 = Mageo::Tetrahedron.new(V_00, V_01, V_02, V_03)
+    @t01 = Mageo::Tetrahedron.new(V_10, V_11, V_12, V_13)
   end
 
   def test_initialize
     assert_raise( ArgumentError ){ Mageo::Tetrahedron.new }
     assert_raise( ArgumentError ){ Mageo::Tetrahedron.new() }
-    assert_raise( Mageo::Tetrahedron::InitializeError ){ Mageo::Tetrahedron.new( nil ) }
-    assert_raise( Mageo::Tetrahedron::InitializeError ){ Mageo::Tetrahedron.new( [] ) }
-    assert_raise( Mageo::Tetrahedron::InitializeError ){ Mageo::Tetrahedron.new( [ 0, 1, 2, 3 ] ) }
-    assert_raise( Mageo::Tetrahedron::InitializeError ){ Mageo::Tetrahedron.new( [ [], [], [], [] ] ) }
-    assert_raise( Mageo::Tetrahedron::InitializeError ){
-      Mageo::Tetrahedron.new( [ V_00, V_01, V_02, [ 0.0, 0.0 ] ])
-    }
-    assert_raise( Mageo::Tetrahedron::InitializeError ){
-      Mageo::Tetrahedron.new( [ V_00, V_01, V_02, [ 0.0, 0.0, 1.0, 0.0 ] ])
-    }
+    #assert_raise( Mageo::Tetrahedron::InitializeError ){ Mageo::Tetrahedron.new( nil ) }
+    #assert_raise( Mageo::Tetrahedron::InitializeError ){ Mageo::Tetrahedron.new( [] ) }
+    #assert_raise( Mageo::Tetrahedron::InitializeError ){ Mageo::Tetrahedron.new( 0, 1, 2, 3 ) }
+    #assert_raise( Mageo::Tetrahedron::InitializeError ){ Mageo::Tetrahedron.new( [ [], [], [], [] ] ) }
+    #assert_raise( Mageo::Tetrahedron::InitializeError ){
+    #  Mageo::Tetrahedron.new(V_00, V_01, V_02, [ 0.0, 0.0 ])
+    #}
+    #assert_raise( Mageo::Tetrahedron::InitializeError ){
+    #  Mageo::Tetrahedron.new(V_00, V_01, V_02, [ 0.0, 0.0, 1.0, 0.0 ])
+    #}
 
-    # 5点ある
-    assert_raise( Mageo::Tetrahedron::InitializeError ){
-      Mageo::Tetrahedron.new( [ V_00, V_01, V_02, V_03, [ 1.0, 1.0, 1.0] ])
-    }
-  
     # 体積が 0.0 になるのはエラー
     assert_raise( Mageo::Tetrahedron::InitializeError ){
-      Mageo::Tetrahedron.new( [ V_00, V_01, V_02, [ 2.0, 2.0, 0.0] ])
+      Mageo::Tetrahedron.new(V_00, V_01, V_02, [ 2.0, 2.0, 0.0])
     }
 
     # Mageo::Vector3DInternal なら 例外
     assert_raise( Mageo::Tetrahedron::InitializeError ){
-      Mageo::Tetrahedron.new( 
-        [ Mageo::Vector3DInternal[ 0.0, 0.0, 0.0],
-          Mageo::Vector3DInternal[ 1.0, 0.0, 0.0],
-          Mageo::Vector3DInternal[ 0.0, 1.0, 0.0],
-          Mageo::Vector3DInternal[ 0.0, 0.0, 1.0]
-        ]
+      Mageo::Tetrahedron.new(
+        Mageo::Vector3DInternal[ 0.0, 0.0, 0.0],
+        Mageo::Vector3DInternal[ 1.0, 0.0, 0.0],
+        Mageo::Vector3DInternal[ 0.0, 1.0, 0.0],
+        Mageo::Vector3DInternal[ 0.0, 0.0, 1.0]
       )
     }
   
     # Mageo::Vector3D なら OK
     assert_nothing_raised{
-      Mageo::Tetrahedron.new( [ V_00, V_01, V_02, V_03 ])
+      Mageo::Tetrahedron.new( V_00, V_01, V_02, V_03)
     }
   end
 
@@ -78,7 +72,6 @@ class TC_Tetrahedron < Test::Unit::TestCase
     assert_equal( false, @t00.inside?( [-5.0,-5.0,-5.0] ) )
     assert_equal( false, @t00.inside?( [ 0.0, 0.0, 0.0] ) ) #頂点上
 
-    assert_raise(Mageo::Polyhedron::TypeError){@t00.inside?(Mageo::Vector3DInternal[1.0, 1.0, 1.0])}
     assert_raise(Mageo::Tetrahedron::TypeError){@t00.inside?(Mageo::Vector3DInternal[1.0, 1.0, 1.0])}
     #pp Mageo::Polyhedron::TypeError.ancestors
     #pp Mageo::Tetrahedron::TypeError.ancestors
@@ -92,7 +85,6 @@ class TC_Tetrahedron < Test::Unit::TestCase
 
     assert_equal( false, @t01.include?(Mageo::Vector3D[ 3.0, 6.0, 30.0], $tolerance))
 
-    assert_raise(Mageo::Polyhedron::TypeError){@t00.include?(Mageo::Vector3DInternal[1.0, 1.0, 1.0], $tolerance)}
   end
 
   def test_volume
@@ -112,10 +104,10 @@ class TC_Tetrahedron < Test::Unit::TestCase
   def test_triangles
     t = @t00.triangles
     assert_equal(4, t.size)
-    assert_equal(Mageo::Triangle.new([V_00, V_01, V_02]) ,t[0])
-    assert_equal(Mageo::Triangle.new([V_01, V_02, V_03]) ,t[1])
-    assert_equal(Mageo::Triangle.new([V_02, V_03, V_00]) ,t[2])
-    assert_equal(Mageo::Triangle.new([V_03, V_00, V_01]) ,t[3])
+    assert_equal(Mageo::Triangle.new(V_00, V_01, V_02) ,t[0])
+    assert_equal(Mageo::Triangle.new(V_01, V_02, V_03) ,t[1])
+    assert_equal(Mageo::Triangle.new(V_02, V_03, V_00) ,t[2])
+    assert_equal(Mageo::Triangle.new(V_03, V_00, V_01) ,t[3])
   end
 
   def test_edges
@@ -182,23 +174,23 @@ class TC_Tetrahedron < Test::Unit::TestCase
     v859 = Mageo::Vector3D[ 8.0, 5.0, 9.0]
 
     # Mismatch is only the order of vertices.
-    t11 = Mageo::Tetrahedron.new( [ V_01, V_02, V_03, V_00 ])
+    t11 = Mageo::Tetrahedron.new( V_01, V_02, V_03, V_00)
     results = @t00.shared_vertices(t11)
     assert_equal([ V_00, V_01, V_02, V_03 ], results)
 
-    t11 = Mageo::Tetrahedron.new([V_01, V_02, v123, V_00])
+    t11 = Mageo::Tetrahedron.new(V_01, V_02, v123, V_00)
     results = @t00.shared_vertices(t11)
     assert_equal([V_00, V_01, V_02], results)
 
-    t11 = Mageo::Tetrahedron.new([V_01, v234, v123, V_00])
+    t11 = Mageo::Tetrahedron.new(V_01, v234, v123, V_00)
     results = @t00.shared_vertices(t11)
     assert_equal([V_00, V_01], results)
 
-    t11 = Mageo::Tetrahedron.new([v346, v234, v123, V_00])
+    t11 = Mageo::Tetrahedron.new(v346, v234, v123, V_00)
     results = @t00.shared_vertices(t11)
     assert_equal([V_00], results)
 
-    t11 = Mageo::Tetrahedron.new([v346, v234, v123, v859])
+    t11 = Mageo::Tetrahedron.new(v346, v234, v123, v859)
     results = @t00.shared_vertices(t11)
     assert_equal([], results)
 
@@ -206,7 +198,7 @@ class TC_Tetrahedron < Test::Unit::TestCase
     v01a = Mageo::Vector3D[10.0+1.0E-13, 0.0+1.0E-13, 0.0+1.0E-13]
     v02a = Mageo::Vector3D[ 0.0+1.0E-13,10.0+1.0E-13, 0.0+1.0E-13]
     v03a = Mageo::Vector3D[ 0.0+1.0E-13, 0.0+1.0E-13,10.0+1.0E-13]
-    t11 = Mageo::Tetrahedron.new( [ v01a, v02a, v03a, v00a ])
+    t11 = Mageo::Tetrahedron.new( v01a, v02a, v03a, v00a)
     results = @t00.shared_vertices(t11)
     assert_equal([], results)
     results = @t00.shared_vertices(t11, 1.0E-10)

data/test/test_triangle.rb

@@ -20,26 +20,17 @@ class TC_Triangle < Test::Unit::TestCase
   VEC_Z = Mageo::Vector3D[0.0, 0.0, 1.0]
 
   def setup
-    @t00 = Mageo::Triangle.new([VEC_O, VEC_X, VEC_Y])
-    @t01 = Mageo::Triangle.new([VEC_X, VEC_Y, VEC_Z])
-    @t02 = Mageo::Triangle.new([[10.0,10.0,10.0], [20.0,10.0,10.0], [10.0,20.0,10.0]])
-    @t03 = Mageo::Triangle.new([[10.0,20.0,30.0], [ 0.0,20.0,30.0], [10.0, 0.0,30.0]])
+    @t00 = Mageo::Triangle.new(VEC_O, VEC_X, VEC_Y)
+    @t01 = Mageo::Triangle.new(VEC_X, VEC_Y, VEC_Z)
+    @t02 = Mageo::Triangle.new([10.0,10.0,10.0], [20.0,10.0,10.0], [10.0,20.0,10.0])
+    @t03 = Mageo::Triangle.new([10.0,20.0,30.0], [ 0.0,20.0,30.0], [10.0, 0.0,30.0])
   end
 
   def test_initialize
-    assert_raise( ArgumentError ){ Mageo::Triangle.new }
-    assert_raise( ArgumentError ){ Mageo::Triangle.new() }
-    assert_raise( Mageo::Triangle::InitializeError ){ Mageo::Triangle.new( nil ) }
-    assert_raise( Mageo::Triangle::InitializeError ){ Mageo::Triangle.new( [] ) }
-    assert_raise( Mageo::Triangle::InitializeError ){ Mageo::Triangle.new( [ 0, 1 ] ) }
-    assert_raise( Mageo::Triangle::InitializeError ){ Mageo::Triangle.new( [ 0, 1, 2 ] ) }
-    assert_raise( Mageo::Triangle::InitializeError ){ Mageo::Triangle.new( [ 0, 1, 2, 3 ] ) } 
-    assert_raise( Mageo::Triangle::InitializeError ){ Mageo::Triangle.new( [ [ 0, 0, 0 ], [ 1, 1, 1 ], [ 2, 3 ] ] ) } #3次元座標になっていないものがある。
-
-    assert_raise( Mageo::Triangle::LinearException ){ Mageo::Triangle.new( [ [ 0, 0, 0 ], [ 0, 0, 0 ], [ 2, 2, 2 ] ] ) } #同一の点を含む。
-    assert_raise( Mageo::Triangle::LinearException ){ Mageo::Triangle.new( [ [ 0, 0, 0 ], [ 1, 1, 1 ], [ 2, 2, 2 ] ] ) } #直線上に並ぶ
-
-    assert_equal( Mageo::Triangle, Mageo::Triangle.new( [ Mageo::Vector3D[ 0, 0, 0 ], Mageo::Vector3D[ 1, 0, 0 ], Mageo::Vector3D[ 0, 1, 0 ] ] ).class )
+    assert_raise( Mageo::Triangle::LinearException ){ Mageo::Triangle.new( [ 0, 0, 0 ], [ 0, 0, 0 ], [ 2, 2, 2 ] ) } #同一の点を含む。
+    assert_raise( Mageo::Triangle::LinearException ){ Mageo::Triangle.new( [ 0, 0, 0 ], [ 1, 1, 1 ], [ 2, 2, 2 ] ) } #直線上に並ぶ
+
+    assert_equal( Mageo::Triangle, Mageo::Triangle.new( Mageo::Vector3D[ 0, 0, 0 ], Mageo::Vector3D[ 1, 0, 0 ], Mageo::Vector3D[ 0, 1, 0 ] ).class )
   end
 
   def test_vertices
@@ -190,44 +181,44 @@ class TC_Triangle < Test::Unit::TestCase
       @t00.equivalent?([[ 0.0, 0.0, 0.0], [ 1.0, 0.0, 0.0], [ 0.0, 1.0, 0.0]])
     }
 
-    t = Mageo::Triangle.new([[ 0.0, 0.0, 0.0], [ 1.0, 0.0, 0.0], [ 0.0, 1.0, 0.0]])
+    t = Mageo::Triangle.new([ 0.0, 0.0, 0.0], [ 1.0, 0.0, 0.0], [ 0.0, 1.0, 0.0])
     assert_equal(true , @t00.eql?(t))
 
-    t = Mageo::Triangle.new([[ 1.0, 0.0, 0.0], [ 0.0, 0.0, 0.0], [ 0.0, 1.0, 0.0]])
+    t = Mageo::Triangle.new([ 1.0, 0.0, 0.0], [ 0.0, 0.0, 0.0], [ 0.0, 1.0, 0.0])
     assert_equal(true , @t00.eql?(t))
 
-    t = Mageo::Triangle.new([[ 1.0, 0.0, 0.0], [ 0.0, 1.0, 0.0], [ 0.0, 0.0, 0.0]])
+    t = Mageo::Triangle.new([ 1.0, 0.0, 0.0], [ 0.0, 1.0, 0.0], [ 0.0, 0.0, 0.0])
     assert_equal(true , @t00.eql?(t))
 
-    t = Mageo::Triangle.new([[ 0.0, 0.0, 1.0], [ 1.0, 0.0, 0.0], [ 0.0, 1.0, 0.0]])
+    t = Mageo::Triangle.new([ 0.0, 0.0, 1.0], [ 1.0, 0.0, 0.0], [ 0.0, 1.0, 0.0])
     assert_equal(false, @t00.eql?(t))
 
     # tolerance を設定の上 0.0
-    t = Mageo::Triangle.new([[ 0.0, 0.0, 1.0], [ 1.0, 0.0, 0.0], [ 0.0, 1.0, 0.0]])
+    t = Mageo::Triangle.new([ 0.0, 0.0, 1.0], [ 1.0, 0.0, 0.0], [ 0.0, 1.0, 0.0])
     assert_equal(false, @t00.eql?(t, 0.0))
 
     # tolerance を 1.0 に設定
-    t = Mageo::Triangle.new([[ 0.0, 0.0, 1.0], [ 1.0, 0.0, 0.0], [ 0.0, 1.0, 0.0]])
+    t = Mageo::Triangle.new([ 0.0, 0.0, 1.0], [ 1.0, 0.0, 0.0], [ 0.0, 1.0, 0.0])
     assert_equal(true, @t00.eql?(t, 1.0))
   end
 
   def test_equal2
-    t = Mageo::Triangle.new([[ 0.0, 0.0, 0.0], [ 1.0, 0.0, 0.0], [ 0.0, 1.0, 0.0]])
+    t = Mageo::Triangle.new([ 0.0, 0.0, 0.0], [ 1.0, 0.0, 0.0], [ 0.0, 1.0, 0.0])
     assert_equal(true , @t00 == t)
 
-    t = Mageo::Triangle.new([[ 1.0, 0.0, 0.0], [ 0.0, 0.0, 0.0], [ 0.0, 1.0, 0.0]])
+    t = Mageo::Triangle.new([ 1.0, 0.0, 0.0], [ 0.0, 0.0, 0.0], [ 0.0, 1.0, 0.0])
     assert_equal(false, @t00 == t)
 
-    t = Mageo::Triangle.new([[ 1.0, 0.0, 0.0], [ 0.0, 1.0, 0.0], [ 0.0, 0.0, 0.0]])
+    t = Mageo::Triangle.new([ 1.0, 0.0, 0.0], [ 0.0, 1.0, 0.0], [ 0.0, 0.0, 0.0])
     assert_equal(false, @t00 == t)
 
-    t = Mageo::Triangle.new([[ 0.0, 0.0, 1.0], [ 1.0, 0.0, 0.0], [ 0.0, 1.0, 0.0]])
+    t = Mageo::Triangle.new([ 0.0, 0.0, 1.0], [ 1.0, 0.0, 0.0], [ 0.0, 1.0, 0.0])
     assert_equal(false, @t00 == t)
   end
 
   def test_internal_axes
-    @t01 = Mageo::Triangle.new([[ 1.0, 0.0, 0.0], [ 0.0, 1.0, 0.0], [ 0.0, 0.0, 1.0]])
-    @t02 = Mageo::Triangle.new([[10.0,10.0,10.0], [20.0,10.0,10.0], [10.0,20.0,10.0]])
+    @t01 = Mageo::Triangle.new([ 1.0, 0.0, 0.0], [ 0.0, 1.0, 0.0], [ 0.0, 0.0, 1.0])
+    @t02 = Mageo::Triangle.new([10.0,10.0,10.0], [20.0,10.0,10.0], [10.0,20.0,10.0])
 
     t = Mageo::Axes.new([[ 1.0, 0.0, 0.0], [ 0.0, 1.0, 0.0], [ 0.0, 0.0, 1.0]])
     assert_equal(t, @t00.internal_axes)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mageo
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - ippei94da
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-09 00:00:00.000000000 Z
+date: 2016-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement