Borrando gemas

.c9/metadata/tab0

@@ -1 +1 @@
-{"filter":false,"title":"bash - \"alu0100600582-pract8_lpp-1151868\"","tooltip":"bash - \"alu0100600582-pract8_lpp-1151868\"","undoManager":{"mark":0,"position":-1,"stack":[]},"terminal":{"id":"alu0100600582@pract8_lpp_103","cwd":"","width":1012,"height":325,"scrollTop":11936},"timestamp":1418262569714,"hash":"da39a3ee5e6b4b0d3255bfef95601890afd80709"}
+{"filter":false,"title":"bash - \"alu0100600582-pract8_lpp-1151868\"","tooltip":"bash - \"alu0100600582-pract8_lpp-1151868\"","undoManager":{"mark":0,"position":-1,"stack":[]},"terminal":{"id":"alu0100600582@pract8_lpp_103","cwd":"","width":1012,"height":325,"scrollTop":12236},"timestamp":1418262569714,"hash":"da39a3ee5e6b4b0d3255bfef95601890afd80709"}

.c9/metadata/tab3

@@ -0,0 +1 @@
+{"filter":false,"title":"bash - \"alu01005368742-pract8_lpp-1124680\"","tooltip":"bash - \"alu01005368742-pract8_lpp-1124680\"","undoManager":{"mark":0,"position":-1,"stack":[]},"terminal":{"id":"alu01005368742@pract8_lpp_209","cwd":"","width":998,"height":187,"scrollTop":14444},"timestamp":1417098973239,"hash":"da39a3ee5e6b4b0d3255bfef95601890afd80709"}

.c9/metadata/workspace/Gemfile.lock

@@ -1 +1,5 @@
-{"filter":false,"title":"Gemfile.lock","tooltip":"/Gemfile.lock","undoManager":{"mark":8,"position":8,"stack":[[{"group":"doc","deltas":[{"start":{"row":3,"column":18},"end":{"row":3,"column":19},"action":"remove","lines":["0"]}]}],[{"group":"doc","deltas":[{"start":{"row":3,"column":18},"end":{"row":3,"column":19},"action":"insert","lines":["1"]}]}],[{"group":"doc","deltas":[{"start":{"row":3,"column":12},"end":{"row":3,"column":15},"action":"insert","lines":["2.0"]},{"start":{"row":43,"column":10},"end":{"row":43,"column":13},"action":"insert","lines":["2.0"]}]}],[{"group":"doc","deltas":[{"start":{"row":3,"column":14},"end":{"row":3,"column":15},"action":"remove","lines":["0"]}]}],[{"group":"doc","deltas":[{"start":{"row":3,"column":13},"end":{"row":3,"column":14},"action":"remove","lines":["."]}]}],[{"group":"doc","deltas":[{"start":{"row":3,"column":12},"end":{"row":3,"column":13},"action":"remove","lines":["2"]}]}],[{"group":"doc","deltas":[{"start":{"row":43,"column":12},"end":{"row":43,"column":13},"action":"remove","lines":["0"]}]}],[{"group":"doc","deltas":[{"start":{"row":43,"column":11},"end":{"row":43,"column":12},"action":"remove","lines":["."]}]}],[{"group":"doc","deltas":[{"start":{"row":43,"column":10},"end":{"row":43,"column":11},"action":"remove","lines":["2"]}]}]]},"ace":{"folds":[],"scrolltop":420,"scrollleft":0,"selection":{"start":{"row":43,"column":10},"end":{"row":43,"column":10},"isBackwards":false},"options":{"guessTabSize":true,"useWrapMode":false,"wrapToView":true},"firstLineState":0},"timestamp":1418305534840,"hash":"f0377dbdaf0d92dc643a801e0fae106ffe71e354"}
+<<<<<<< HEAD
+{"filter":false,"title":"Gemfile.lock","tooltip":"/Gemfile.lock","undoManager":{"mark":8,"position":8,"stack":[[{"group":"doc","deltas":[{"start":{"row":3,"column":18},"end":{"row":3,"column":19},"action":"remove","lines":["0"]}]}],[{"group":"doc","deltas":[{"start":{"row":3,"column":18},"end":{"row":3,"column":19},"action":"insert","lines":["1"]}]}],[{"group":"doc","deltas":[{"start":{"row":3,"column":12},"end":{"row":3,"column":15},"action":"insert","lines":["2.0"]},{"start":{"row":43,"column":10},"end":{"row":43,"column":13},"action":"insert","lines":["2.0"]}]}],[{"group":"doc","deltas":[{"start":{"row":3,"column":14},"end":{"row":3,"column":15},"action":"remove","lines":["0"]}]}],[{"group":"doc","deltas":[{"start":{"row":3,"column":13},"end":{"row":3,"column":14},"action":"remove","lines":["."]}]}],[{"group":"doc","deltas":[{"start":{"row":3,"column":12},"end":{"row":3,"column":13},"action":"remove","lines":["2"]}]}],[{"group":"doc","deltas":[{"start":{"row":43,"column":12},"end":{"row":43,"column":13},"action":"remove","lines":["0"]}]}],[{"group":"doc","deltas":[{"start":{"row":43,"column":11},"end":{"row":43,"column":12},"action":"remove","lines":["."]}]}],[{"group":"doc","deltas":[{"start":{"row":43,"column":10},"end":{"row":43,"column":11},"action":"remove","lines":["2"]}]}]]},"ace":{"folds":[],"scrolltop":420,"scrollleft":0,"selection":{"start":{"row":43,"column":10},"end":{"row":43,"column":10},"isBackwards":false},"options":{"guessTabSize":true,"useWrapMode":false,"wrapToView":true},"firstLineState":0},"timestamp":1418305534840,"hash":"f0377dbdaf0d92dc643a801e0fae106ffe71e354"}
+=======
+{"filter":false,"title":"Gemfile.lock","tooltip":"/Gemfile.lock","undoManager":{"mark":-1,"position":-1,"stack":[]},"ace":{"folds":[],"scrolltop":612,"scrollleft":0,"selection":{"start":{"row":43,"column":13},"end":{"row":43,"column":13},"isBackwards":false},"options":{"guessTabSize":true,"useWrapMode":false,"wrapToView":true},"firstLineState":0},"timestamp":1418305329209,"hash":"d0827acfccf2006976943d63b4a0f07d0ebec383"}
+>>>>>>> cdd6b5406551e0fb940f9335b78ee5e598bd0b33

