From c2d53052e846fa2f8bbedcae9eb37ed607bb13ee Mon Sep 17 00:00:00 2001 From: emkael Date: Thu, 3 Sep 2015 12:58:13 +0200 Subject: * options for collecting play and bidding data --- Aktywator/Bws.cs | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'Aktywator/Bws.cs') diff --git a/Aktywator/Bws.cs b/Aktywator/Bws.cs index 0be06df..20278e0 100644 --- a/Aktywator/Bws.cs +++ b/Aktywator/Bws.cs @@ -54,6 +54,8 @@ namespace Aktywator settings.Add(new Setting("BM2AutoBoardNumber", main.xAutoBoardNumber, this)); settings.Add(new Setting("BM2ResetFunctionKey", main.xResetFunctionKey, this)); settings.Add(new Setting("BM2ViewHandrecord", main.xViewHandrecord, this)); + settings.Add(new Setting("BM2RecordBidding", main.xCollectBidding, this)); + settings.Add(new Setting("BM2RecordPlay", main.xCollectPlay, this)); } public string sectionsForHandRecords() @@ -131,6 +133,8 @@ namespace Aktywator settings.Add(new Setting("BM2NameSource", "integer", "2")); settings.Add(new Setting("BM2ViewHandrecord", "bit", "false")); settings.Add(new Setting("BM2EnterHandrecord", "bit", "false")); + settings.Add(new Setting("BM2RecordBidding", "bit", "false")); + settings.Add(new Setting("BM2RecordPlay", "bit", "false")); settings.Add(new Setting("Name", "text(18)", "''", "PlayerNumbers")); settings.Add(new Setting("Updated", "bit", "false", "PlayerNumbers")); @@ -167,6 +171,28 @@ namespace Aktywator catch (OleDbException) { } + try + { + sql.query("CREATE TABLE PlayData (" + + "`ID` integer, `Section` integer, `Table` integer, `Round` integer, `Board` integer," + + "`Counter` integer, `Direction` text(2), `Card` text(10), `DateLog` datetime," + + "`TimeLog` datetime, `Erased` bit" + + ");"); + } + catch (OleDbException) + { + } + try + { + sql.query("CREATE TABLE BiddingData (" + + "`ID` integer, `Section` integer, `Table` integer, `Round` integer, `Board` integer," + + "`Counter` integer, `Direction` text(2), `Bid` text(10), `DateLog` datetime," + + "`TimeLog` datetime, `Erased` bit" + + ");"); + } + catch (OleDbException) + { + } } public void updateSettings() -- cgit v1.2.3 From 6f5d3a1d030fe7d66d56c71bdacb2534a9c98561 Mon Sep 17 00:00:00 2001 From: emkael Date: Sat, 14 Nov 2015 10:55:05 +0100 Subject: * autonumber IDs in bidding/play tables --- Aktywator/Bws.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Aktywator/Bws.cs') diff --git a/Aktywator/Bws.cs b/Aktywator/Bws.cs index 20278e0..8884868 100644 --- a/Aktywator/Bws.cs +++ b/Aktywator/Bws.cs @@ -174,7 +174,7 @@ namespace Aktywator try { sql.query("CREATE TABLE PlayData (" - + "`ID` integer, `Section` integer, `Table` integer, `Round` integer, `Board` integer," + + "`ID` autoincrement, `Section` integer, `Table` integer, `Round` integer, `Board` integer," + "`Counter` integer, `Direction` text(2), `Card` text(10), `DateLog` datetime," + "`TimeLog` datetime, `Erased` bit" + ");"); @@ -185,7 +185,7 @@ namespace Aktywator try { sql.query("CREATE TABLE BiddingData (" - + "`ID` integer, `Section` integer, `Table` integer, `Round` integer, `Board` integer," + + "`ID` autoincrement, `Section` integer, `Table` integer, `Round` integer, `Board` integer," + "`Counter` integer, `Direction` text(2), `Bid` text(10), `DateLog` datetime," + "`TimeLog` datetime, `Erased` bit" + ");"); -- cgit v1.2.3 From 3fd493b395d27749749587518d76a4e5d648920c Mon Sep 17 00:00:00 2001 From: emkael Date: Wed, 9 Nov 2016 14:20:32 +0100 Subject: * PBN double-dummy data support for HandEvaluation table --- Aktywator/Bws.cs | 34 ++++++++++++++++++++++++++++++++++ Aktywator/DDTable.cs | 9 ++++++--- Aktywator/PBNBoard.cs | 3 ++- 3 files changed, 42 insertions(+), 4 deletions(-) (limited to 'Aktywator/Bws.cs') diff --git a/Aktywator/Bws.cs b/Aktywator/Bws.cs index 0be06df..eda99a1 100644 --- a/Aktywator/Bws.cs +++ b/Aktywator/Bws.cs @@ -104,6 +104,8 @@ namespace Aktywator return false; if (!sql.checkTableExists("HandRecord")) return false; + if (!sql.checkTableExists("HandEvaluation")) + return false; return true; } @@ -167,6 +169,19 @@ namespace Aktywator catch (OleDbException) { } + try + { + sql.query("CREATE TABLE HandEvaluation (`Section` integer, `Board` integer, " + + "NorthSpades integer,NorthHearts integer,NorthDiamonds integer,NorthClubs integer,NorthNotrump integer," + + "EastSpades integer,EastHearts integer,EastDiamonds integer,EastClubs integer,EastNotrump integer," + + "SouthSpades integer,SouthHearts integer,SouthDiamonds integer,SouthClubs integer,SouthNotrump integer," + + "WestSpades integer,WestHearts integer,WestDiamonds integer,WestClubs integer,WestNotrump integer," + + "NorthHcp integer,EastHcp integer,SouthHcp integer,WestHcp integer" + + ");"); + } + catch (OleDbException) + { + } } public void updateSettings() @@ -377,6 +392,7 @@ namespace Aktywator public void loadHandRecords(PBN pbn) { sql.query("DELETE FROM HandRecord"); + sql.query("DELETE FROM HandEvaluation"); for (int i = 0; i < pbn.handRecords.Length; i++) if (pbn.handRecords[i] != null) for (int section = 1; section <= highSection(); section++) @@ -403,6 +419,24 @@ namespace Aktywator str.Append(b.west[2]); str.Append("','"); str.Append(b.west[3]); str.Append("')"); sql.query(str.ToString()); + int[,] ddTable = pbn.ddTables[i].GetDDTable(); + if (ddTable != null) + { + StringBuilder ddStr = new StringBuilder(); + ddStr.Append("INSERT INTO HandEvaluation VALUES("); + ddStr.Append(section); ddStr.Append(","); + ddStr.Append(i); ddStr.Append(","); + for (int player = 0; player < 4; player++) + { + for (int denom = 0; denom < 5; denom++) + { + ddStr.Append(ddTable[player, denom]); + ddStr.Append(","); + } + } + ddStr.Append("0,0,0,0)"); // HCP not supported yet + sql.query(ddStr.ToString()); + } } } } diff --git a/Aktywator/DDTable.cs b/Aktywator/DDTable.cs index 38e0fbd..5de9c3b 100644 --- a/Aktywator/DDTable.cs +++ b/Aktywator/DDTable.cs @@ -14,7 +14,8 @@ namespace Aktywator class DDTable { - public static char[] DENOMINATIONS = { 'C', 'D', 'H', 'S', 'N' }; + public static char[] DENOMINATIONS = { 'S', 'H', 'D', 'C', 'N' }; + private static char[] JFR_DENOMS = {'N', 'S', 'H', 'D', 'C'}; public static char[] PLAYERS = { 'N', 'E', 'S', 'W' }; private PBNBoard board; @@ -58,11 +59,13 @@ namespace Aktywator { char player = playerAbility.Groups[1].Value[0]; int playerID = Array.IndexOf(PLAYERS, player); - int denomID = 4; + int denomID; + int denom = 0; foreach (char tricks in playerAbility.Groups[2].Value.ToCharArray()) { + denomID = Array.IndexOf(DENOMINATIONS, JFR_DENOMS[denom]); result[playerID, denomID] = (tricks > '9') ? (tricks - 'A' + 10) : (tricks - '0'); - denomID--; + denom++; } } return this.validateTable(result); diff --git a/Aktywator/PBNBoard.cs b/Aktywator/PBNBoard.cs index 605630c..fadfd22 100644 --- a/Aktywator/PBNBoard.cs +++ b/Aktywator/PBNBoard.cs @@ -87,7 +87,8 @@ namespace Aktywator public String GetLayout() { - return this.GetField("Deal"); + string[] dealParts = this.GetField("Deal").Split(':'); + return dealParts[dealParts.Length - 1]; } public String GetNumber() -- cgit v1.2.3 From 0cfcb31daea464584315263225381ba53c24a9eb Mon Sep 17 00:00:00 2001 From: emkael Date: Wed, 9 Nov 2016 14:25:56 +0100 Subject: * HCP support for HandEvaluation table --- Aktywator/Bws.cs | 10 +++++++++- Aktywator/HandRecord.cs | 31 +++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) (limited to 'Aktywator/Bws.cs') diff --git a/Aktywator/Bws.cs b/Aktywator/Bws.cs index eda99a1..87c9081 100644 --- a/Aktywator/Bws.cs +++ b/Aktywator/Bws.cs @@ -434,7 +434,15 @@ namespace Aktywator ddStr.Append(","); } } - ddStr.Append("0,0,0,0)"); // HCP not supported yet + for (int j = 0; j < 4; j++) + { + ddStr.Append(b.hpcs[j]); + if (j < 3) + { + ddStr.Append(","); + } + } + ddStr.Append(")"); sql.query(ddStr.ToString()); } } diff --git a/Aktywator/HandRecord.cs b/Aktywator/HandRecord.cs index bd0e9f9..199e94f 100644 --- a/Aktywator/HandRecord.cs +++ b/Aktywator/HandRecord.cs @@ -10,6 +10,7 @@ namespace Aktywator public string[] east; public string[] south; public string[] west; + public int[] hpcs; public HandRecord() { @@ -19,6 +20,31 @@ namespace Aktywator west = new string[4]; } + private int _hpcFromHand(string hand) + { + int hpc = 0; + foreach (char c in hand) + { + if (c == 'a' || c == 'A') + { + hpc += 4; + } + if (c == 'k' || c == 'K') + { + hpc += 3; + } + if (c == 'q' || c == 'Q') + { + hpc += 2; + } + if (c == 'j' || c == 'J') + { + hpc += 1; + } + } + return hpc; + } + public HandRecord(string pbnString) { string[] hand = pbnString.Split(' '); @@ -26,6 +52,11 @@ namespace Aktywator east = hand[1].Split('.'); south = hand[2].Split('.'); west = hand[3].Split('.'); + hpcs = new int[4]; + for (int i = 0; i < 4; i++) + { + hpcs[i] = this._hpcFromHand(hand[i]); + } } } } -- cgit v1.2.3