sooth 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35b7050c2c66e43c65ee1afc05bb4534267d01e3
-  data.tar.gz: 79302a0867744f4cd86d4090adcc3b1c792f22c5
+  metadata.gz: 4a0e008c93f017523bc6e99798d7542834d420e7
+  data.tar.gz: 7a4db4e52debe1fceecd1c6d5e4f72117e01de9c
 SHA512:
-  metadata.gz: ae6731afecca1a16085d65601c7f01ff8157d9e5a2d2f9fff987b6bd74dec00efd1de9a8f51402327669101e6646dee2d9971e6b267240453247d2443efae39b
-  data.tar.gz: 44b75b169a0c4ffed66eb873d92c93f6ddb305dc037c6dc14e8411d39d50f1ee3bd8a0f16723cadbcd14d5cea2041bb403d5613003bd9ab7cfe573a8322d085b
+  metadata.gz: cd0f597a68319410bc4022d1fde21c7e62571568e536ebdf281f7eeb0eb336271c960682aa910963dad1a58892b64f0bf7cfc177ce04949238d08c8766675ec0
+  data.tar.gz: 5c7d01ff70fac54ad884303341c3c9de87d9ef4ad5fd7528b8b52a49c3f2b1eef42b100d4a5d9137dc432fc61b32ac643cf64a245edba96bd756ea4d965cf455

data/README.md

