fonemas 0.0.14 → 0.0.15

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODkyMjhhMTk2OGVkODQxZGNhN2M2ZWIxZDM3ODMwNzRmNThlOTM1Yw==
+    YzM5MmU1ZjZmYzA0NmVlZWQyYWE3OWI1MWRiY2FkN2Q1ZGI2NzVkZQ==
   data.tar.gz: !binary |-
-    ZjUzMDk1MGJkYTJiMGJlOTk1ZmU0Y2ZkYWU5NDIwZDM3YjFkMGFhYg==
+    MGNiMDZmYmE1YmVkMDY5YzYyNmY4ZDM5YTk1MzVlMWNkNTViN2Q5NQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YzMwMTI4MTE1MzYxMmUwM2UyYTkzNWNkNjc4ZjQ5NjcyNzVlYjBiMzQ3MDEz
-    NGVhOGY3YTY5NGU3OTFhY2Q5OGNjYTBkZDNhODM0ZTkyZTE4NDI4MzVmMjY2
-    YTEyZDEzOTAzNGVkY2I5ZjExNTVjYzk1Y2ViNmMwNDgxY2FhNjU=
+    YzljNjZiYzg5ZWE0ZDA2NzYzMWJkNDNjYjM5NmVjZjhhZjVhYzFhMWQ2MzFm
+    Y2MyNGJiZDE5M2EyNzZlNWVkZGM5MzM2NTc2ODkxZTZkMzBlYmJiZmQxNmM0
+    OGIwNTZmOWQ3ZjQyNTg1NmUyNzkwZDljYmQwYzI2NTc1MDJkZmQ=
   data.tar.gz: !binary |-
-    NjZiZGVjZjBjMzIwYWU1MGUwZmRlNjY5OWJmZjBiMTk4NDgzYjg4MWYxMzUw
-    ZTgzOGY0Zjg5YmQzMGNjNmMyYTU3ZTIyNmM3MWVkZjQ1ODgzYmVjMDVlZjVl
-    NzIwMjBkMjY1ZmQ5MDZmMDRjMzM4NWNiYjk4OGFjNDM5ZjNkMTU=
+    YjY1Mjg4OTdjMDIxMmM1NjgxMGZlOGYwNDY1OGFkZWJhYzA0ZDUwMWVlZWYz
+    MGFhNGRiMGM4ODEyNTE4MWFlOGNjMWU2YWZkZDI3NjIxNGYyZWJjNWNmMTZi
+    NWI1ZGNhMGRhNzQ3NmExN2NhZWRkNmM4Y2QzMDFiYmI0NDBlZmU=

data/lib/fonemas.rb

@@ -330,43 +330,51 @@ module Fonemas
 
 
     end
-
-    return generateFonemas(fonema)
+    #puts "pre: #{fonema}"
+    t =  normalize(generateFonemas(fonema))
+    #puts "out: #{t}"
+    return t
   end
 
-  def self.generateFonemas(fonema)
-    salidas = 1
-    for i in fonema
-      if i.class.name == 'Array'
-        salidas *= i.size
+  def self.generateFonemas(fonema,i=0,current=[])
+      if i == fonema.length
+        return current.join(' ')
       end
-    end
-    #puts "salidas: #{salidas}"
 
-    outputs = []
-    for j in 1..salidas
-      outputs[j-1] = []
-    end
-    for i in 0..(fonema.size-1)
       c = fonema[i]
       if c.class.name == 'Array'
-        for j in 1..salidas
-          t = c[(j-1)%c.size]
-          outputs[j-1] += [t] unless t.size == 0
+        output = []
+        for j in c
+          output << generateFonemas(fonema,i+1,current + [j])
         end
+        return output
       else
-        for j in 1..salidas
-          outputs[j-1] += [c]
-        end
+        return generateFonemas(fonema,i+1,current + [c])
       end
 
-    end
+  end
 
-    salida = []
-    for i in outputs
-      salida << i.join(" ")
+
+  def self.normalize(t)
+    @output = []
+    anormalize(t)
+    return @output
+  end
+
+  def self.anormalize(t)
+    #puts "pre normalize: #{t}"
+    if t.class.name == 'Array'
+      for i in t
+        anormalize(i)
+      end
+    else
+      #puts "found #{t}"
+      @output << t
     end
 
-    return salida
   end
+
+
+
+
 end

data/lib/fonemas/version.rb

@@ -1,3 +1,3 @@
 module Fonemas
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

data/spec/fonemas/fonema_spec.rb

@@ -16,4 +16,15 @@ describe Fonemas do
     end
   end
 
+  it 'combinar fonemas' do
+    test = ['a',['b','c'],['d','e']]
+    output = Fonemas.normalize(Fonemas.generateFonemas(test))
+    output.should include('a b d')
+    output.should include('a b e')
+    output.should include('a c d')
+    output.should include('a c e')
+
+
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fonemas
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Manuel Bahamondez Honores
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-10 00:00:00.000000000 Z
+date: 2013-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler