netica 0.0.6-java → 0.0.7-java

data/README.md

@@ -67,6 +67,10 @@ Then, re-read the value of the Belief node.
 
 ## Release Notes
 
+### Version 0.0.7
+
+* Added Node Set identification and collection to BayesNetwork
+
 ### Version 0.0.6
 
 * Changed BayesNetwork#getNode to BayesNetwork#node

data/lib/netica/active_network.rb

@@ -3,6 +3,9 @@ module Netica
 
   # provides a persistable object container for a Netica Bayes net.
   class ActiveNetwork
+    class ActiveNetwork::NodeNotFound < RuntimeError; end
+    class ActiveNetwork::NetworkNotFound < RuntimeError; end
+
     attr_accessor :network, :token
 
     def initialize(token, filepath = nil)
@@ -24,7 +27,16 @@ module Netica
     # @param nodeName [String] name of the node to be incremented
     # @return [true,false,nil] outcome of the incr() attempt
     def incr_node(nodeName)
-      network.node(nodeName).incr() if network
+      if network
+        node = network.node(nodeName)
+        if node
+          return node.incr()
+        else
+          raise ActiveNetwork::NodeNotFound
+        end
+      else
+        raise ActiveNetwork::NetworkNotFound
+      end
     end
 
     # Export the state of the ActiveNetwork as a Hash
@@ -56,6 +68,7 @@ module Netica
       Netica::Environment.instance.active_networks.each do |an|
         return an if an.token == token
       end
+      Netica::NeticaLogger.info "Network #{token} not found in current instance."
       if Netica::Environment.instance.redis
         stored_state = Netica::Environment.instance.redis.get(token)
         if stored_state
@@ -63,6 +76,8 @@ module Netica
           active_network = Object.const_get(hash['class']).new(token)
           active_network.load_from_saved_state(hash)
           return active_network
+        else
+          Netica::NeticaLogger.info "Network #{token} not found in redis."
         end
       end
       return nil
@@ -74,7 +89,7 @@ module Netica
     # @return [Hash] network state and object class name
     def load_from_saved_state(hash)
       self.network = BayesNetwork.new(hash["network"]["dne_file_path"])
-      network.load_from_state(hash["network"])
+      self.network.load_from_state(hash["network"])
     end
   end
 end

data/lib/netica/bayes_network.rb

@@ -1,5 +1,7 @@
 module Netica
   class BayesNetwork
+    require 'json'
+
     attr_accessor :current_network, :dne_file_path
 
     def initialize(dne_file_path = nil)
@@ -30,9 +32,18 @@ module Netica
       nodes.collect{ |n| n if n.nature_node? }.compact
     end
 
+    def node_sets
+      current_network.getAllNodesets(false).split(",").collect{|ns_name| node_set(ns_name)}
+    end
+
+    def node_set(name)
+      nodes.collect{ |n| n if n.isInNodeset(name) }.compact.sort{|a,b| b.beliefs <=> a.beliefs }
+    end
+
     def load_from_state(network_hash)
-      NeticaLogger.info "network_hash => #{network_hash}"
+      NeticaLogger.info "Loading state from network_hash => #{network_hash}"
       network_hash["decision_nodes"].each do |node_name, node_value|
+        NeticaLogger.info "Setting #{node_name} => #{node_value}"
         node(node_name).value = node_value
       end
     end
@@ -47,15 +58,29 @@ module Netica
       node_hash
     end
 
+    # def analyze(json)
+    #   analysis_hash = JSON.parse(json)
+    #   analysis_hash['input_nodes'].each do |nodeName, value|
+    #     node(nodeName).enterValue(value)
+    #   end
+    #
+    #   outcome = {}
+    #   analysis_hash['output_nodes'].each do |nodeName|
+    #     outcome[nodeName] = node(nodeName).value
+    #   end
+    #   outcome
+    #   #JSON.dump(:results => outcome)
+    # end
+
     private
 
     def load_dne_file
       NeticaLogger.info "Looking for BayesNet .dne file at #{dne_file_path}..."
       streamer = Java::NorsysNetica::Streamer.new(dne_file_path)
       self.current_network = Java::NorsysNetica::Net.new(streamer)
-      self.current_network.compile()
       NeticaLogger.info "Initialized BayesNet -- #{self.current_network.object_id}"
       self.decision_nodes.each{ |n| n.value = 0 }
+      self.current_network.compile()
     end
   end
 end

data/lib/netica/node.rb

@@ -7,12 +7,12 @@ class Java::NorsysNetica::Node
    Java::NorsysNetica::Node::DECISION_NODE => :decision,
    Java::NorsysNetica::Node::UTILITY_NODE => :utility,
    Java::NorsysNetica::Node::CONSTANT_NODE => :constant,
-   Java::NorsysNetica::Node::DISCONNECTED_NODE => :disconnected,
+   Java::NorsysNetica::Node::DISCONNECTED_NODE => :disconnected
   }
 
   NODE_TYPES = {
    Java::NorsysNetica::Node::DISCRETE_TYPE => :nature,
-   Java::NorsysNetica::Node::CONTINUOUS_TYPE => :decision,
+   Java::NorsysNetica::Node::CONTINUOUS_TYPE => :decision
   }
 
   def name
@@ -60,11 +60,14 @@ class Java::NorsysNetica::Node
   end
 
   def value=(new_value)
-    Netica::NeticaLogger.info "Setting #{self.name} to #{new_value}"
     if decision_node?
+      Netica::NeticaLogger.info "Decision Node: Setting #{kind} #{type} node #{self.name} to #{new_value}"
       finding().setReal(new_value)
     elsif nature_node?
+      Netica::NeticaLogger.info "Nature Node: Setting #{kind} #{type} node #{self.name} to #{new_value}"
       finding.enterState(new_value)
+    else
+      throw "Could not set value for #{kind} #{type} node #{self.name} to #{new_value}"
     end
   end
 

data/lib/netica/version.rb

@@ -1,3 +1,3 @@
 module Netica
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: netica
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease:
 platform: java
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-04-23 00:00:00.000000000 Z
+date: 2013-05-16 00:00:00.000000000 Z
 dependencies: []
 description: Netica Bayes Network Management
 email: