foodAIHE 3.3.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d618ef5b5151f6035dd39024d5be730ccdd6279b
-  data.tar.gz: 493c34717e968d18db0df67b74480f1dcbae66b2
+  metadata.gz: 13b2da53673543476c6e782cbc6336315f86e7f3
+  data.tar.gz: 6b81cdb810010f46131c4aab5a47b3cca765a1cd
 SHA512:
-  metadata.gz: 74d7923907fb37ea63f82fda82a36ebcf761aa2ba9d6ca77aedfdd7e3f7c5bac105d83610b84174d02b2b2760c329e2a3fbe3d31e511ade1e56beebdac871485
-  data.tar.gz: af3a7c7532b0c5fbf265ef0dc74c33af69dda8a8dfd7dbfc5e38332da85a0cb7c297c0cbfe9cd8428eb29e14d6dae49e4c49ab014929247033bcc4a0155debe8
+  metadata.gz: a91cd5c159f6f98f2e5da9fdc24509750e443d6a9af2c95e5035cffe2a734975e289b8385d6685173f0ecb65b111d1776c2e27cf8c81bef281b4b2b40e4ba8ec
+  data.tar.gz: e36d3ecc252ee59a13dca60470c3d78dd7934d80f1289207a1ac2379f471f47548060b082ba095ed3dbd0203416f0098edc09ee6a217d71067e1ea6dd1627d8f

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/.travis.yml

@@ -2,4 +2,5 @@ sudo: false
 language: ruby
 rvm:
   - 2.3.0
-before_install: gem install bundler -v 1.15.4
+  - 2.3.1
+before_install: gem install bundler -v 1.15.4

data/README.md

@@ -34,7 +34,7 @@ por glucidos o proteínas. Las vitaminas y los minerales, así como los oligoele
 se considera que no aportan calorías. 
 
     Por ejemplo, un alimento que contenga 10 g de proteína, 20 g
-    de glucidos y 9 g de grasa nos proporcionaría 201 Kcal: 10 × 4 + 20 × 4 + 9 × 9 = 201Kcal.
+    de glucidos y 9 g de grasa nos proporcionaría 201 Kcal: 10 × 4 + 20 × 4 + 9 × 9 = 201Kcal
 
 ---
 ## Requisitos

data/docs/input/dish_recipes.txt

@@ -0,0 +1,18 @@
+Lentejas con arroz, salsa de tomate, huevo y plátano a la plancha {
+    vegetal "Tomate", :porcion => "2 piezas pequeñas"
+    fruta "Plátano", :gramos => 20
+    cereal "Arroz",  :porcion => "1 taza"
+    proteina "Lentejas", :porcion => "1/2 cucharon"
+    proteina "Huevo frito", :porcion => "1 pieza"
+    aceite "Aceite de oliva", :porcion => "1/2 cucharada"
+    
+    personas 2
+}
+
+Paella a la valenciana {
+    cereal "Arroz",  :porcion => "5 taza"
+    vegetal "Tomate", :porcion => "2 piezas pequeñas"
+    aceite "Aceite de oliva", :porcion => "2 cucharadas"
+    
+    personas 5
+}

data/docs/input/food-data.txt

@@ -16,4 +16,4 @@ Papas 2.0 15.4 0.1 Alimentos ricos en carbohidratos
 Tomate 1.0 3.5 0.2 Verduras y Hortalizas
 Cebolla 1.3 5.8 0.3 Verduras y Hortalizas
 Manzana 0.3 12.4 0.4 Frutas
-Plátanos 1.2 21.4 0.2 Frutas
+Plátano 1.2 21.4 0.2 Frutas

data/food.gemspec

@@ -9,19 +9,19 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Angel Igareta"]
   spec.email         = ["alu0100967111@ull.edu.es"]
 
-  spec.summary       = %q{Practica dessarrollada dirigida a pruebas TDD.}
+  spec.summary       = %q{Practicas TDD.}
   spec.description   = %q{Practica dessarrollada dirigida a pruebas TDD.}
   spec.homepage      = "https://github.com/ULL-ESIT-LPP-1718/tdd-alu0100967111"
   spec.license       = "MIT"
 
