kotodama 1.0.2 → 1.1.1

data/lib/kotodama.rb

@@ -1,7 +1,7 @@
 require 'kaiseki'
 
 module Kotodama
-	VERSION = '1.0.2'
+	VERSION = '1.1.1'
 	file_path = File.dirname __FILE__
 	
 	#load base class mods

data/lib/kotodama_grammar.rb

@@ -21,7 +21,7 @@ module Kotodama
 		end
 		
 		rule :content_block do
-			parses :type_block | :rule_block | :change_block | :spelling_rule
+			parses :type_block | :rule_block | :change_block | :spelling_rule | :zipf_block
 		end
 		
 		rule :type_block do
@@ -45,7 +45,7 @@ module Kotodama
 		end
 		
 		rule :rule_block do
-			parses 'rule'.skip & :ATOM.set(:id) & :get_rule & '{'.skip & :rule_expression.zero_or_more & '}'.skip
+			parses 'rule'.skip & :ATOM.set(:id) & :get_rule & '{'.skip & (:exclude_expression | :rule_expression).zero_or_more & '}'.skip
 		end
 		
 		action :get_rule do
@@ -56,6 +56,11 @@ module Kotodama
 			end
 		end
 		
+		rule :exclude_expression do
+			parses 'exclude'.skip & :ID.one_or_more & ';'.skip
+			action { @rule.excludes << @result.join }
+		end
+		
 		rule :rule_expression do
 			parses :ATOM.one_or_more & :WEIGHT.optional & ';'.skip
 			node [:expression, :weight]
@@ -111,6 +116,19 @@ module Kotodama
 			end
 		end
 		
+		rule :zipf_block do
+			parses 'zipf'.skip & :FLOAT.set(:float) & '{'.skip & (:LIST & ';'.skip).one_or_more.set(:lists) & '}'.skip
+			action do
+				zipf_list = []
+				@lists.each {|list1| list1.each {|n| zipf_list << n } }
+				zipf_list.length.times do |i|
+					value = 1.0 / (i + 1) ** @float
+					value = (value * 100).to_i
+					@language.zipf[zipf_list[i]] = value
+				end
+			end
+		end
+		
 		rule :ID do
 			parses /[a-zA-Z][0-9]?/
 			filter do
@@ -147,6 +165,11 @@ module Kotodama
 			cast Integer
 		end
 		
+		rule :FLOAT do
+			parses /\d+\.\d+/
+			cast Float
+		end
+		
 		rule :WS do
 			parses /\s+/
 		end

data/lib/language.rb

@@ -1,6 +1,6 @@
 module Kotodama
 	class Language
-		attr_reader :types, :rules, :changes, :spellings, :options
+		attr_reader :types, :rules, :changes, :spellings, :options, :zipf
 		
 		def initialize
 			@types = {}
@@ -8,6 +8,7 @@ module Kotodama
 			@changes = {}
 			@spellings = {}
 			@options = {}
+			@zipf = {}
 		end
 		
 		def generate options = {}

data/lib/rule.rb

@@ -1,11 +1,12 @@
 module Kotodama
 	class Rule
-		attr_reader :language, :expressions, :weights
+		attr_reader :language, :expressions, :weights, :excludes
 		
 		def initialize language
 			@language = language
 			@expressions = []
 			@weights = []
+			@excludes = []
 		end
 		
 		def add expression, weight
@@ -14,18 +15,25 @@ module Kotodama
 		end
 		
 		def generate
-			expression = @expressions.random @weights
-			output = []
-			expression.each do |atom|
-				if @language.rules.key? atom
-					output += @language.rules[atom].generate
-				elsif @language.types.key? atom
-					output << @language.types[atom].generate
-				else
-					raise "`#{atom}' is not associated with the given language"
+			loop do
+				expression = @expressions.random @weights
+				output = []
+				expression.each do |atom|
+					if @language.rules.key? atom
+						output += @language.rules[atom].generate
+					elsif @language.types.key? atom
+						output << @language.types[atom].generate
+					else
+						raise "`#{atom}' is not associated with the given language"
+					end
+				end
+				catch :fail do
+					@excludes.each do |n|
+						throw :fail if output.join.match /#{n}/
+					end
+					return output
 				end
 			end
-			output
 		end
 	end
 end

data/lib/type.rb

@@ -10,7 +10,7 @@ module Kotodama
 		
 		def add symbol, weight
 			@symbols << symbol
-			@weights << (weight || @language.options['$type_weight'] || 1)
+			@weights << weight
 		end
 		
 		def member? symbol
@@ -18,7 +18,19 @@ module Kotodama
 		end
 		
 		def generate
-			@symbols.random @weights
+			temp_weights = []
+			@symbols.length.times do |i|
+				if @weights[i]
+					temp_weights << @weights[i]
+				elsif @language.zipf[@symbols[i]]
+					temp_weights << @language.zipf[@symbols[i]]
+				elsif @language.options['$symbol_weight']
+					temp_weights << @language.options['$symbol_weight']
+				else
+					temp_weights << 1
+				end
+			end
+			@symbols.random temp_weights
 		end
 	end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 0
-  - 2
-  version: 1.0.2
+  - 1
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - William Hamilton-Levi