compsci 0.1.0.1 → 0.1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3df760b020e177135c9d73e20f455635ca82250c
-  data.tar.gz: '0850e990c79b14fa39533e0990d707cb3f1fe7cc'
+  metadata.gz: e4f7afa18fdbd091cf4fed0668fe59204f8f05fa
+  data.tar.gz: c123e0795298ac870f4b769f97818144e50a6f74
 SHA512:
-  metadata.gz: 8997da4e5f98d35b1250d8feab97d9e46d7a193aec42a89b74e720bfff50608624b054e7e3bb85709230d2a038557919c3a2ce0d6f9f4dc22ddf88e8357d6c8c
-  data.tar.gz: 90069e7be2f383c80e0edd09c41ca566ba8481b3659c4aca90c7b23000027c3eaa1139cf980ba74737ca9ba4d20e99bd0591623be7b5872d9d7cb06ac99ce2ad
+  metadata.gz: 9072889f4e3404d945686c1dccf2818d3fd359354f7b78fa42562ecb380918abc9899cacf14ce7e1e4c29b31542b1ba0c57b8f1f15b058b12132302fc77f8f99
+  data.tar.gz: adb4c6ec9b7b23ebc5781204db5fb1062826ee19426f8c7e3ad1098c362c535cdc0e5b71c60abe9b009ed66f4ef317b3bffa36c4f8fdbda84d37fac3555f6788

data/Rakefile

@@ -31,7 +31,7 @@ metrics_tasks = []
 begin
   require 'flog_task'
   FlogTask.new do |t|
-    t.threshold = 600
+    t.threshold = 800
     t.dirs = ['lib']
     t.verbose = true
   end
@@ -79,7 +79,12 @@ def rprof_sh(script, args = '', rprof_args = '')
   lib_sh ['ruby-prof', rprof_args, script, '--', args].join(' ')
 end
 
-scripts = ["examples/binary_tree.rb", "examples/heap.rb"]
+scripts = [
+  "examples/binary_tree.rb",
+  "examples/complete_tree.rb",
+  "examples/heap.rb",
+  "examples/tree.rb",
+]
 
 desc "Run ruby-prof on examples/"
 task "ruby-prof" => "loadavg" do

data/VERSION

@@ -1 +1 @@
-0.1.0.1
+0.1.1.1

data/compsci.gemspec

@@ -15,6 +15,11 @@ 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 "minitest", "~> 5.0"
   s.add_development_dependency "rake", "~> 0"
+  s.add_development_dependency "flog", "~> 0"
+  s.add_development_dependency "flay", "~> 0"
+  s.add_development_dependency "roodi", "~> 0"
+  s.add_development_dependency "ruby-prof", "~> 0"
 end

data/examples/binary_tree.rb

@@ -13,7 +13,7 @@ EOF
 count = 0
 start = Timer.now
 start_1k = Timer.now
