baobab 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc9a6568b4998bd54bb07030d90bbebcc6979d72
-  data.tar.gz: a392e91b05f89b6dc055249e9b5256e3fc98a93b
+  metadata.gz: 9664c33acdc442b0afdd6c7020df547ac6a675ea
+  data.tar.gz: 579a7397a9752c0755afcc4dcb72a4fbce2e83cb
 SHA512:
-  metadata.gz: cddc12fb7be6d7b5a73f3e659f22df27b52bdd1f75f53e9bddc9da2aa85a0d7499111f4e1b61459d071e489b68017e06306a5287b7aae3a6c84741dafaff8b34
-  data.tar.gz: f6d28f686b71791eed288ccdd6c6e9d6cfba3632ddbaabc0bd162fc5672f613d77c05150814c9d5a1b53854c04f7ab1b52ebc484536a111b8b7d7da78af20021
+  metadata.gz: c3c826681d0640b31a775ef8112870471a29782cbc99e7e457bd3ff01d3e5a12f278a267a57fc4e5848211814779aead62f32454f7622b992743edca22c6b4d5
+  data.tar.gz: a4b0cdacebd5a284719ca081c5458140da21cce31774702efd5f3a9fcb16807709cdc33c710a131494c52be18785637a961fd4e55af82c784b893d1a443e0104

data/lib/baobab/tree.rb

@@ -5,63 +5,69 @@ module Baobab
 
   class DecisionTree
 
-      #  The first decision tree node
-      attr_reader :root
+    #  The first decision tree node
+    attr_reader :root
 
-      # The class variable of interest in this decision tree.
-      attr_reader :class_var
+    # The class variable of interest in this decision tree.
+    attr_reader :class_var
 
-      # The underlying dataset
-      attr_reader :dataset
+    # The underlying dataset
+    attr_reader :dataset
 
-      def initialize dataset, class_var
-          @dataset = dataset
-          @class_var = class_var
-          entropy = dataset.entropy class_var
-          @root = DecisionTreeNode.new(
-              self, parent=nil,
-              attribute=nil, value=nil,
-              entropy
-              )
-          @root.build_subtree
+    # Receives
+    # - dataset, a list of hashes
+    # - the name of the class variable
+    def initialize dataset, class_var
+      @dataset = dataset
+      if class_var.nil?
+        raise "class_var cannot be nil"
       end
+      @class_var = class_var
+      entropy = dataset.entropy class_var
+      @root = DecisionTreeNode.new(
+        self, parent=nil,
+        attribute=nil, value=nil,
+        entropy
+        )
+      @root.build_subtree
+    end
 
-      # Prints the decision depth-first with the respective entropy values.
-      def to_s
-          s = ""
-          nodes = [[0, @root]]
-          while nodes.any?
-              l, n = nodes.last
-              nodes = nodes.slice(0...-1)
-              n.children.each do |c|
-                  nodes << [l + 1, c]
-              end
-              s = s + "#{' ' * (l * 2)}#{n.to_s}\n"
-          end
-          return s
+    # Prints the decision depth-first with the respective entropy values.
+    def to_s
+      s = ""
+      nodes = [[0, @root]]
+      while nodes.any?
+        l, n = nodes.last
+        nodes = nodes.slice(0...-1)
+        n.children.each do |c|
+            nodes << [l + 1, c]
+        end
+        s = s + "#{' ' * (l * 2)}#{n.to_s}\n"
       end
+      s
+    end
 
-      # Receives attributes and their values (they must be all defined).
-      # Returns the value of the predicted class value.
-      def query values
-          if values.keys != @dataset.attribute_names(@class_var)
-              raise "Query does not fit all variables"
-          end
-          node = @root
-          while node.variable != @class_var
-              if node.next_attribute
-                  if node.children.count > 1
-                      val = values[node.next_attribute]
-                      node = node.children.select do |child|
-                          child.value == val
-                      end[0]
-                  else
-                      node = node.children[0]
-                  end
-              end
+    # Receives attributes and their values (they must be all defined).
+    # Returns the value of the predicted class value.
+    def query values
+      if values.keys.sort != @dataset.attribute_names(@class_var).sort
+        raise "Query does not fit all variables"
+      end
+      node = @root
+      while node.variable != @class_var
+        if node.next_attribute
+          if node.children.count > 1
+            val = values[node.next_attribute]
+            node = node.children.select do |child|
+                child.value == val
+            end[0]
+          else
+            node = node.children[0]
           end
-          node.value
+        end
       end
+      node.value
+    end
 
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: baobab
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Johnny E. Lee Othon
@@ -41,7 +41,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: ID3 decision trees for machine learning in Ruby