markov-rb 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43f0df95ad9d0cb2ff124309b03f6e43ca0b7154
-  data.tar.gz: 04a1e05951dad32b6b492bbdd416776cc03296b6
+  metadata.gz: beb0322e06d4010dae371a3cd34c164ce95ef01b
+  data.tar.gz: 41c6c2364bb409bd3203e7f4e2d14f5a83678dfe
 SHA512:
-  metadata.gz: d5d942cea36addfe1066390b1422849a388f4a4783c206c009aa069212fcea59f859fbc6ee1b07dd4d57ca923020537ac864ccd5e7618b2cecbb145dc41bbf21
-  data.tar.gz: 829adcdf8c3d877d683d94eb8c7f9df32889546189cf2d51f18509d976e2290d4216052cf824ad4db026ecf1671ee59219f7e39a420322f890411ef777b9e464
+  metadata.gz: 44495e7e61d8e00bec997938378e401d66f735a5637079e127efd240a8091b87693edfa78c3118798ed9a8adfe8be027534f6767c72d0ef27b18f5c0ad3d9818
+  data.tar.gz: 0784cbaf902d855161d3132d10b4d5e1273a0eb905bd683a6ded5f3f224a1db471505d095830253466bc01a75321050943df942c79ed4d5211d58da402be3bc0

data/lib/markov.rb

@@ -1,7 +1,35 @@
 require 'ruby-progressbar'
+require 'oj'
 
 require 'markov/version'
 require 'markov/transition_matrix'
 require 'markov/statistics/random_event'
 
 require 'markov/chain'
+
+module Markov
+  def self.generate(thing)
+    chain_for(thing).generate_word!.strip
+  end
+
+  private
+  def self.chains
+    @chains ||= {}
+  end
+
+  def self.chain_for(thing)
+    chains[thing] ||= load_chain(thing)
+  end
+
+  def self.load_chain(thing)
+    analysis_file = File.join(
+      File.expand_path(File.dirname(__FILE__)),
+      '..',
+      'data',
+      "#{thing}.json"
+    )
+
+    chain_data = File.read(analysis_file)
+    Oj.load(chain_data)
+  end
+end

data/lib/markov/chain.rb

@@ -72,15 +72,7 @@ module Markov
       word = nil
 
       until max && (generated_count +=1)>=max
-        if new_words
-          word = @words.first
-          until !@words.include?(word.chomp) && word.chomp.match(/^[A-Z][a-z]+$/)
-            word = (generate_word!) #.chomp #(context: generated_text)
-          end
-          @words.push(word.chomp)
-        else
-          word = generate_word!(context: generated_text)
-        end
+        word = generate_word!(context: new_words ? ["\n"] : generated_text)
 
         if show
           word.chars.each do |ch|
@@ -97,10 +89,24 @@ module Markov
     end
 
     def generate_word!(context: ["\n"])
+      if new_words
+        word = @words.first
+        until !@words.include?(word.chomp) && word.chomp.match(/^[A-Z][a-z]+$/)
+          word = (generate_any_word!) #.chomp #(context: generated_text)
+        end
+        @words.push(word.chomp)
+        word
+      else
+        generate_any_word!(context: context) #generated_text)
+      end    
+    end
+
+    private
+    def generate_any_word!(context: ["\n"])
       generated_chars = []
       char = ''
       until char.match(/[ .,;!?\n]/)
-	char = predict_next_state(context+generated_chars)
+        char = predict_next_state(context+generated_chars)
         generated_chars.push(char)
       end
       generated_chars.join

data/lib/markov/version.rb

@@ -1,4 +1,4 @@
 module Markov
   # markov version
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: markov-rb
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Joseph Weissman
@@ -203,8 +203,8 @@ files:
 - bin/markov
 - data/architecture.json
 - data/architecture.txt
-- data/cities.json
 - data/cities.txt
+- data/city.json
 - data/frankenstein.txt
 - data/iliad.txt
 - data/jabberwocky.json
@@ -216,7 +216,7 @@ files:
 - data/metamorphosis.txt
 - data/milton.txt
 - data/moby-dick.txt
-- data/names.json
+- data/name.json
 - data/names.txt
 - data/phil.txt
 - data/shakespeare.txt