geotree 1.1.1 → 1.1.2

data/lib/geotree/tools.rb

@@ -7,6 +7,7 @@ require 'fileutils'
 # A string containing a single zero, with ASCII 8-bit encoding (i.e., plain old bytes)
 ZERO_CHAR = "\0".force_encoding("ASCII-8BIT")
 
+
 def zero_bytes(count)
   ZERO_CHAR * count
 end

data/test/test_blockfile.rb

@@ -113,7 +113,7 @@ class TestBlockFile < Test::Unit::TestCase #< MyTestSuite
   
 end
 
-if true && __FILE__ == $0
+if false && __FILE__ == $0
 
   pth = '__foo__.bin'
   remove_file_or_dir(pth)

data/test/test_externalsort.rb

@@ -25,7 +25,21 @@ class TestExternalSort <  MyTestSuite
     @@test_dir = "workdir"
     mkdir(@@test_dir)
 
-    @@path = File.join(@@test_dir,"_input_.dat")
+    @@path = File.join(@@test_dir,"_input_.txt")
+    if !File.file?(@@path)
+      pr("\nConstructing test file #{@@path}...\n")
+      srand(42)
+      q = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'.split('')
+ 
+      s = ''
+      while s.size < 100000
+        m = q.shuffle
+        m = m[0..rand(q.size)]
+        s << m.join << "\n"
+      end
+      write_text_file(@@path,s)
+    end
+    
     raise Exception,"no test file found" if !File.file?(@@path)
 
     @@path3 = File.join(@@test_dir,"_largefile_.dat")

data/test/test_geotree.rb

@@ -218,7 +218,7 @@ class TestGeoTree <  MyTestSuite
 
   def test_buffering
     db = false
-#    db = true
+    #    db = true
 
     return if !db
 
@@ -341,8 +341,9 @@ class TestGeoTree <  MyTestSuite
 
     tree = GeoTree.new
     ps1 = prepare_tree(tree)
-    w = prepare_ws("tree.ps")
-    #    ps1,w = prepare_ws(tree,"tree.ps")
+    w = prepare_ws("geo_tree.ps")
+    
+    bgnd = nil
 
     50.times do |i|
       w.new_page("GeoTree")
@@ -356,15 +357,23 @@ class TestGeoTree <  MyTestSuite
 
       width = (200 * (20+i)) / 25
       height = (width * 2)/3
+
       r = Bounds.new(x-width/2,y-height/2,width,height)
       pts = tree.find(r)
       w.push(w.set_gray(0))
       w.draw_rect(r.x,r.y,r.w,r.h  )
       w.pop
 
-      w.push(w.set_rgb(0.4,0.4,0.9))
-      plot_pts_colored(w,ps1)
-      w.pop
+      if !bgnd
+        w.start_buffer
+
+        w.push(w.set_rgb(0.4,0.4,0.9))
+        plot_pts_colored(w,ps1)
+        w.pop
+        bgnd = w.stop_buffer
+        w.add_element('bgnd',bgnd)
+      end
+      w.draw_element('bgnd')
 
       w.push(w.set_rgb(0.75,0,0))
       plot_pts_colored(w,pts,1.5)
@@ -386,6 +395,8 @@ class TestGeoTree <  MyTestSuite
 
     ps1 = nil
 
+    bgnd = nil
+
     [0,1].each do |pass|
 
       if pass == 0
@@ -416,7 +427,13 @@ class TestGeoTree <  MyTestSuite
           w.draw_rect(r.x,r.y,r.w,r.h  )
           w.pop
 
-          plot_pts(w,ps1,0.8)
+          if !bgnd
+            w.start_buffer
+            plot_pts(w,ps1,0.8)
+            bgnd = w.stop_buffer
+            w.add_element('bgnd',bgnd)
+          end
+          w.draw_element('bgnd')
 
           w.push(w.set_rgb(0.75,0,0))
           plot_pts_colored(w,pts,1.2)

data/test/test_ps.rb

@@ -11,7 +11,7 @@ if defined? SINGLETEST
   end
 end
 
-class TestBlockFile < Test::Unit::TestCase #< MyTestSuite
+class TestPSWriter < MyTestSuite
 
   # --------------- tests --------------------------
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geotree
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Jeff Sember
@@ -17,8 +17,7 @@ description: "  \nA GeoTree  is a variant of a k-d tree, and stores data points
   trees can be constructed instead.\n\nThe gem includes MultiTree, a GeoTree variant
   that supports queries at \nmultiple levels of detail. For example, when focusing
   on a \nsmall region it can return points that would be omitted when querying a much
-  larger region.\n\nAnimations illustrating GeoTrees and MultiTrees in action can
-  be found in the doc directory.\n\n"
+  larger region.\n\n"
 email: jpsember@gmail.com
 executables: []
 extensions: []
@@ -37,8 +36,6 @@ files:
 - lib/geotree/pswriter.rb
 - lib/geotree/ptbuffer.rb
 - lib/geotree/tools.rb
-- lib/fig/geo_tree.pdf
-- lib/fig/multi_tree.pdf
 - CHANGELOG.txt
 - README.txt
 - test/test_blockfile.rb