sooth 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a0e008c93f017523bc6e99798d7542834d420e7
-  data.tar.gz: 7a4db4e52debe1fceecd1c6d5e4f72117e01de9c
+  metadata.gz: d6ee402b249e9c9a15a067e007f83a932f1024f6
+  data.tar.gz: 0a815d99956cc8701d3ac094b37d091bbe282137
 SHA512:
-  metadata.gz: cd0f597a68319410bc4022d1fde21c7e62571568e536ebdf281f7eeb0eb336271c960682aa910963dad1a58892b64f0bf7cfc177ce04949238d08c8766675ec0
-  data.tar.gz: 5c7d01ff70fac54ad884303341c3c9de87d9ef4ad5fd7528b8b52a49c3f2b1eef42b100d4a5d9137dc432fc61b32ac643cf64a245edba96bd756ea4d965cf455
+  metadata.gz: c1c1340951c1045048cae75ee46805724b8dac5480493fc50b4e18f189478677725c9dc729c8295677ef9ebdee0a740648f7724f528d4a2c2931157c9d04792d
+  data.tar.gz: a076a7603490c70fd4aa9d87ad3f93dfdb53621f3afdecb3aad9260904065a8112c4a877c31130315be3f34e8ecf66ecc15f35e49c1cd647ae854d4b7f8ca9eb

data/README.md

@@ -5,7 +5,8 @@
 Sooth
 =====
 
