BinarySearchk 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 858b852537424054e0f43ea1e38c882800914064
-  data.tar.gz: ec7199d8791374402d6ddb8061b0407173a3c3ab
+  metadata.gz: 71ed7cb85a58226543840c229b9c9ad0cbb3ca01
+  data.tar.gz: 78da18a04e8cb00a22f3cdaed3f9203e10ebce85
 SHA512:
-  metadata.gz: c8997b23a4e67090afaa30ad789f175672cfd23768345453dcdb9876dbeab69f4232fd8e8d0279cc45319a397958ceedc1d37d6cecd744c16bca17e8ca888fbc
-  data.tar.gz: 888077c978156150984763aa65d15418da28fe09530cab295c002754385bf95841b746e85d6adfc04acf2c7e73db40d068501da51b193ab337840383039be94c
+  metadata.gz: 21029ad91385da8b8368fb3e41d27b54c5cea8b2e6e12065284c8b62bd64cdcf43c5e6a18d1d327446e8e3a687c56ca4ef821a6bf5322ff0a7f42221d5941de9
+  data.tar.gz: 6e1a3ec11d9f2731ee71f454d3819e6b7008c5ee520c5c321bbb9b4cc5be2d4c16ba406f244e62e944a025533ff4638cb2253b99adbfcbde49e904be9370e25b

data/lib/BinarySearchk.rb

@@ -1,2 +1,3 @@
 require "BinarySearchk/version"
-require 'BinarySearchk/BinarySearchk'
+require 'BinarySearchk/tree'
+require 'BinarySearchk/node'

data/lib/BinarySearchk/node.rb

@@ -0,0 +1,35 @@
+module NodeOfTree
+    class Node
+        attr_accessor :left, :right, :value
+
+        def initialize(v)
+            @value = v
+            @left = nil
+            @right = nil
+        end
+
+        def insert(v)
+            case value <=> v
+            when 1 then insert_left(v)
+            when -1 then insert_right(v)
+            when 0 then
+            end
+        end
+
+        def insert_left(v)
+            if left.nil?
+                self.left = Node.new(v)
+            else
+                left.insert(v)
+            end
+        end
+
+        def insert_right(v)
+            if right.nil?
+                self.right = Node.new(v)
+            else
+                right.insert(v)
+            end
+        end
+    end
+end

data/lib/BinarySearchk/tree.rb

@@ -0,0 +1,54 @@
+module TreeWithNode
+    class Tree
+        attr_accessor :parent
+
+        def initialize(array)
+            @tree = build_tree(array)
+            @parent = @tree.value
+        end
+
+        def breadth_first_search(target_value)
+            queue = [@tree]
+            until queue.empty?
+                current_node = queue.shift
+                return "Found #{current_node.value}" if current_node.value == target_value
+                queue.push current_node.left unless current_node.left.nil?
+                queue.push current_node.right unless current_node.right.nil?
+            end
+            nil
+        end
+
+        def depth_first_search(target_value)
+            stack = [@tree]
+            until stack.empty?
+                current_node = stack.pop
+                return "Found #{current_node.value}" if current_node.value == target_value
+                stack.push current_node.right unless current_node.right.nil?
+                stack.push current_node.left unless current_node.left.nil?
+            end
+            nil
+        end
+
+        def dfs_rec(target_value, node = @tree)
+            if node.nil?
+                return nil
+            else
+                return "Found #{node.value}" if node.value == target_value
+                search_left_child = dfs_rec(target_value, node.left)
+                search_right_child = dfs_rec(target_value, node.right)
+            end
+            return (search_right_child or search_left_child)
+        end
+
+        private
+
+        def build_tree(array)
+            right = array.length-1
+            left=0
+            index_mid = (left + (right-left)) / 2
+            tree = NodeOfTree::Node.new(array[index_mid])
+            array.each {|n| tree.insert(n) }
+            tree
+        end
+    end
+end

data/lib/BinarySearchk/version.rb

@@ -1,3 +1,3 @@
 module BinarySearchk
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/binarysearchk_spec.rb

@@ -2,39 +2,37 @@ require 'spec_helper'
 
 describe BinarySearchk do
     it 'creates a node with value 10' do
-        tree = BinarySearchk::Node.new(10)
-        expect(tree.value).to eq(10)
+        node = NodeOfTree::Node.new(10)
+        node.left = 3
+        node.right = 11
+        expect(node.value).to eq(10)
+        expect(node.left).to eq(3)
+        expect(node.right).to eq(11)
     end
 
     it 'creates a tree with children' do
         arr = [1, 7, 4, 23, 8, 9, 4, 3, 5, 7, 9, 67, 6345, 324]
-        tree = BinarySearchk::Node.build_tree(arr)
-        expect(tree.value).to eq(4)
-        expect("#{tree.left.value if !tree.left.nil?}").to eq("1")
-        expect("#{tree.right.value unless tree.right.nil?}").to eq("7")
-        expect("#{tree.left.left.value unless tree.left.left.nil?}").to eq("")
-        expect("#{tree.left.right.value unless tree.left.right.nil?}").to eq("3")
-        expect("#{tree.right.left.value unless tree.right.left.nil?}").to eq("5")
-        expect("#{tree.right.right.value unless tree.right.right.nil?}").to eq("23")
-        expect("#{tree.right.right.left.value unless tree.right.right.left.nil?}").to eq("8")
+        tree = TreeWithNode::Tree.new(arr)
+        expect(tree.parent).to eq(4)
     end
 
     it 'Uses BFS to search for a number' do
         arr = [1, 7, 4, 23, 8, 9, 4, 3, 5, 7, 9, 67, 6345, 324]
-        tree = BinarySearchk::Node.build_tree(arr)
-        expect(BinarySearchk::Node.breadth_first_search(7, tree)).to eq("Found 7")
+        tree = TreeWithNode::Tree.new(arr)
+        # tree = BinarySearchk::Node.build_tree(arr)
+        expect(tree.breadth_first_search(4)).to eq("Found 4")
     end
 
     it 'Uses DFS to search for a number' do
         arr = [1, 7, 4, 23, 8, 9, 4, 3, 5, 7, 9, 67, 6345, 324]
-        tree = BinarySearchk::Node.build_tree(arr)
-        expect(BinarySearchk::Node.depth_first_search(6345, tree)).to eq("Found 6345")
+        tree = TreeWithNode::Tree.new(arr)
+        expect(tree.depth_first_search(6345)).to eq("Found 6345")
     end
 
     it 'Uses recursive DFS to search for a number' do
         arr = [1, 7, 4, 23, 8, 9, 4, 3, 5, 7, 9, 67, 6345, 324]
-        tree = BinarySearchk::Node.build_tree(arr)
-        expect(BinarySearchk::Node.dfs_rec(9, tree)).to eq("Found 9")
+        tree = TreeWithNode::Tree.new(arr)
+        expect(tree.dfs_rec(9)).to eq("Found 9")
     end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: BinarySearchk
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Kayode Adeniyi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-24 00:00:00.000000000 Z
+date: 2015-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -68,7 +68,8 @@ files:
 - README.md
 - Rakefile
 - lib/BinarySearchk.rb
-- lib/BinarySearchk/BinarySearchk.rb
+- lib/BinarySearchk/node.rb
+- lib/BinarySearchk/tree.rb
 - lib/BinarySearchk/version.rb
 - spec/binarysearchk_spec.rb
 - spec/spec_helper.rb

data/lib/BinarySearchk/BinarySearchk.rb

@@ -1,81 +0,0 @@
-module BinarySearchk
-    class Node
-        attr_accessor :left, :right, :value
-
-        def initialize(v=nil)
-            @value = v
-            @left = nil
-            @right = nil
-        end
-
-        def insert(v)
-            case value <=> v
-            when 1 then insert_left(v)
-            when -1 then insert_right(v)
-            when 0 then false
-            end
-        end
-
-        def insert_left(v)
-            if left.nil?
-                self.left = Node.new(v)
-            else
-                left.insert(v)
-            end
-        end
-
-        def insert_right(v)
-            if right.nil?
-                self.right = Node.new(v)
-            else
-                right.insert(v)
-            end
-        end
-
-      def self.build_tree(array)
-          right = array.length-1
-          left=0
-
-          index_mid = (left + (right-left)) / 2
-          @node = Node.new(array[index_mid])
-          array.each {|v| @node.insert(v) }
-
-          @node
-      end
-
-      def self.breadth_first_search(target_value, node)
-          queue = [node]
-          until queue.empty?
-              current_node = queue.shift
-              return "Found #{current_node.value}" if current_node.value == target_value
-              queue.push current_node.left unless current_node.left.nil?
-              queue.push current_node.right unless current_node.right.nil?
-          end
-          nil
-      end
-
-      def self.depth_first_search(target_value, node)
-          stack = [node]
-          until stack.empty?
-              current_node = stack.pop
-              return "Found #{current_node.value}" if current_node.value == target_value
-              stack.push current_node.right unless current_node.right.nil?
-              stack.push current_node.left unless current_node.left.nil?
-          end
-          nil
-      end
-
-      def self.dfs_rec(target_value, node)
-          if node.nil?
-              return nil
-          else
-              return "Found #{node.value}" if node.value == target_value
-              search_left_child = dfs_rec(target_value, node.left)
-              search_right_child = dfs_rec(target_value, node.right)
-          end
-          #return any of the two that is not nil
-          return (search_right_child or search_left_child)
-          nil
-	end
-  end
-end