-tree = NaryTree.new(ChildNode, rand(99), child_slots: 2)
+tree = BinaryTree.new ChildNode, rand(99)
 
 loop {
   count += 1
@@ -50,7 +50,7 @@ EOF
 vals = Array.new(30) { rand 99 }
 p vals
 
-tree = NaryTree.new(ChildNode, vals.shift, child_slots: 2)
+tree = BinaryTree.new ChildNode, vals.shift
 tree.push vals.shift until vals.empty?
 puts tree
 

data/lib/compsci/names.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 module CompSci
   module Names
     WW1 = [:apples, :butter, :charlie, :duff, :edward, :freddy, :george,
@@ -53,80 +52,5 @@ module CompSci
       end
       names[pos]
     end
-
-    module Greek
-      UPPER = [*'Α'..'Ρ', *'Σ'..'Ω']
-      LOWER = [*('α'..'ρ'), *('σ'..'ω')]
-      SYMBOLS = [:alpha, :beta, :gamma, :delta, :epsilon, :zeta, :eta, :theta,
-                 :iota, :kappa, :lambda, :mu, :nu, :xi, :omicron, :pi, :rho,
-                 :sigma, :tau, :upsilon, :phi, :chi, :psi, :omega]
-
-      # e.g. { alpha: ['Α', 'α'] ...
-      CHAR_MAP = {}
-      SYMBOLS.each_with_index { |sym, i| CHAR_MAP[sym] = [UPPER[i], LOWER[i]] }
-
-      LATIN_SYMBOLS = {
-        a: :alpha,
-        b: :beta,
-        c: :gamma,
-        d: :delta,
-        e: :epsilon,
-        f: :zeta,
-        g: :eta,
-        h: :theta,
-        i: :iota,
-        j: :xi,      # use for j, q and w
-        k: :kappa,
-        l: :lambda,
-        m: :mu,
-        n: :nu,
-        # nonesuch: => :xi,
-        o: :omicron,
-        p: :pi,
-        q: :xi,      # use for j, q and w
-        r: :rho,
-        s: :sigma,
-        t: :tau,
-        u: :upsilon,
-        v: :phi,
-        w: :xi,      # use for j, q and w
-        x: :chi,
-        y: :psi,
-        z: :omega,
-      }
-      SYMBOLS26 = LATIN_SYMBOLS.values
-
-      def self.upper(latin_str)
-        CHAR_MAP.fetch(self.sym(latin_str)).first
-      end
-
-      def self.lower(latin_str)
-        CHAR_MAP.fetch(self.sym(latin_str)).last
-      end
-
-      def self.sym(val)
-        case val
-        when String
-          if val.match %r{\A\d+\z}
-            val = val.to_i
-            if val >= 0 and val < SYMBOLS.size
-              SYMBOLS[val]
-            else
-              raise "val #{val} not in range (#{SYMBOLS.size})"
-            end
-          else
-            LATIN_SYMBOLS.fetch val[0].downcase.to_sym
-          end
-        when Integer
-          if val >= 0 and val < SYMBOLS.size
-            SYMBOLS[val]
-          else
-            raise "val #{val} not in range (#{SYMBOLS.size})"
-          end
-        else
-          raise "unexpected val #{val} (#{val.class})"
-        end
-      end
-    end
   end
 end

data/lib/compsci/names/greek.rb

@@ -0,0 +1,83 @@
+# coding: utf-8
+
+module CompSci
+  module Names
+    module Greek
+      UPPER = [*'Α'..'Ρ', *'Σ'..'Ω']
+      LOWER = [*('α'..'ρ'), *('σ'..'ω')]
+      SYMBOLS = [:alpha, :beta, :gamma, :delta, :epsilon, :zeta, :eta, :theta,
+                 :iota, :kappa, :lambda, :mu, :nu, :xi, :omicron, :pi, :rho,
+                 :sigma, :tau, :upsilon, :phi, :chi, :psi, :omega]
+
+      # e.g. { alpha: ['Α', 'α'] ...
+      CHAR_MAP = {}
+      SYMBOLS.each_with_index { |sym, i| CHAR_MAP[sym] = [UPPER[i], LOWER[i]] }
+
+      LATIN_SYMBOLS = {
+        a: :alpha,
+        b: :beta,
+        c: :gamma,
+        d: :delta,
+        e: :epsilon,
+        f: :zeta,
+        g: :eta,
+        h: :theta,
+        i: :iota,
+        j: :xi,      # use for j, q and w
+        k: :kappa,
+        l: :lambda,
+        m: :mu,
+        n: :nu,
+        # nonesuch: => :xi,
+        o: :omicron,
+        p: :pi,
+        q: :xi,      # use for j, q and w
+        r: :rho,
+        s: :sigma,
+        t: :tau,
+        u: :upsilon,
+        v: :phi,
+        w: :xi,      # use for j, q and w
+        x: :chi,
+        y: :psi,
+        z: :omega,
+      }
+      SYMBOLS26 = LATIN_SYMBOLS.values
+
+      def self.upper(latin_str)
+        CHAR_MAP.fetch(self.sym(latin_str)).first
+      end
+
+      def self.lower(latin_str)
+        CHAR_MAP.fetch(self.sym(latin_str)).last
+      end
+
+      def self.sym(val)
+        case val
+        when String
+          if val.match %r{\A\d+\z}
+            # treat positive integer strings as positive integers
+            val = val.to_i
+            if val >= 0 and val < SYMBOLS.size
+              SYMBOLS[val]
+            else
+              raise "val #{val} not in range (#{SYMBOLS.size})"
+            end
+          else
+            # map the first character to a greek symbol
+            LATIN_SYMBOLS.fetch val[0].downcase.to_sym
+          end
+        when Integer
+          if val >= 0 and val < SYMBOLS.size
+            # map the integer to a greek symbol
+            SYMBOLS[val]
+          else
+            raise "val #{val} not in range (#{SYMBOLS.size})"
+          end
+        else
+          raise "unexpected val #{val} (#{val.class})"
+        end
+      end
+    end
+  end
+end

data/lib/compsci/timer.rb

@@ -1,5 +1,4 @@
 module CompSci
-
   module Timer
     # lifted from seattlerb/minitest
     if defined? Process::CLOCK_MONOTONIC

data/lib/compsci/tree.rb

@@ -100,12 +100,14 @@ module CompSci
     def display(width: 80)
       count = 0
       str = ''
-      self.bf_search { |n|
+      self.bf_search { |node|
         count += 1
         level = Math.log(count, 2).floor
         block_width = width / (2**level)
+        val = node.to_s
         str += "\n" if 2**level == count and count > 1
-        str += n.to_s.ljust(block_width / 2, ' ').rjust(block_width, ' ')
+        space = [(block_width + val.size) / 2, val.size + 1].max
+        str += val.ljust(space, ' ').rjust(block_width, ' ')
         false # keep searching to visit every node
       }
       str

data/test/names.rb

@@ -1,4 +1,5 @@
 require 'compsci/names'
+require 'compsci/names/greek'
 require 'minitest/autorun'
 
 include CompSci

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: compsci
 version: !ruby/object:Gem::Version
-  version: 0.1.0.1
+  version: 0.1.1.1
 platform: ruby
 authors:
 - Rick Hull
@@ -10,6 +10,20 @@ bindir: bin
 cert_chain: []
 date: 2017-10-29 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: buildar~> 3.0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +52,62 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: flog
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: flay
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: roodi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-prof
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Trees, Heaps, Timers, Error fitting, etc
 email: 
 executables: []
@@ -58,6 +128,7 @@ files:
 - lib/compsci/fit.rb
 - lib/compsci/heap.rb
 - lib/compsci/names.rb
+- lib/compsci/names/greek.rb
 - lib/compsci/node.rb
 - lib/compsci/timer.rb
 - lib/compsci/tree.rb