-Sooth is a simple stochastic predictive model. It is used by [MegaHAL](https://github.com/jasonhutchens/megahal).
+Sooth is a simple stochastic predictive model. It is used by
+[MegaHAL](https://github.com/jasonhutchens/megahal), a learning chatterbot.
 
 Getting Started
 ---------------

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/ext/sooth_native/native.c

@@ -20,6 +20,12 @@ void method_sooth_native_deallocate(void * predictor);
  *     class Predictor
  *       def initialize(error_symbol)
  *       end
+ *       def clear
+ *       end
+ *       def load(filename)
+ *       end
+ *       def save(filename)
+ *       end
  *       def observe(bigram, symbol)
  *         # (native code)
  *       end
@@ -39,6 +45,26 @@ void method_sooth_native_deallocate(void * predictor);
  */
 VALUE method_sooth_native_initialize(VALUE self, VALUE error_symbol);
 
+/*
+ * Clear the predictor to a fresh slate.
+ */
+VALUE method_sooth_native_clear(VALUE self);
+
+/*
+ * Load the predictor from the specified filename. The predictor will be cleared
+ * before the file is loaded.
+ *
+ * @param [String] filename The path of the file to be loaded.
+ */
+VALUE method_sooth_native_load(VALUE self, VALUE filename);
+
+/*
+ * Save the predictor to a file that can be loaded or merged later.
+ *
+ * @param [String] filename The path of the file to be merge.
+ */
+VALUE method_sooth_native_save(VALUE self, VALUE filename);
+
 /*
  * Add an observation of the given symbol in the context of the bigram.
  *
@@ -90,6 +116,10 @@ void Init_sooth_native()
   rb_define_alloc_func(SoothNative, method_sooth_native_allocate);
   rb_define_method(SoothNative, "initialize", method_sooth_native_initialize, 1);
 
+  rb_define_method(SoothNative, "clear", method_sooth_native_clear, 0);
+  rb_define_method(SoothNative, "load", method_sooth_native_load, 1);
+  rb_define_method(SoothNative, "save", method_sooth_native_save, 1);
+
   rb_define_method(SoothNative, "observe", method_sooth_native_observe, 2);
   rb_define_method(SoothNative, "count", method_sooth_native_count, 1);
   rb_define_method(SoothNative, "select", method_sooth_native_select, 2);
@@ -130,6 +160,33 @@ method_sooth_native_initialize(VALUE self, VALUE error_symbol)
 
 //------------------------------------------------------------------------------
 
+VALUE
+method_sooth_native_clear(VALUE self)
+{
+  SoothPredictor * predictor = NULL;
+  Data_Get_Struct(self, SoothPredictor, predictor);
+  sooth_predictor_clear(predictor);
+  return Qnil;
+}
+
+//------------------------------------------------------------------------------
+
+VALUE
+method_sooth_native_load(VALUE self, VALUE filename)
+{
+  return Qnil;
+}
+
+//------------------------------------------------------------------------------
+
+VALUE
+method_sooth_native_save(VALUE self, VALUE filename)
+{
+  return Qnil;
+}
+
+//------------------------------------------------------------------------------
+
 VALUE
 method_sooth_native_observe(VALUE self, VALUE bigram, VALUE symbol)
 {

data/ext/sooth_native/sooth_predictor.c

@@ -18,7 +18,6 @@ sooth_predictor_init()
   }
 
   predictor->error_symbol = 0;
-
   predictor->contexts = NULL;
   predictor->contexts_size = 0;
 
@@ -28,7 +27,7 @@ sooth_predictor_init()
 //------------------------------------------------------------------------------
 
 void
-sooth_predictor_free(SoothPredictor * predictor)
+sooth_predictor_clear(SoothPredictor * predictor)
 {
   for (uint64_t i = 0; i < predictor->contexts_size; ++i)
   {
@@ -41,7 +40,14 @@ sooth_predictor_free(SoothPredictor * predictor)
   free(predictor->contexts);
   predictor->contexts = NULL;
   predictor->contexts_size = 0;
+}
 
+//------------------------------------------------------------------------------
+
+void
+sooth_predictor_free(SoothPredictor * predictor)
+{
+  sooth_predictor_clear(predictor);
   free(predictor);
 }
 
@@ -54,10 +60,15 @@ sooth_predictor_save(const char * const filename, SoothPredictor * predictor)
 
 //------------------------------------------------------------------------------
 
-SoothPredictor *
-sooth_predictor_load(const char * const filename)
+void sooth_predictor_merge(const char * const filename, SoothPredictor * predictor)
+{
+}
+//------------------------------------------------------------------------------
+
+void sooth_predictor_load(const char * const filename, SoothPredictor * predictor)
 {
-  return NULL;
+  sooth_predictor_clear(predictor);
+  sooth_predictor_merge(predictor, filename);
 }
 
 //------------------------------------------------------------------------------

data/ext/sooth_native/sooth_predictor.h

@@ -18,9 +18,11 @@ SoothPredictor;
 //------------------------------------------------------------------------------
 
 SoothPredictor * sooth_predictor_init();
+void sooth_predictor_clear(SoothPredictor * predictor);
 void sooth_predictor_free(SoothPredictor * predictor);
+void sooth_predictor_merge(const char * const filename, SoothPredictor * predictor);
+void sooth_predictor_load(const char * const filename, SoothPredictor * predictor);
 void sooth_predictor_save(const char * const filename, SoothPredictor * predictor);
-SoothPredictor * sooth_predictor_load(const char * const filename);
 uint32_t sooth_predictor_observe(SoothPredictor * predictor, uint32_t bigram[2], uint32_t symbol);
 uint64_t sooth_predictor_count(SoothPredictor * predictor, uint32_t bigram[2]);
 uint32_t sooth_predictor_select(SoothPredictor * predictor, uint32_t bigram[2], uint64_t limit);

data/sooth.gemspec

@@ -2,17 +2,17 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: sooth 0.2.0 ruby lib
+# stub: sooth 0.3.0 ruby lib
 # stub: ext/sooth_native/extconf.rb
 
 Gem::Specification.new do |s|
   s.name = "sooth"
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Jason Hutchens"]
-  s.date = "2014-12-10"
+  s.date = "2014-12-11"
   s.description = "Sooth is a simple stochastic predictive model."
   s.email = "jasonhutchens@gmail.com"
   s.extensions = ["ext/sooth_native/extconf.rb"]

data/spec/predictor_spec.rb

@@ -88,4 +88,18 @@ describe Sooth::Predictor do
       expect(predictor.select([3,2], 4)).to eq(42)
     end
   end
+
+  describe "#clear" do
+
+    it "clears to a blank slate" do
+      expect(predictor.observe([1,2], 3)).to eq(1)
+      expect(predictor.observe([1,2], 3)).to eq(2)
+      expect(predictor.observe([1,2], 3)).to eq(3)
+      predictor.clear
+      expect(predictor.observe([1,2], 3)).to eq(1)
+      expect(predictor.observe([1,2], 3)).to eq(2)
+      expect(predictor.observe([1,2], 3)).to eq(3)
+    end
+
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sooth
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jason Hutchens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-10 00:00:00.000000000 Z
+date: 2014-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec