fix statistical modelling

card.cpp

@@ -83,3 +83,71 @@ QString Card::toString() const
 
     return r;
 }
+
+Card Card::fromString(const QString &string)
+{
+    Suit suit;
+    Value value;
+    switch(string[0].toAscii()) {
+    case 'S':
+        suit = Card::Spade;
+        break;
+    case 'H':
+        suit = Card::Heart;
+        break;
+    case 'C':
+        suit = Card::Club;
+        break;
+    case 'D':
+        suit = Card::Diamond;
+        break;
+    default:
+        suit = (Card::Suit)-1;
+    }
+
+    switch(string[1].toAscii()) {
+    case '2':
+        value = Card::Two;
+        break;
+    case '3':
+        value = Card::Three;
+        break;
+    case '4':
+        value = Card::Four;
+        break;
+    case '5':
+        value = Card::Five;
+        break;
+    case '6':
+        value = Card::Six;
+        break;
+    case '7':
+        value = Card::Seven;
+        break;
+    case '8':
+        value = Card::Eight;
+        break;
+    case '9':
+        value = Card::Nine;
+        break;
+    case '0':
+        value = Card::Ten;
+        break;
+    case 'J':
+        value = Card::Jack;
+        break;
+    case 'Q':
+        value = Card::Queen;
+        break;
+    case 'K':
+        value = Card::King;
+        break;
+    case 'A':
+        value = Card::Ace;
+        break;
+    default:
+        value = (Card::Value)-1;
+    }
+
+    return Card(value, suit);
+}

card.h

@@ -43,6 +43,8 @@ class Card
 
     QString toString() const;
 
+    static Card fromString(const QString &string);
+
 private:
     Value m_value;
     Suit m_suit;

deck.cpp

@@ -2,6 +2,7 @@
 
 #include "card.h"
 #include <QDebug>
+#include <QStringList>
 
 Deck::Deck() : QList<Card>()
 {
@@ -375,3 +376,27 @@ void Deck::removeCards(const Deck &hand){
         }
     }
 }
+
+QString Deck::toString() const
+{
+    QString ret;
+
+    for (int i=0; i<size(); i++) {
+        if (i)
+            ret += ',';
+        ret += at(i).toString();
+    }
+
+    return ret;
+}
+
+Deck Deck::fromString(QString string)
+{
+    Deck ret;
+    QStringList cards = string.split(',');
+    foreach(const QString &card, cards) {
+        ret.append(Card::fromString(card));
+    }
+
+    return ret;
+}

deck.h

@@ -32,6 +32,9 @@ class Deck : public QList<Card>
 
     void removeCards(const Deck &cards);
 
+    QString toString() const;
+    static Deck fromString(QString string);
+
 
 private:
 

holdme.pro

@@ -17,12 +17,12 @@ SOURCES += main.cpp \
     test.cpp \
     preflopplayer.cpp \
     statisticalmodel.cpp \
-    context.cpp
+    statisticalplayer.cpp
 HEADERS += player.h \
     table.h \
     card.h \
     deck.h \
     preflop.h \
     preflopplayer.h \
     statisticalmodel.h \
-    context.h
+    statisticalplayer.h