@@ -1,27 +1,17 @@
 [![Gem Version](https://badge.fury.io/rb/sooth.svg)](http://badge.fury.io/rb/sooth)
 [![Dependency Status](https://gemnasium.com/jasonhutchens/sooth.png)](https://gemnasium.com/jasonhutchens/sooth)
-[![Build Status](https://secure.travis-ci.org/jasonhutchens/sooth.png)](http://travis-ci.org/#!/jasonhutchens/sooth)
-[![Code Climate](https://codeclimate.com/github/jasonhutchens/sooth.png)](https://codeclimate.com/github/jasonhutchens/sooth)
+[![Build Status](https://semaphoreapp.com/api/v1/projects/6889bf33-e547-4200-a4fb-66b339a83d82/307128/shields_badge.svg)](https://semaphoreapp.com/jasonhutchens/sooth)
 
 Sooth
 =====
 
-Sooth is a simple stochastic predictive model.
+Sooth is a simple stochastic predictive model. It is used by [MegaHAL](https://github.com/jasonhutchens/megahal).
 
 Getting Started
 ---------------
 
 Apart from the specs, look at the [API docs](http://rubydoc.info/github/jasonhutchens/sooth/master/frames) to get up to speed.
 
-Next
-----
-
-* Implement save and load (with specs)
-* Version 0.9
-* Hook up to all services
-* Version 1
-* MegaHAL that uses it
-
 Copyright
 ---------
 

data/Rakefile

@@ -16,9 +16,9 @@ Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://guides.rubygems.org/specification-reference/ for more options
   gem.name = "sooth"
   gem.homepage = "http://github.com/jasonhutchens/sooth"
-  gem.license = "MIT"
-  gem.summary = %Q{A small thing for generating codes for users to type into places}
-  gem.description = %Q{Does what it says on the box}
+  gem.license = "UNLICENSE"
+  gem.summary = %Q{Sooth is a simple stochastic predictive model.}
+  gem.description = %Q{Sooth is a simple stochastic predictive model.}
   gem.email = "jasonhutchens@gmail.com"
   gem.authors = ["Jason Hutchens"]
   gem.required_ruby_version = "~> 2.1"

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/ext/sooth_native/extconf.rb

@@ -1,2 +1,5 @@
 require 'mkmf'
+
+$CFLAGS << ' -Wall -O3 -std=gnu99'
+
 create_makefile('sooth_native')

data/ext/sooth_native/sooth_context.h

@@ -5,12 +5,14 @@
 
 #include <stdint.h>
 
+#include "sooth_statistic.h"
+
 typedef struct
 {
   uint32_t bigram[2];
   uint64_t count;
   uint32_t statistics_size;
-  uint64_t statistics_offset;
+  SoothStatistic * statistics;
 }
 SoothContext;
 

data/ext/sooth_native/sooth_predictor.c

@@ -22,9 +22,6 @@ sooth_predictor_init()
   predictor->contexts = NULL;
   predictor->contexts_size = 0;
 
-  predictor->statistics = NULL;
-  predictor->statistics_size = 0;
-
   return predictor;
 }
 
@@ -33,15 +30,18 @@ sooth_predictor_init()
 void
 sooth_predictor_free(SoothPredictor * predictor)
 {
-  free(predictor->contexts);
-  free(predictor->statistics);
+  for (uint64_t i = 0; i < predictor->contexts_size; ++i)
+  {
+    SoothContext * context = &(predictor->contexts[i]);
+    free(context->statistics);
+    context->statistics = NULL;
+    context->statistics_size = 0;
+  }
 
+  free(predictor->contexts);
   predictor->contexts = NULL;
   predictor->contexts_size = 0;
 
-  predictor->statistics = NULL;
-  predictor->statistics_size = 0;
-
   free(predictor);
 }
 
@@ -76,11 +76,11 @@ sooth_predictor_find_context(SoothPredictor * predictor, uint32_t bigram[2])
     {
       mid = low + (high - low) / 2;
       context = &(predictor->contexts[mid]);
-      if (context->bigram[0] < bigram[0] || context->bigram[0] == bigram[0] && context->bigram[1] < bigram[1])
+      if (context->bigram[0] < bigram[0] || (context->bigram[0] == bigram[0] && context->bigram[1] < bigram[1]))
       {
         low = mid + 1;
       }
-      else if (context->bigram[0] > bigram[0] || context->bigram[0] == bigram[0] && context->bigram[1] > bigram[1])
+      else if (context->bigram[0] > bigram[0] || (context->bigram[0] == bigram[0] && context->bigram[1] > bigram[1]))
       {
         if (mid == 0)
         {
@@ -117,6 +117,7 @@ sooth_predictor_find_context(SoothPredictor * predictor, uint32_t bigram[2])
   context->bigram[1] = bigram[1];
   context->count = 0;
   context->statistics_size = 0;
+  context->statistics = NULL;
 
   return context;
 }
@@ -124,7 +125,7 @@ sooth_predictor_find_context(SoothPredictor * predictor, uint32_t bigram[2])
 //------------------------------------------------------------------------------
 
 SoothStatistic *
-sooth_predictor_find_statistic(SoothPredictor * predictor, SoothContext * context, uint32_t symbol)
+sooth_predictor_find_statistic(SoothContext * context, uint32_t symbol)
 {
   SoothStatistic * statistic = NULL;
   uint64_t mid = 0;
@@ -137,7 +138,7 @@ sooth_predictor_find_statistic(SoothPredictor * predictor, SoothContext * contex
     while (low <= high)
     {
       mid = low + (high - low) / 2;
-      statistic = &(predictor->statistics[mid + context->statistics_offset]);
+      statistic = &(context->statistics[mid]);
       if (statistic->symbol < symbol)
       {
         low = mid + 1;
@@ -159,29 +160,22 @@ sooth_predictor_find_statistic(SoothPredictor * predictor, SoothContext * contex
     mid = low;
   }
 
-  if (context->statistics_size == 0)
-  {
-    context->statistics_offset = predictor->statistics_size;
-  }
   context->statistics_size += 1;
-  mid += context -> statistics_offset;
-
-  predictor->statistics_size += 1;
-  SoothStatistic * new_memory = realloc(predictor->statistics, sizeof(SoothStatistic) * predictor->statistics_size);
+  SoothStatistic * new_memory = realloc(context->statistics, sizeof(SoothStatistic) * context->statistics_size);
   if (new_memory == NULL)
   {
     return NULL;
   }
-  predictor->statistics = new_memory;
+  context->statistics = new_memory;
 
-  if ((mid + 1) < predictor->statistics_size)
+  if ((mid + 1) < context->statistics_size)
   {
-    SoothStatistic * src = &(predictor->statistics[mid]);
-    SoothStatistic * dest = &(predictor->statistics[mid+1]);
-    (void)memmove(dest, src, sizeof(SoothStatistic) * (predictor->statistics_size - mid - 1)); 
+    SoothStatistic * src = &(context->statistics[mid]);
+    SoothStatistic * dest = &(context->statistics[mid+1]);
+    (void)memmove(dest, src, sizeof(SoothStatistic) * (context->statistics_size - mid - 1)); 
   }
 
-  statistic = &(predictor->statistics[mid]);
+  statistic = &(context->statistics[mid]);
   statistic->symbol = symbol;
   statistic->count = 0;
 
@@ -200,7 +194,7 @@ sooth_predictor_observe(SoothPredictor * predictor, uint32_t bigram[2], uint32_t
     return 0;
   }
 
-  SoothStatistic * statistic = sooth_predictor_find_statistic(predictor, context, symbol);
+  SoothStatistic * statistic = sooth_predictor_find_statistic(context, symbol);
 
   if (statistic == NULL)
   {
@@ -242,7 +236,7 @@ sooth_predictor_select(SoothPredictor * predictor, uint32_t bigram[2], uint64_t
 
   for (uint64_t i = 0; i < context->statistics_size; ++i)
   {
-    SoothStatistic statistic = predictor->statistics[context->statistics_offset + i];
+    SoothStatistic statistic = context->statistics[i];
     if (limit > statistic.count)
     {
       limit -= statistic.count;

data/ext/sooth_native/sooth_predictor.h

@@ -6,15 +6,12 @@
 #include <stdint.h>
 
 #include "sooth_context.h"
-#include "sooth_statistic.h"
 
 typedef struct
 {
   uint32_t error_symbol;
   uint64_t contexts_size;
   SoothContext * contexts;
-  uint64_t statistics_size;
-  SoothStatistic * statistics;
 }
 SoothPredictor;
 

data/sooth.gemspec

@@ -2,18 +2,18 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: sooth 0.1.0 ruby lib
+# stub: sooth 0.2.0 ruby lib
 # stub: ext/sooth_native/extconf.rb
 
 Gem::Specification.new do |s|
   s.name = "sooth"
-  s.version = "0.1.0"
+  s.version = "0.2.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.description = "Does what it says on the box"
+  s.description = "Sooth is a simple stochastic predictive model."
   s.email = "jasonhutchens@gmail.com"
   s.extensions = ["ext/sooth_native/extconf.rb"]
   s.extra_rdoc_files = [
@@ -39,10 +39,10 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/jasonhutchens/sooth"
-  s.licenses = ["MIT"]
+  s.licenses = ["UNLICENSE"]
   s.required_ruby_version = Gem::Requirement.new("~> 2.1")
   s.rubygems_version = "2.4.4"
-  s.summary = "A small thing for generating codes for users to type into places"
+  s.summary = "Sooth is a simple stochastic predictive model."
 
   if s.respond_to? :specification_version then
     s.specification_version = 4

data/spec/predictor_spec.rb

@@ -60,5 +60,32 @@ describe Sooth::Predictor do
       expect(predictor.select([1,2], 0)).to eq(42)
       expect(predictor.select([1,2], 4)).to eq(42)
     end
+
+    it "selects the correct symbol with many contexts" do
+      predictor.observe([2,1], 4)
+      predictor.observe([1,3], 5)
+      predictor.observe([3,2], 6)
+      predictor.observe([1,3], 7)
+      predictor.observe([2,1], 8)
+      predictor.observe([3,2], 9)
+      predictor.observe([1,3], 1)
+      predictor.observe([2,1], 2)
+      predictor.observe([3,2], 3)
+      expect(predictor.select([2,1], 0)).to eq(42)
+      expect(predictor.select([2,1], 1)).to eq(2)
+      expect(predictor.select([2,1], 2)).to eq(4)
+      expect(predictor.select([2,1], 3)).to eq(8)
+      expect(predictor.select([2,1], 4)).to eq(42)
+      expect(predictor.select([1,3], 0)).to eq(42)
+      expect(predictor.select([1,3], 1)).to eq(1)
+      expect(predictor.select([1,3], 2)).to eq(5)
+      expect(predictor.select([1,3], 3)).to eq(7)
+      expect(predictor.select([1,3], 4)).to eq(42)
+      expect(predictor.select([3,2], 0)).to eq(42)
+      expect(predictor.select([3,2], 1)).to eq(3)
+      expect(predictor.select([3,2], 2)).to eq(6)
+      expect(predictor.select([3,2], 3)).to eq(9)
+      expect(predictor.select([3,2], 4)).to eq(42)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sooth
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jason Hutchens
@@ -122,7 +122,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-description: Does what it says on the box
+description: Sooth is a simple stochastic predictive model.
 email: jasonhutchens@gmail.com
 executables: []
 extensions:
@@ -149,7 +149,7 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/jasonhutchens/sooth
 licenses:
-- MIT
+- UNLICENSE
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -170,5 +170,5 @@ rubyforge_project:
 rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
-summary: A small thing for generating codes for users to type into places
+summary: Sooth is a simple stochastic predictive model.
 test_files: []