+  # For uploading it --> http://guides.rubygems.org/make-your-own-gem/
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
-  # if spec.respond_to?(:metadata)
-  #   spec.metadata["allowed_push_host"] = "http://mygemserver.com"
-  # else
-  #   raise "RubyGems 2.0 or newer is required to protect against " \
-  #     "public gem pushes."
-  # end
+  if spec.respond_to?(:metadata)
+    spec.metadata["allowed_push_host"] = "https://rubygems.org"
+  else
+    raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
+  end
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
@@ -37,5 +37,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard"
   spec.add_development_dependency "guard-rspec"
   spec.add_development_dependency "guard-bundler"
+  
+  spec.add_development_dependency "benchmark-ips" # Para mas info en los Benchmark
+  spec.add_development_dependency "coveralls"
+  spec.add_development_dependency "terminal-table"
 
 end

data/input/dish_recipes.txt

@@ -0,0 +1,18 @@
+Lentejas con arroz, salsa de tomate, huevo y plátano a la plancha {
+    vegetal "Tomate", :porcion => "2 piezas pequeñas"
+    fruta "Plátano", :gramos => 20
+    cereal "Arroz",  :porcion => "1 taza"
+    proteina "Lentejas", :porcion => "1/2 cucharon"
+    proteina "Huevo frito", :porcion => "1 pieza"
+    aceite "Aceite de oliva", :porcion => "1/2 cucharada"
+    
+    personas 2
+}
+
+Paella a la valenciana {
+    cereal "Arroz",  :porcion => "5 taza"
+    vegetal "Tomate", :porcion => "2 piezas pequeñas"
+    aceite "Aceite de oliva", :porcion => "2 cucharadas"
+    
+    personas 5
+}

data/input/food-data.txt

@@ -0,0 +1,19 @@
+Huevo frito 14.1 0.0 19.5 Huevos, lacteos y helados
+Leche vaca 3.3 4.8 3.2 Huevos, lacteos y helados
+Yogurt 3.8 4.9 3.8 Huevos, lacteos y helados
+Cerdo 21.5 0.0 6.3 Carnes y derivados
+Ternera 21.1 0.0 3.1 Carnes y derivados
+Pollo 20.6 0.0 5.6 Carnes y derivados
+Bacalao 17.7 0.0 0.4 Pescados y mariscos
+Atún 21.5 0.0 15.5 Pescados y mariscos
+Salmón 19.9 0.0 13.6 Pescados y mariscos
+Aceite de oliva 0.0 0.2 99.6 Alimentos grasos
+Chocolate 5.3 47.0 30.0 Alimentos grasos
+Azúar 0.0 99.8 0.0 Alimentos ricos en carbohidratos
+Arroz 6.8 77.7 0.6 Alimentos ricos en carbohidratos
+Lentejas 23.5 52.0 1.4 Alimentos ricos en carbohidratos
+Papas 2.0 15.4 0.1 Alimentos ricos en carbohidratos
+Tomate 1.0 3.5 0.2 Verduras y Hortalizas
+Cebolla 1.3 5.8 0.3 Verduras y Hortalizas
+Manzana 0.3 12.4 0.4 Frutas
+Plátano 1.2 21.4 0.2 Frutas

data/input/samples-data.txt

@@ -0,0 +1,9 @@
+ind. alimento 0 5 10 15 20 25 30 35 40 45 50 55 60 65 70 75 80 85 90 95 100 105 110 115 120
+1 manzana 6.7 6.5 6.8 6.9 7.0 7.1 6.9 6.9 6.9 6.7 6.9 7.3 7.0 7.0 7.2 7.1 6.8 7.2 7.3 7.0 6.8 6.7 6.8 6.7 6.9
+yogurt 6.1 6.6 6.3 6.3 6.1 6.9 6.8 6.5 6.4 6.9 6.8 6.5 6.3 6.2 6.7 6.2 5.9 5.8 5.8 5.8 5.8 5.8 5.9 6.2 6.4
+chocolate 6.5 6.5 6.7 6.5 6.5 6.8 6.7 6.2 6.5 7.2 6.9 7.0 6.3 6.2 6.1 5.9 5.8 6.1 6.7 6.7 6.6 6.7 6.9 7.2 7.1
+glucosa 4.9 5.3 5.9 6.7 7.2 7.6 8.0 8.2 8.2 8.4 8.3 8.3 8.0 7.5 7.1 6.8 6.8 6.9 6.8 6.3 6.2 6.3 6.2 6.3 6.1
+2 manzana 4.6 4.8 5.3 5.6 6.1 6.5 6.6 7.0 7.0 6.8 6.4 6.3 6.1 6.1 6.2 6.0 6.1 6.1 6.2 6.3 6.4 6.1 6.1 5.7 5.9
+yogurt 4.9 4.9 5.2 5.8 6.5 7.0 7.2 7.3 7.3 6.6 6.2 6.1 6.0 6.1 5.9 5.9 5.9 5.9 5.8 5.8 5.5 5.5 5.6 5.9 5.9
+chocolate 4.6 4.6 4.7 4.7 4.8 4.7 4.8 4.8 4.6 4.4 4.7 4.7 4.8 4.7 5.2 5.9 5.9 5.7 5.4 5.3 5.1 4.8 4.8 4.9 5.9
+glucosa 6.3 5.4 5.6 5.7 6.5 7.4 7.9 7.4 7.7 7.9 7.9 7.8 7.8 7.8 8.0 8.5 9.4 10.8 10.5 9.1 8.9 8.3 7.7 7.6 7.5

data/lib/dsl/harvard_dish.rb

@@ -0,0 +1,123 @@
+# CLASS FOR HARVARDISHES
+INGREDIENT_DATABASE_FILENAME = "input/food-data.txt"
+INGREDIENT_DATABASE_GRAMS = 100
+
+# INGREDIENT WEIGHT 10G
+PIECE_QUANTITY = 100
+SMALL_PIECE_QUANTITY = PIECE_QUANTITY * 0.5
+MUG_QUANTITY = 240
+SMALL_MUG_QUANTITY = MUG_QUANTITY * 0.5
+SPOON_QUANTITY = 150
+SMALL_SPOON_QUANTITY = SPOON_QUANTITY * 0.5
+
+class HarvardDishDSL
+  
+  attr_reader :dish_title, :ingredient_quantity_array
+  
+  @@ingredient_database = read_ingredient_database(INGREDIENT_DATABASE_FILENAME)
+  
+  def initialize(dish_title, &block)
+    @dish_title = dish_title
+    @ingredient_quantity_array = [] # Arrays of pairs ingredient name and quantity
+    @number_of_people = 0
+    
+    if block_given?
+      if block.arity == 1
+        yield self
+      else
+        instance_eval(&block)
+      end
+    end
+    
+  end
+  
+  def to_s
+    rows = []
+    total_energetic_content = 0
+    
+    @ingredient_quantity_array.each { |ingredient_name, ingredient_quantity|
+      @food = @@ingredient_database[ingredient_name] * ingredient_quantity
+      rows << [@food.name, ingredient_quantity*10, @food.glucid_quantity, @food.protein_quantity, @food.lipid_quantity, @food.energetic_content]
+      total_energetic_content += @food.energetic_content
+    }
+    
+    rows << ['Valor Energético Total', '', '', '', '', total_energetic_content]
+    
+    # Gema para tabla usada -> https://github.com/tj/terminal-table
+    return Terminal::Table.new(:title => @dish_title, 
+                               :headings => [' ', 'Gramos', 'Glúcidos', 'Proteínas', 'Lípidos', 'Valor Energético'], 
+                               :rows => rows)
+  end
+  
+  def vegetal (ingredient_name, options = {})
+    ingredient_quantity = analyze_options(options)
+    @ingredient_quantity_array.push([ingredient_name, ingredient_quantity])
+  end
+  
+  def fruta (ingredient_name, options = {})
+    ingredient_quantity = analyze_options(options)
+    @ingredient_quantity_array.push([ingredient_name, ingredient_quantity])
+  end
+  
+  def cereal (ingredient_name, options = {})
+    ingredient_quantity = analyze_options(options)
+    @ingredient_quantity_array.push([ingredient_name, ingredient_quantity])
+  end
+  
+  def proteina (ingredient_name, options = {})
+    ingredient_quantity = analyze_options(options)
+    @ingredient_quantity_array.push([ingredient_name, ingredient_quantity])
+  end
+  
+  def aceite (ingredient_name, options = {})
+    ingredient_quantity = analyze_options(options)
+    @ingredient_quantity_array.push([ingredient_name, ingredient_quantity])
+  end
+  
+  def personas (number_of_people)
+    @number_of_people = number_of_people
+  end
+  
+  private
+  
+  def analyze_options(options)
+    quantity = 0
+    options.each { |option_name, option_value|
+      case option_name
+        when :porcion
+          quantity = transform_to_grams(option_value)
+        else :gramos
+          quantity = option_value/10
+      end
+    }
+    return quantity
+  end
+  
+  # pieza, pieza pequeña, taza, taza pequeña, cucharon, cucharada
+  def transform_to_grams(portion)
+    quantity = 0
+    
+    if (portion =~ /piez/)
+      if (portion =~ /pequeña/)
+        quantity = SMALL_PIECE_QUANTITY
+      else
+        quantity = PIECE_QUANTITY
+      end
+    elsif (portion =~ /taz/)
+      if (portion =~ /pequeña/)
+        quantity = SMALL_MUG_QUANTITY
+      else
+        quantity = MUG_QUANTITY
+      end
+    elsif (portion =~ /cucharon/)
+      quantity = SPOON_QUANTITY
+    elsif (portion =~ /cuchar/)
+      quantity = SMALL_SPOON_QUANTITY
+    end
+    
+    fixed_quantity = (quantity * portion.to_r).to_f / INGREDIENT_DATABASE_GRAMS
+          
+    return fixed_quantity
+  end
+  
+end

data/lib/food.rb

@@ -1,91 +1,12 @@
 require "food/version"
 require "food/food_class"
 require "food/dll"
+require "food/sort"
+require "food/functions"
+
+require "dsl/harvard_dish"
+require 'terminal-table'
 
 # Root Module for the Gem
 # @author Angel Igareta (alu0100967111@ull.edu.es)
-module FoodGem
-    
-  def read_samples_data (samples_data_filename)
-    data_file = File.open(samples_data_filename)
-    data_file = data_file.read.split("\n")[1..-1] # Divido el fichero en líneas y quito la primera
-    data_line_array = data_file.collect! { |data_array| data_array.split(" ") } # Cambio las líneas a arrays
-    
-    # Hash with (name of the food, sample array for all the persons to that foods)
-    sample_people_hash = Hash.new([])
-    person_number = 1
-    line_counter = 0
-    
-    # Mientras no hayamos recorrido todas las lineas y el primero sea un int (nuevo individuo)
-    while ((line_counter < data_line_array.count) && (data_line_array[line_counter][0].to_i == person_number))
-      
-      data_line = data_line_array[line_counter]
-    
-      person_number = person_number + 1 # Change of person
-      data_line = data_line[1..-1] # Delete the person number
-      
-      while ((line_counter < data_line_array.count) && (data_line_array[line_counter][0].to_i != person_number))
-        food_name = data_line[0].capitalize
-        sample_person_array = data_line[1..-1].collect { |data| data.to_f } # Cambio numeros a float
-
-        if (sample_people_hash[food_name] == [])
-          if (food_name == "Glucosa")
-            sample_people_hash.each_key { |name| sample_people_hash[name][person_number-2].push(sample_person_array) }
-          else
-            sample_people_hash[food_name] = [[sample_person_array]]
-          end
-        else
-          sample_people_hash[food_name].push([sample_person_array])
-        end
-      
-        line_counter = line_counter + 1 # Cambio de línea
-        unless (line_counter >= data_line_array.count)
-          data_line = data_line_array[line_counter]
-        end
-      end
-    end
-    
-    #sample_people_hash.each{ |x, y| puts "#{x} => #{y}" }
-    
-    return sample_people_hash
-  end
-  
-  # Method to read data by file
-  # @params data_filename [String] filename of the data
-  # @return [Array] Return array of food
-  def read_data (data_filename, samples_data_filename)
-    data_string = File.open(data_filename).read.split("\n") # Divido el fichero en string de lineas
-    food_array = []
-    sample_people_hash = read_samples_data(samples_data_filename)
-  
-    data_string.each { |data_line|
-      data_line = data_line.split(" ") # La divido en espacios
-      name = ""
-      
-      while (data_line[0] != data_line[0].to_f.to_s) # Si el nombre no cambia al pasar de string afloat es que es un float
-        name << data_line[0] << " "
-        data_line = data_line[1..-1] # Quito el primer elemento
-      end
-      
-      food_name = name[0..-2].capitalize
-      protein = [data_line[0].to_f, PROTEIN_ENERGY]
-      glucid = [data_line[1].to_f, GLUCID_ENERGY]
-      lipid = [data_line[2].to_f, LIPID_ENERGY]
-      
-      data_line = data_line[3..-1] 
-      
-      
-      group_name = ""
-      while (!data_line[0].nil?) # Si el nombre no cambia al pasar de string afloat es que es un float
-        group_name << data_line[0] << " "
-        data_line = data_line[1..-1] # Quito el primer elemento
-      end
-      
-      food = Food.new(food_name, protein, glucid, lipid, group_name[0..-2], sample_people_hash[food_name])
-      food_array.push(food) # Quito último espacio a nombre y grupo
-    }
-    
-    return food_array
-  end    
-  
-end
+module FoodGem; end

data/lib/food/food_class.rb

@@ -2,9 +2,9 @@
 # @param PROTEIN_ENERGY [int] protein energy.
 # @param GLUCID_ENERGY [int] glucid energy.
 # @param LIPID_ENERGY [int] lipid energy
-PROTEIN_ENERGY = 4
 GLUCID_ENERGY = 4
 LIPID_ENERGY = 9
+PROTEIN_ENERGY = 4
 
 # Abstract class for Food
 class FoodAbstract
@@ -42,22 +42,27 @@ class FoodAbstract
     @pair_macronutrient_energy.push([glucid_energy_pair[0], glucid_energy_pair[1]])
     @pair_macronutrient_energy.push([lipid_energy_pair[0], lipid_energy_pair[1]])
     
-    @energetic_content = calculate_energetic_content
+    @energetic_content = calculate_energetic_content.round(3)
   end
   
   # Calculates the energetic content for the food
   # @return [double] energetic_content
   def calculate_energetic_content
-      energetic_content = 0
-      @pair_macronutrient_energy.each{ |macronutrient, energy| energetic_content += (macronutrient * energy) }
-      return energetic_content
+    energetic_content = 0
+    @pair_macronutrient_energy.each{ |macronutrient, energy| energetic_content += (macronutrient * energy) }
+    return energetic_content
   end
   
   # Return string with the output for the food
   # @return [String] outpout of food
   def to_s
-      "Nombre: #{@name} | Proteínas: #{@protein_quantity} gramos | Glúcidos: #{@glucid_quantity} gramos | Lípidos: #{@lipid_quantity} gramos | " \
-      "Contenido Energético: #{@energetic_content} Kcal."
+    "Nombre: #{@name} | Proteínas: #{@protein_quantity} gramos | Glúcidos: #{@glucid_quantity} gramos | Lípidos: #{@lipid_quantity} gramos | " \
+    "Contenido Energético: #{@energetic_content} Kcal."
+  end
+  
+  def *(quantity)
+    @energetic_content = (@energetic_content * quantity).round(3)
+    return self
   end
   
 end
@@ -77,7 +82,7 @@ class Food < FoodAbstract
   # @param glucid_energy_pair [pair] pair of glucid number and energy
   # @param lipid_energy_pair [pair] pair of lipid number and energy
   # @param group_name [String] the name for the food group.
