compsci 0.2.0.1 → 0.3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fa74f40bbc97fa685c811d2b15738da31d69c66
-  data.tar.gz: '02965023a412fae230e7fe3e42704982c6410bab'
+  metadata.gz: 6b9d3fa913e9dc0f7aa9f8711e9aa231c00d1022
+  data.tar.gz: 8436157b3364c791cee0471ae74ca3817f0f4dde
 SHA512:
-  metadata.gz: b4832093f2d37d27b55f2b32fe20422704100d7cd515d51790d745dbf22d7006866959dc844939d2cff19e60d3ee54b78100a9785511274ed43aa22dd86a7fd8
-  data.tar.gz: 5b5ad3eeedadddd92abca745bf7822dbd9cff07fa79ccc6d34cae075d6a1c24dbc747aa1939d44806e1ad83b914b9e0b880fc6be26c505c98f869fa3dd1ff9f6
+  metadata.gz: 1670fd7283f147996dea2ed2a7a190797a33a5b22b60e8ccfa98a5dc48d61aa6a43302badbc7776b6b7c5a7171a32923ed2dc95f88c23ca998bd1d023d3f4f72
+  data.tar.gz: f30dd40fb2e5f9e04db6044d7801f1776fb0e1214fd23c29bfbef028dbcd87cab612e434e4df43da477012975561cb7eeef6dab867a53e479612893c53a9e086

data/VERSION

@@ -1 +1 @@
-0.2.0.1
+0.3.0.1

data/compsci.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.files += Dir['test/**/*.rb']
   s.files += Dir['examples/**/*.rb']
 
-  s.add_development_dependency "buildar" "~> 3.0"
+  s.add_development_dependency "buildar", "~> 3.0"
   s.add_development_dependency "minitest", "~> 5.0"
   s.add_development_dependency "rake", "~> 0"
   s.add_development_dependency "flog", "~> 0"

data/examples/heap_push.rb

@@ -3,6 +3,8 @@ require 'compsci/timer'
 
 include CompSci
 
+runtime = (ARGV.shift || "3").to_i
+
 puts <<EOF
 #
 # 3 seconds worth of pushes
@@ -10,6 +12,18 @@ puts <<EOF
 
 EOF
 
+RANDMAX = 1_000
+NUMBERWANG = 1_000
+NUMS = (0..(RANDMAX - 1)).to_a.shuffle
+
+def number(num)
+  if num % NUMBERWANG == 0
+    NUMS.shift
+    NUMS.push rand RANDMAX
+  end
+  NUMS[num % RANDMAX]
+end
+
 count = 0
 start = Timer.now
 start_100k = Timer.now
@@ -19,10 +33,10 @@ loop {
   count += 1
 
   if count % 10000 == 0
-    _answer, push_elapsed = Timer.elapsed { h.push rand 99999 }
+    _answer, push_elapsed = Timer.elapsed { h.push number(count) }
     puts "%ith push: %0.8f s" % [count, push_elapsed]
     if count % 100000 == 0
-      h.push rand 99999
+      h.push number(count)
       push_100k_elapsed = Timer.since start_100k
       puts "-------------"
       puts "    100k push: %0.8f s (%ik push / s)" %
@@ -31,10 +45,10 @@ loop {
       start_100k = Timer.now
     end
   else
-    h.push rand 99999
+    h.push number(count)
   end
 
-  break if Timer.since(start) > 3
+  break if Timer.since(start) > runtime
 }
 
 puts "pushed %i items in %0.1f s" % [count, Timer.since(start)]

data/lib/compsci/heap.rb

@@ -65,6 +65,7 @@ class CompSci::Heap < CompSci::CompleteNaryTree
   #
   def sift_up(idx)
     return self if idx <= 0
+    # print '.'
     pidx = self.class.parent_idx(idx, @child_slots)
     if !self.heapish?(pidx, idx)
       @array[idx], @array[pidx] = @array[pidx], @array[idx]   # swap

data/lib/compsci/node.rb

@@ -50,11 +50,12 @@ module CompSci
 
   # accumulate children; no child gaps
   class FlexNode < Node
+    # These methods look like convenience methods, but they provide the
+    # FlexNode interface also used by ChildFlexNode
     def add_child(node)
       @children << node
     end
 
-    # TODO: are we passing everything needed to self.class.new ?
     def new_child(value)
       self.add_child self.class.new(value)
     end
@@ -95,6 +96,8 @@ module CompSci
   end
 
   # ChildNode which accumulates children with no gaps
+  # It meets the FlexNode API but does not inherit from FlexNode since it
+  # needs to reimplement each method; instead get parent stuff from ChildNode
   class ChildFlexNode < ChildNode
     def add_child(node)
       node.parent ||= self

data/test/binary_search_tree.rb

@@ -6,16 +6,8 @@ require 'minitest/autorun'
 include CompSci
 
 describe BinarySearchTree do
-  def ww2_names(count)
-    Array.new(count) { |i| Names::WW2[i].to_s }
-  end
-
-  def nato_names(count)
-    Array.new(count) { |i| Names::NATO[i].to_s }
-  end
-
   before do
-    @keys = ww2_names(4)
+    @keys = Array.new(4) { |i| Names::WW2[i] }
     @values = Array.new(4) { Names::SOLAR.sample }
     @nodes = Array.new(4) { |i|
       KeyNode.new(@values[i], key: @keys[i], children: 2)

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: compsci
 version: !ruby/object:Gem::Version
-  version: 0.2.0.1
+  version: 0.3.0.1
 platform: ruby
 authors:
 - Rick Hull
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2017-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: buildar~> 3.0
+  name: buildar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement