netica 0.0.10-java → 0.0.15-java

data/lib/netica.rb

@@ -2,6 +2,7 @@ require 'java'
 require '/lib/NeticaJ.jar'
 
 require "netica/version"
+require "netica/environ"
 require "netica/environment"
 require "netica/netica_logger"
 require "netica/node"
@@ -10,9 +11,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"
+  Java::NorsysNetica::Environ.__persistent__ = true
   require "netica/railtie" if defined?(Rails)
 end

data/lib/netica/active_network.rb

@@ -6,13 +6,15 @@ module Netica
     class ActiveNetwork::NodeNotFound < RuntimeError; end
     class ActiveNetwork::NetworkNotFound < RuntimeError; end
 
-    attr_accessor :network, :token, :created_at, :updated_at, :reloaded_at
+    attr_accessor :network, :token, :created_at, :updated_at, :reloaded_at, :in_use
 
     def initialize(token, filepath = nil)
-      Netica::NeticaLogger.info "initializing active network for #{token}"
+      Netica::NeticaLogger.info "Initializing #{self.class} for #{token}."
       self.created_at = Time.now
       self.updated_at = Time.now
-      self.token = token
+      self.token      = token
+      self.in_use     = false
+      
       if filepath
         self.network = BayesNetwork.new(filepath)
       end
@@ -36,7 +38,7 @@ module Netica
           self.updated_at = Time.now
           return node.incr()
         else
-          raise ActiveNetwork::NodeNotFound
+          raise ActiveNetwork::NodeNotFound, "Node #{nodeName} not found in network."
         end
       else
         raise ActiveNetwork::NetworkNotFound
@@ -71,10 +73,18 @@ module Netica
     # @param token [String] identifying token for ActiveNetwork sought
     # @return [ActiveNetwork] ActiveNetwork object found
     def self.find(token)
-      Netica::Environment.instance.active_networks.each do |an|
-        return an if an.token == token
+      environment = Netica::Environment.instance
+      Netica::NeticaLogger.info "Searching in #{environment.network_container.class} #{environment.network_container.object_id} (length: #{environment.network_container.length}) for #{token}."
+      environment.network_container.each do |an|
+        if an.token == token
+          until !an.in_use
+            Netica::NeticaLogger.info "Network #{token} is locked."
+            wait 1000
+          end
+          return an
+        end
       end
-      Netica::NeticaLogger.info "Network #{token} not found in current instance."
+      Netica::NeticaLogger.info "Network #{token} not found in current instance #{environment.object_id}."
       if Netica::Environment.instance.redis
         stored_state = Netica::Environment.instance.redis.get(token)
         if stored_state

data/lib/netica/environ.rb

@@ -0,0 +1,11 @@
+class Java::NorsysNetica::Environ
+  @@active_networks = []
+  
+  # define_method('active_networks') do
+  #   return @@active_networks
+  # end
+  
+  def active_networks
+    return @@active_networks
+  end
+end

data/lib/netica/environment.rb

@@ -4,9 +4,8 @@ require 'redis'
 module Netica
   class Environment
     include Singleton
-
-    @@active_networks = []
-    @@explorations = []
+    
+    @@network_container = []
     @@processor = nil
     @@redis = nil
     @@logfile = nil
@@ -26,9 +25,19 @@ module Netica
       else
         @@processor = Java::NorsysNetica::Environ.new(nil)
       end
+      #@@processor.control_concurrency("ExternalThreads", "OptimizeSafely")
+      @@processor.control_concurrency("ExternalThreads", "Serialize")
       if settings[:redis]
         @@redis = Redis.new(settings[:redis])
       end
+      
+      if settings[:network_container]
+        @@network_container = settings[:network_container]
+      else
+        @@network_container = @@processor.active_networks
+      end
+      
+      NeticaLogger.info "@@network_container is #{@@network_container.class} #{@@network_container.object_id}."  
       NeticaLogger.info "Initializing the Netica Environment #{@@processor.object_id}"
     end
 
@@ -37,7 +46,11 @@ module Netica
     end
 
     def active_networks
-      @@active_networks
+      @@network_container
+    end
+    
+    def network_container
+      @@network_container
     end
 
     def redis

data/lib/netica/version.rb

@@ -1,3 +1,3 @@
 module Netica
-  VERSION = "0.0.10"
+  VERSION = "0.0.15"
 end

data/spec/netica/active_network_spec.rb

@@ -26,6 +26,10 @@ describe Netica::ActiveNetwork do
       it "should export its state as a hash" do
         @active_network.network.state.should be_an_instance_of(Hash)
       end
+      
+      it "should be returned when searched for" do
+        Netica::ActiveNetwork.find("fake_token_identifier").should === @active_network
+      end
 
       context "the tuberculosis node" do
         it "should be less than 0.02 initially" do

data/spec/netica/environment_spec.rb

@@ -12,5 +12,15 @@ describe Netica::Environment do
       Netica::NeticaLogger.info "Test logfile entry"
       Netica::Environment.instance.processor.finalize
     end
+    
+    context "with a specified storage container" do
+      it 'should store active_networks in the storage container' do
+        @active_networks = []
+        Netica::Environment.engage(:network_container => @active_networks)
+        Netica::ActiveNetwork.new("fake_token_identifier", "#{File.dirname(__FILE__)}/../../examples/ChestClinic.dne")
+        @active_networks.length.should == 1
+        Netica::Environment.instance.processor.finalize
+      end
+    end
   end
 end

metadata

@@ -2,14 +2,14 @@
 name: netica
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.0.10
+  version: 0.0.15
 platform: java
 authors:
 - Jerry Richardson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-07-11 00:00:00.000000000 Z
+date: 2013-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -49,6 +49,7 @@ files:
 - lib/netica.rb
 - lib/netica/active_network.rb
 - lib/netica/bayes_network.rb
+- lib/netica/environ.rb
 - lib/netica/environment.rb
 - lib/netica/java_library_path.rb
 - lib/netica/netica_logger.rb