-  def initialize(name, protein_energy_pair, glucid_energy_pair, lipid_energy_pair, group_name, gluc_sample_pair_array = [])
+  def initialize(name, protein_energy_pair, glucid_energy_pair, lipid_energy_pair, group_name = "", gluc_sample_pair_array = [])
     @group_name = group_name
     super(name, protein_energy_pair, glucid_energy_pair, lipid_energy_pair)
     
@@ -119,14 +124,16 @@ class Food < FoodAbstract
   # Return string with the output for the food calling the father
   # @return [String] output of food
   def to_s
-    "Grupo: #{@group_name} | " + super
+    return ("Grupo: #{@group_name} | " + super) if (@group_name != "")
+    super
   end
   
   # Essential comparating for using Comparable Module
   # @return [String] Return which food is higher depending on the enrgetic content
   def <=> (food)
     raise unless food.is_a?Food
-    return self.energetic_content <=> food.energetic_content
+    # return self.energetic_content <=> food.energetic_content
+    return self.name <=> food.name
   end
 
 end

data/lib/food/functions.rb

@@ -0,0 +1,144 @@
+# USEFUL FUNCTIONS
+
+def read_recipe (recipe_filename)
+    recipes = File.open(recipe_filename).read.split("\n") # Divido el fichero en string de lineas
+    # hash nombre_receta ingredientes(proc)
+    recipe_ingredient_hash = Hash.new()
+    
+    # Por cada receta ( Que tenga un { )
+    recipes.grep(/{/).each { |recipe_title|
+      
+      # Coger el índice donde empieza y donde termina (Que tenga un })
+      start_index = recipes.find_index{ |line| line == recipe_title }
+      end_index = recipes[start_index..-1].find_index{ |line| line == "}" }
+      
+      # Cogemos lo que está dentro de los dos índices (la receta)
+     
+      recipe_ingredient_hash[recipe_title[0..-3]] = recipes[start_index+1, end_index-1]
+       # .join("\n")
+    }
+    
+    return recipe_ingredient_hash
+  end
+    
+  def read_samples_data (samples_data_filename)
+    data_file = File.open(samples_data_filename)
+    data_file = data_file.read.split("\n")[1..-1] # Divido el fichero en líneas y quito la primera
+    data_line_array = data_file.collect! { |data_array| data_array.split(" ") } # Cambio las líneas a arrays
+    
+    # Hash with (name of the food, sample array for all the persons to that foods)
+    sample_people_hash = Hash.new([])
+    person_number = 1
+    line_counter = 0
+    
+    # Mientras no hayamos recorrido todas las lineas y el primero sea un int (nuevo individuo)
+    while ((line_counter < data_line_array.count) && (data_line_array[line_counter][0].to_i == person_number))
+      
+      data_line = data_line_array[line_counter]
+    
+      person_number = person_number + 1 # Change of person
+      data_line = data_line[1..-1] # Delete the person number
+      
+      while ((line_counter < data_line_array.count) && (data_line_array[line_counter][0].to_i != person_number))
+        food_name = data_line[0].capitalize
+        sample_person_array = data_line[1..-1].collect { |data| data.to_f } # Cambio numeros a float
+
+        if (sample_people_hash[food_name] == [])
+          if (food_name == "Glucosa")
+            sample_people_hash.each_key { |name| sample_people_hash[name][person_number-2].push(sample_person_array) }
+          else
+            sample_people_hash[food_name] = [[sample_person_array]]
+          end
+        else
+          sample_people_hash[food_name].push([sample_person_array])
+        end
+      
+        line_counter = line_counter + 1 # Cambio de línea
+        unless (line_counter >= data_line_array.count)
+          data_line = data_line_array[line_counter]
+        end
+      end
+    end
+    
+    #sample_people_hash.each{ |x, y| puts "#{x} => #{y}" }
+    
+    return sample_people_hash
+  end
+  
+  # Method to read data by file
+  # @params data_filename [String] filename of the data
+  # @return [Array] Return array of food
+  def read_data (data_filename, samples_data_filename = "")
+    data_string = File.open(data_filename).read.split("\n") # Divido el fichero en string de lineas
+    food_array = []
+    
+    if (samples_data_filename != "")
+      sample_people_hash = read_samples_data(samples_data_filename)
+    end
+  
+    data_string.each { |data_line|
+      data_line = data_line.split(" ") # La divido en espacios
+      name = ""
+      
+      while (data_line[0] != data_line[0].to_f.to_s) # Si el nombre no cambia al pasar de string afloat es que es un float
+        name << data_line[0] << " "
+        data_line = data_line[1..-1] # Quito el primer elemento
+      end
+      
+      food_name = name[0..-2].capitalize
+      protein = [data_line[0].to_f, PROTEIN_ENERGY]
+      glucid = [data_line[1].to_f, GLUCID_ENERGY]
+      lipid = [data_line[2].to_f, LIPID_ENERGY]
+      
+      data_line = data_line[3..-1] 
+      
+      
+      group_name = ""
+      while (!data_line[0].nil?) # Si el nombre no cambia al pasar de string afloat es que es un float
+        group_name << data_line[0] << " "
+        data_line = data_line[1..-1] # Quito el primer elemento
+      end
+      
+      if (samples_data_filename != "")
+        food = Food.new(food_name, protein, glucid, lipid, group_name[0..-2], sample_people_hash[food_name])
+      else
+        food = Food.new(food_name, protein, glucid, lipid, group_name[0..-2])
+      end
+      
+      food_array.push(food)
+    }
+    
+    return food_array
+  end
+  
+  def read_ingredient_database(data_filename)
+    data_string = File.open(data_filename).read.split("\n") # Divido el fichero en string de lineas
+    food_hash = Hash.new()
+  
+    data_string.each { |data_line|
+      data_line = data_line.split(" ") # La divido en espacios
+      name = ""
+      
+      while (data_line[0] != data_line[0].to_f.to_s) # Si el nombre no cambia al pasar de string afloat es que es un float
+        name << data_line[0] << " "
+        data_line = data_line[1..-1] # Quito el primer elemento
+      end
+      
+      food_name = name[0..-2].capitalize
+      protein = [data_line[0].to_f, PROTEIN_ENERGY]
+      glucid = [data_line[1].to_f, GLUCID_ENERGY]
+      lipid = [data_line[2].to_f, LIPID_ENERGY]
+      
+      data_line = data_line[3..-1] 
+      
+      group_name = ""
+      while (!data_line[0].nil?) 
+        group_name << data_line[0] << " "
+        data_line = data_line[1..-1] # Quito el primer elemento
+      end
+      
+      food_hash[food_name] = Food.new(food_name, protein, glucid, lipid, group_name[0..-2])
+    }
+    
+    return food_hash
+  end

data/lib/food/sort.rb

@@ -0,0 +1,135 @@
+class Array
+    
+  # Swap changes elements in position!
+  def swap(i, j)
+    clone_array = self.clone
+    clone_array[i], clone_array[j] = clone_array[j], clone_array[i]
+    clone_array
+  end
+  
+  def swap!(i, j)
+    self[i], self[j] = self[j], self[i]
+  end
+  
+  def bubble_sort_imp()
+    clone_array = self.clone
+    
+    for i in 1...clone_array.size
+        for j in 0...(clone_array.size - i)
+            clone_array.swap!(j, j+1) if (clone_array[j] > clone_array[j+1])
+        end
+    end
+    
+    clone_array
+  end
+  
+  def bubble_sort_imp!()
+    self.replace(self.bubble_sort_imp())
+  end
+  
+  def bubble_sort()
+    clone_array = self.clone
+    
+    (1...clone_array.size).each { |i|
+      (0...(clone_array.size - i)).each { |j|
+        clone_array.swap!(j, j+1) if (clone_array[j] > clone_array[j+1])
+      }
+    }
+    
+    clone_array
+  end
+  
+  def bubble_sort!()
+    self.replace(self.bubble_sort())
+  end
+  
+  def merge_sort()
+    split_array(self)
+  end
+  
+  def merge_sort_imp()
+    split_array(self)
+  end
+  
+  private
+  
+  def split_array_imp(sorted_array)
+    if (sorted_array.size <= 2)
+      if ((sorted_array.size == 2) && (sorted_array[0] > sorted_array[1]))
+        return sorted_array.swap(0, 1) 
+      else
+        return sorted_array
+      end
+    else
+      middle = sorted_array.size / 2
+      array_1 = split_array(sorted_array[0...middle])
+      array_2 = split_array(sorted_array[middle...sorted_array.size])
+      
+      return merge_arrays(array_1, array_2)
+    end
+  end
+  
+  def merge_arrays_imp(array_1, array_2)
+    sorted_array = Array.new()
+    
+    i = 0 # Iterador array_1
+    j = 0 # Iterador array_2
+    
+    while ((i < array_1.size) && (j < array_2.size))  # Iterador array_3
+      if (array_1[i] <= array_2[j])
+        sorted_array.push(array_1[i])
+        i = i+1
+      else
+        sorted_array.push(array_2[j])
+        j = j+1
+      end
+    end
+    
+    while(i < array_1.size)
+      sorted_array.push(array_1[i])
+      i = i+1
+    end
+    
+    while(j < array_2.size)
+      sorted_array.push(array_2[j])
+        j = j+1
+    end
+    
+    return sorted_array
+  end
+  
+  def split_array(sorted_array)
+    if (sorted_array.size <= 2)
+      if ((sorted_array.size == 2) && (sorted_array[0] > sorted_array[1]))
+        return sorted_array.swap!(0, 1)
+      else
+        return sorted_array
+      end
+    end
+      
+    middle = sorted_array.size / 2
+    array_1 = split_array(sorted_array[0...middle])
+    array_2 = split_array(sorted_array[middle...sorted_array.size])
+    
+    return merge_arrays(array_1, array_2)
+  end
+  
+  def merge_arrays(array_1, array_2)
+    sorted_array = Array.new()
+    
+    while (array_1.any? && array_2.any?)  # Iterador array_3
+      if (array_1[0] <= array_2[0])
+        sorted_array.push(array_1[0])
+        array_1.delete_at(0)
+      else
+        sorted_array.push(array_2[0])
+        array_2.delete_at(0)
+      end
+    end
+    
+    sorted_array.concat(array_1) if array_1.any?
+    sorted_array.concat(array_2) if array_2.any?
+    return sorted_array
+  end
+    
+end

data/lib/food/version.rb

@@ -2,5 +2,5 @@ module FoodGem
   # VERSION = "X.Y.Z"
   # Sumo una de X por cada cambio mayor (context)
   # Sumo una de Y por cada cambio menor (it)
-  VERSION = "3.3.0"
+  VERSION = "3.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foodAIHE
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Angel Igareta
@@ -94,6 +94,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: benchmark-ips
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Practica dessarrollada dirigida a pruebas TDD.
 email:
 - alu0100967111@ull.edu.es
@@ -101,6 +143,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".coveralls.yml"
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
@@ -126,6 +169,7 @@ files:
 - docs/file_list.html
 - docs/frames.html
 - docs/index.html
+- docs/input/dish_recipes.txt
 - docs/input/food-data.txt
 - docs/input/samples-data.txt
 - docs/js/app.js
@@ -134,14 +178,21 @@ files:
 - docs/method_list.html
 - docs/top-level-namespace.html
 - food.gemspec
+- input/dish_recipes.txt
+- input/food-data.txt
+- input/samples-data.txt
+- lib/dsl/harvard_dish.rb
 - lib/food.rb
 - lib/food/dll.rb
 - lib/food/food_class.rb
+- lib/food/functions.rb
+- lib/food/sort.rb
 - lib/food/version.rb
 homepage: https://github.com/ULL-ESIT-LPP-1718/tdd-alu0100967111
 licenses:
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -161,5 +212,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Practica dessarrollada dirigida a pruebas TDD.
+summary: Practicas TDD.
 test_files: []