.c9/metadata/workspace/Guardfile

@@ -1 +1 @@
-{"filter":false,"title":"Guardfile","tooltip":"/Guardfile","undoManager":{"mark":-1,"position":-1,"stack":[]},"ace":{"folds":[],"scrolltop":0,"scrollleft":0,"selection":{"start":{"row":0,"column":0},"end":{"row":0,"column":0},"isBackwards":false},"options":{"guessTabSize":true,"useWrapMode":false,"wrapToView":true},"firstLineState":{"row":4,"state":"start","mode":"ace/mode/ruby"}},"timestamp":1418264355936,"hash":"49871a54a097b1a85ae8cfba55586d732127e729"}
+{"filter":false,"title":"Guardfile","tooltip":"/Guardfile","undoManager":{"mark":-1,"position":-1,"stack":[]},"ace":{"folds":[],"scrolltop":0,"scrollleft":0,"selection":{"start":{"row":0,"column":0},"end":{"row":0,"column":0},"isBackwards":false},"options":{"guessTabSize":true,"useWrapMode":false,"wrapToView":true},"firstLineState":0},"timestamp":1418264355936,"hash":"49871a54a097b1a85ae8cfba55586d732127e729"}

.c9/metadata/workspace/lib/Examenes/examen.rb

@@ -1 +1 @@
-{"filter":false,"title":"examen.rb","tooltip":"/lib/Examenes/examen.rb","undoManager":{"mark":-1,"position":-1,"stack":[[{"group":"doc","deltas":[{"start":{"row":0,"column":0},"end":{"row":58,"column":3},"action":"remove","lines":["# -*- coding: utf-8 -*-","require 'rubygems'","require 'bundler/setup'","require 'rspec'","","# = Modulo Examenes","#","# Probando RDOC","#","# === Clase ExamenCompleto","#","# Definición de la clase ExamenCompleto compuesta por","# * metodo initialize","# * metodo obtenerPreguntas","# * metodo establecerPreguntas","# * metodo obtenerSoluciones","# * metodo establecerSoluciones","# * metodo obtenerPregunta(numero)","","module Examenes","    ","  class ExamenCompleto","      ","    # Dos tipos de atributos, lista_preguntas y lista_soluciones.","    attr_reader :lista_preguntas, :lista_soluciones","    ","    # En el constructor incializamos los dos atributos.","    def initialize (preguntas, soluciones)","      @lista_preguntas = preguntas","      @lista_soluciones = soluciones","    end","","    # Getter de obtener preguntas","    def obtenerPreguntas","      return @lista_preguntas","    end","    ","    # Setter de las preguntas pasado por parámetros","    def establecerPreguntas(preguntas)","      @lista_preguntas = preguntas","    end","    ","    # Getter de obtener soluciones","    def obtenerSoluciones","      return @lista_soluciones","    end","    ","    # Setter de las soluciones pasado por parámetros","    def establecerSoluciones(soluciones)","      @lista_soluciones = soluciones","    end","    ","    # Obtiene un número determinado de preguntas","    def obtenerPregunta(numero)","      return @lista_preguntas.obtenerValor(numero).mostrar","    end","    ","  end","end"]},{"start":{"row":0,"column":0},"end":{"row":61,"column":3},"action":"insert","lines":["# -*- coding: utf-8 -*-","#Clase examen, que contiene una lista de preguntas","#y permite la realización de un exámen tipo test con las mismas.","class Examen","attr_reader :nota","#Constructor.","def initialize (lista)","lista.ordenar","@preguntas = lista","@nota = 0","#inicializamos un array con 0 elementos para las respuestas","end","#Método que devuelve el examen como un String.","def to_s","aux = @preguntas.head","respuesta = \"\"","respuesta += aux.value.to_s","respuesta += \"\\n\"","while (aux != @preguntas.tail) do","aux = aux.next","respuesta += aux.value.to_s","respuesta += \"\\n\"","end","respuesta","end","def inverso","respuesta = \"\"","@preguntas.reverse_each{|x,y| respuesta += \"#{x.value.to_s}\\n\"}","respuesta","end","#Método que permite la realización del exament de forma interactiva.","def hacer_examen","score = 0","@preguntas.each do |preg|","puts preg.to_s","resp = gets.chomp","this = preg.value.resp_correcta?(resp)","if (this == true)","score += 1","puts \"Respuesta correcta\"","else","puts \"Respuesta incorrecta\"","end","end","puts \"Puntuacion: \" + score","end","#Método que comprueba las respuestas tomando un Array de respuestas.","#Sirve para la comprobación no interactiva de las respuestas.","def hacer_examen(respuestas)","score = 0","contador = 0","@preguntas.each do |preg|","resp = respuestas[contador]","this = preg.value.resp_correcta?(resp)","if (this == true)","score += 1","end","contador += 1","end","return score","end","end"]}]}]]},"ace":{"folds":[],"scrolltop":240,"scrollleft":0,"selection":{"start":{"row":5,"column":19},"end":{"row":5,"column":19},"isBackwards":false},"options":{"guessTabSize":true,"useWrapMode":false,"wrapToView":true},"firstLineState":{"row":431,"mode":"ace/mode/ruby"}},"timestamp":1418228665457,"hash":"45a6551dc9f7085a1b0464a0bfc3c88cca321d73"}
+{"filter":false,"title":"examen.rb","tooltip":"/lib/Examenes/examen.rb","undoManager":{"mark":-1,"position":-1,"stack":[]},"ace":{"folds":[],"scrolltop":785.5,"scrollleft":0,"selection":{"start":{"row":24,"column":4},"end":{"row":24,"column":15},"isBackwards":true},"options":{"guessTabSize":true,"useWrapMode":false,"wrapToView":true},"firstLineState":{"row":48,"state":"start","mode":"ace/mode/ruby"}},"timestamp":1417094751000,"hash":"45a6551dc9f7085a1b0464a0bfc3c88cca321d73"}