netica 0.0.8-java → 0.0.9-java

data/lib/netica.rb

@@ -10,6 +10,8 @@ require "netica/bayes_network"
 require "netica/active_network"
 require "netica/java_library_path"
 
+Java::NorsysNetica::Environ.__persistent__ = true
+
 module Netica
   include_package "norsys.netica"
   require "netica/railtie" if defined?(Rails)

data/lib/netica/active_network.rb

@@ -6,10 +6,12 @@ module Netica
     class ActiveNetwork::NodeNotFound < RuntimeError; end
     class ActiveNetwork::NetworkNotFound < RuntimeError; end
 
-    attr_accessor :network, :token
+    attr_accessor :network, :token, :created_at, :updated_at, :reloaded_at
 
     def initialize(token, filepath = nil)
       Netica::NeticaLogger.info "initializing active network for #{token}"
+      self.created_at = Time.now
+      self.updated_at = Time.now
       self.token = token
       if filepath
         self.network = BayesNetwork.new(filepath)
@@ -30,6 +32,7 @@ module Netica
       if network
         node = network.node(nodeName)
         if node
+          self.updated_at = Time.now
           return node.incr()
         else
           raise ActiveNetwork::NodeNotFound
@@ -41,12 +44,14 @@ module Netica
 
     # Export the state of the ActiveNetwork as a Hash
     #
-    # @param nodeName [String] name of the node to be incremented
     # @return [Hash] network state and object class name
     def state
       {
-        :network => network.state,
-        :class   => self.class.to_s
+        :network     => network.state,
+        :class       => self.class.to_s,
+        :created_at  => self.created_at,
+        :updated_at  => self.updated_at,
+        :reloaded_at => self.reloaded_at
       }
     end
 
@@ -75,6 +80,7 @@ module Netica
           hash = JSON.parse(stored_state)
           active_network = Object.const_get(hash['class']).new(token)
           active_network.load_from_saved_state(hash)
+          Netica::NeticaLogger.info "Network #{token} reloaded from saved state: #{hash}"
           return active_network
         else
           Netica::NeticaLogger.info "Network #{token} not found in redis."
@@ -90,6 +96,7 @@ module Netica
     def load_from_saved_state(hash)
       self.network = BayesNetwork.new(hash["network"]["dne_file_path"])
       self.network.load_from_state(hash["network"])
+      self.reloaded_at = Time.now
     end
   end
-end
+end

data/lib/netica/bayes_network.rb

@@ -5,6 +5,7 @@ module Netica
     attr_accessor :current_network, :dne_file_path
 
     def initialize(dne_file_path = nil)
+      Netica::NeticaLogger.info "Initializing #{self.class} #{self.object_id}"
       if dne_file_path
         self.dne_file_path = dne_file_path
         load_dne_file
@@ -41,15 +42,19 @@ module Netica
     end
 
     def load_from_state(network_hash)
-      NeticaLogger.info "Loading state from network_hash => #{network_hash}"
+      Netica::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}"
+        Netica::NeticaLogger.info "Setting #{node_name} => #{node_value}"
         node(node_name).value = node_value
       end
     end
 
     def state
-      { :dne_file_path => dne_file_path, :decision_nodes => node_hash(decision_nodes), :nature_nodes => node_hash(nature_nodes) }
+      {
+        :dne_file_path  => dne_file_path,
+        :decision_nodes => node_hash(decision_nodes),
+        :nature_nodes   => node_hash(nature_nodes)
+      }
     end
 
     def node_hash(nodes)
@@ -86,4 +91,4 @@ module Netica
       self.current_network.compile()
     end
   end
-end
+end

data/lib/netica/environment.rb

@@ -48,4 +48,4 @@ module Netica
       @@logfile
     end
   end
-end
+end

data/lib/netica/node.rb

@@ -97,7 +97,7 @@ class Java::NorsysNetica::Node
 
   def free
     begin
-      NeticaLogger.info "Deleting #{self.to_s}"
+      Netica::NeticaLogger.info "Deleting #{self.to_s}"
       finalize()
       delete()
       states.each{|s| s==nil or s.free() }

data/lib/netica/version.rb

@@ -1,3 +1,3 @@
 module Netica
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/netica/active_network_spec.rb

@@ -3,6 +3,7 @@ require 'spec_helper'
 describe Netica::ActiveNetwork do
   describe "#new" do
     before(:all) do
+      Java::NorsysNetica::Environ.__persistent__ = true
       Netica::Environment.engage
     end
     after(:all) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: netica
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease:
 platform: java
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-05-30 00:00:00.000000000 Z
+date: 2013-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis