From ba41aa43e5b275053a98638749af793668cbcf54 Mon Sep 17 00:00:00 2001
From: Yannine Alvarez <yalvarez@roshka.com>
Date: Sun, 19 Apr 2020 18:13:52 -0400
Subject: [PATCH] corrección de valor de retorno, agregar return poker.

---
 Poker/.idea/workspace.xml | 45 ++++++++++++++++++++++++---------------------
 Poker/src/Poker.kt        |  7 ++++++-
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/Poker/.idea/workspace.xml b/Poker/.idea/workspace.xml
index 3acd2cc..142971b 100644
--- a/Poker/.idea/workspace.xml
+++ b/Poker/.idea/workspace.xml
@@ -1,13 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="628f93ca-b7ce-4a63-90a4-4fc67deaa2b5" name="Default Changelist" comment="Unificar en una función para retornar valores en el poker">
+    <list default="true" id="628f93ca-b7ce-4a63-90a4-4fc67deaa2b5" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/production/Poker/Card.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/production/Poker/Carta.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/Poker/Carta.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/production/Poker/Poker.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/production/Poker/PokerKt$isStraight$$inlined$sortedBy$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/production/Poker/PokerKt.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/Poker/PokerKt.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Poker.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/Poker.kt" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -92,38 +87,46 @@
       <option name="project" value="LOCAL" />
       <updated>1587329427974</updated>
     </task>
-    <option name="localTasksCounter" value="2" />
+    <task id="LOCAL-00002" summary="corrección de valor de retorno.">
+      <created>1587333258876</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1587333258876</updated>
+    </task>
+    <option name="localTasksCounter" value="3" />
     <servers />
   </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="Unificar en una función para retornar valores en el poker" />
-    <option name="LAST_COMMIT_MESSAGE" value="Unificar en una función para retornar valores en el poker" />
+    <MESSAGE value="corrección de valor de retorno." />
+    <option name="LAST_COMMIT_MESSAGE" value="corrección de valor de retorno." />
   </component>
   <component name="WindowStateProjectService">
     <state x="413" y="109" key="#com.intellij.refactoring.typeMigration.ui.FailedConversionsDialog" timestamp="1586915044775">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
     <state x="413" y="109" key="#com.intellij.refactoring.typeMigration.ui.FailedConversionsDialog/0.0.1366.728@0.0.1366.728" timestamp="1586915044775" />
-    <state x="313" y="0" key="CommitChangelistDialog2" timestamp="1587333206624">
+    <state x="313" y="0" key="CommitChangelistDialog2" timestamp="1587333255252">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state x="313" y="0" key="CommitChangelistDialog2/0.0.1366.728@0.0.1366.728" timestamp="1587333206624" />
-    <state width="1322" height="174" key="GridCell.Tab.0.bottom" timestamp="1587333192829">
+    <state x="313" y="0" key="CommitChangelistDialog2/0.0.1366.728@0.0.1366.728" timestamp="1587333255252" />
+    <state width="1322" height="174" key="GridCell.Tab.0.bottom" timestamp="1587333947392">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state width="1322" height="174" key="GridCell.Tab.0.bottom/0.0.1366.728@0.0.1366.728" timestamp="1587333192829" />
-    <state width="1322" height="174" key="GridCell.Tab.0.center" timestamp="1587333192828">
+    <state width="1322" height="174" key="GridCell.Tab.0.bottom/0.0.1366.728@0.0.1366.728" timestamp="1587333947392" />
+    <state width="1322" height="174" key="GridCell.Tab.0.center" timestamp="1587333947392">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state width="1322" height="174" key="GridCell.Tab.0.center/0.0.1366.728@0.0.1366.728" timestamp="1587333192828" />
-    <state width="1322" height="174" key="GridCell.Tab.0.left" timestamp="1587333192828">
+    <state width="1322" height="174" key="GridCell.Tab.0.center/0.0.1366.728@0.0.1366.728" timestamp="1587333947392" />
+    <state width="1322" height="174" key="GridCell.Tab.0.left" timestamp="1587333947392">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state width="1322" height="174" key="GridCell.Tab.0.left/0.0.1366.728@0.0.1366.728" timestamp="1587333192828" />
-    <state width="1322" height="174" key="GridCell.Tab.0.right" timestamp="1587333192828">
+    <state width="1322" height="174" key="GridCell.Tab.0.left/0.0.1366.728@0.0.1366.728" timestamp="1587333947392" />
+    <state width="1322" height="174" key="GridCell.Tab.0.right" timestamp="1587333947392">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state width="1322" height="174" key="GridCell.Tab.0.right/0.0.1366.728@0.0.1366.728" timestamp="1587333192828" />
+    <state width="1322" height="174" key="GridCell.Tab.0.right/0.0.1366.728@0.0.1366.728" timestamp="1587333947392" />
     <state width="1322" height="217" key="GridCell.Tab.1.bottom" timestamp="1587331383807">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
@@ -140,10 +143,10 @@
       <screen x="0" y="0" width="1366" height="728" />
     </state>
     <state width="1322" height="217" key="GridCell.Tab.1.right/0.0.1366.728@0.0.1366.728" timestamp="1587331383807" />
-    <state x="275" y="95" key="Vcs.Push.Dialog.v2" timestamp="1587329488713">
+    <state x="275" y="95" key="Vcs.Push.Dialog.v2" timestamp="1587333273924">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state x="275" y="95" key="Vcs.Push.Dialog.v2/0.0.1366.728@0.0.1366.728" timestamp="1587329488713" />
+    <state x="275" y="95" key="Vcs.Push.Dialog.v2/0.0.1366.728@0.0.1366.728" timestamp="1587333273924" />
     <state x="92" y="92" width="1182" height="544" key="com.intellij.history.integration.ui.views.FileHistoryDialog" timestamp="1586975782483">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
@@ -168,7 +171,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="kotlin-line">
           <url>file://$PROJECT_DIR$/src/Poker.kt</url>
-          <line>65</line>
+          <line>70</line>
           <option name="timeStamp" value="12" />
         </line-breakpoint>
       </breakpoints>
diff --git a/Poker/src/Poker.kt b/Poker/src/Poker.kt
index a54ffed..1e3f030 100644
--- a/Poker/src/Poker.kt
+++ b/Poker/src/Poker.kt
@@ -44,7 +44,12 @@ fun jugada(mano: String): String {
 
             return "DOS PARES"
         }
-        4 -> return "UN PAR"
+        4 -> {
+            return "UN PAR"
+        }
+        5 -> {
+            return "POKER"
+        }
         else -> {
             val color = esColor(cartas)
             val escalera = esEscalera(cartas) //corregir
--
libgit2 0.26.0