Skip to content

Commit

Permalink
Model an configuration clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
ThorvaldAagaard committed Apr 26, 2024
1 parent 248573d commit 558adf5
Show file tree
Hide file tree
Showing 53 changed files with 271 additions and 165 deletions.
10 changes: 5 additions & 5 deletions UCBC 2024/Conf/UCBC2024.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
name = SAYC UCBC
# Model version 1 drops state for bidding, and introduce different system for NS and EW
# Model version 2 includes 4 bids when making the lookup
model_version = 1
model_version = 2
# Version of tensorflow to use
tf_version = 1
# NS is SAYC and EW is WBridge5 with SAYC
NS = 1
EW = 99
NS = -1
EW = -1
# If using BBA the following NS and EW must match BBA's systems (0 =2/1, 1=SAYC, 2=WJ, 3=PC, 4=Acol)
use_bba = False
# Use SAYC in BBA
Expand All @@ -18,8 +18,8 @@ bba_ew = 1
contract = models/contract/contract-193200

[bidding]
bidder = Models/NS1EW99-bidding_same-5556000
info = Models/NS1EW99-binfo_same-5556000
bidder = Models/NS1EW99-bidding_V2-3125000
info = Models/NS1EW99-binfo_V2-3125000
# If there are multiple bids over this threshold make a simulation for the bids. -1 will just take highest
search_threshold = 0.12
# If there is bid above this threshold, make that bid ignoring other bids
Expand Down
7 changes: 4 additions & 3 deletions UCBC 2024/Conf/UCBC2024src.conf
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
[models]
name = SAYC UCBC
api = True
# Model version 1 drops state for bidding, and introduce different system for NS and EW
# Model version 2 includes 4 bids when making the lookup
model_version = 1
model_version = 2
# Version of tensorflow to use
tf_version = 1
# NS is SAYC and EW is WBridge5 with SAYC
Expand All @@ -18,8 +19,8 @@ bba_ew = 1
contract = models/contract/contract-193200

[bidding]
bidder = UCBC 2024/Models/NS1EW99-bidding_same-5556000
info = UCBC 2024/Models/NS1EW99-binfo_same-5556000
bidder = UCBC 2024/Models/NS1EW99-bidding_V2-3125000
info = UCBC 2024/Models/NS1EW99-binfo_V2-3125000
# If there are multiple bids over this threshold make a simulation for the bids
search_threshold = 0.12
# If there is bid above this threshold, make that bid ignoring other bids
Expand Down
Binary file not shown.
Binary file added UCBC 2024/Models/NS1EW99-bidding_V2-3125000.index
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added UCBC 2024/Models/NS1EW99-binfo_V2-3125000.index
Binary file not shown.
Binary file not shown.
4 changes: 2 additions & 2 deletions UCBC 2024/MvsM/GIB.conf
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ matchpoint = False
contract = models/contract/contract-193200

[bidding]
bidder = UCBC 2024/MvsM/Models/bidding-5540000
info = UCBC 2024/MvsM/Models/binfo-5254000
bidder = UCBC 2024/MvsM/Models/bidding_V2-5540000
info = UCBC 2024/MvsM/Models/binfo_V2-5254000
# If there are multiple bids over this threshold make a simulation for the bids
search_threshold = 0.07
# If there is bid above this threshold, make that bid ignoring other bids
Expand Down
20 changes: 11 additions & 9 deletions UCBC 2024/MvsM/Human.conf
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
[models]
name = Human
api = true

# Model version 1 drops state for bidding, and introduce different system for NS and EW
# Model version 2 includes 4 bids when making the lookup
model_version = 0
model_version = 2
# Version of tensorflow to use
tf_version = 1
# NS is SAYC and EW is WBridge5 with SAYC
NS = 1
EW = 99
NS = -1
EW = -1
# If using BBA the following NS and EW must match BBA's systems (0 =2/1, 1=SAYC, 2=WJ, 3=PC, 4=Acol)
use_bba = False
# Use SAYC in BBA
Expand All @@ -20,8 +22,8 @@ matchpoint = False
contract = models/contract/contract-193200

[bidding]
bidder = UCBC 2024/MvsM/Models/bidding-3125000
info = UCBC 2024/MvsM/Models/binfo-3125000
bidder = UCBC 2024/MvsM/Models/bidding_V2-8268000
info = UCBC 2024/MvsM/Models/binfo_V2-5254000
# If there are multiple bids over this threshold make a simulation for the bids
search_threshold = 0.07
# If there is bid above this threshold, make that bid ignoring other bids
Expand Down Expand Up @@ -85,13 +87,13 @@ double_dummy_eval = True
# This is telling if opening lead is included in the neural net for lefty
opening_lead_included = False
lefty_nt = UCBC 2024/Models/jack/lefty-1000000
dummy_nt = UCBC 2024/Models/dummy_nt-475000
dummy_nt = UCBC 2024/Models/decl_nt-950000
righty_nt = UCBC 2024/Models/jack/righty-1000000
decl_nt = UCBC 2024/Models/decl_nt-9500000
decl_nt = UCBC 2024/Models/decl_nt-950000
lefty_suit = UCBC 2024/Models/jack/lefty-1000000
dummy_suit = UCBC 2024/Models/dummy_suit-999000
dummy_suit = UCBC 2024/Models/decl_suit-1278000
righty_suit = UCBC 2024/Models/jack/righty-1000000
decl_suit = UCBC 2024/Models/decl_suit-12780000
decl_suit = UCBC 2024/Models/decl_suit-1278000
# Number of samples when playing the hand
sample_hands_play = 200
# Minimum number of boards we want returned for sampling
Expand Down
19 changes: 10 additions & 9 deletions UCBC 2024/MvsM/Lia.conf
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
[models]
# BEN NS
name = Lia
api = true
# Model version 1 drops state for bidding, and introduce different system for NS and EW
# Model version 2 includes 4 bids when making the lookup
model_version = 0
model_version = 2
# Version of tensorflow to use
tf_version = 1
# NS is SAYC and EW is WBridge5 with SAYC
NS = 1
EW = 99
NS = -1
EW = -1
# If using BBA the following NS and EW must match BBA's systems (0 =2/1, 1=SAYC, 2=WJ, 3=PC, 4=Acol)
use_bba = False
# Use SAYC in BBA
Expand All @@ -21,8 +22,8 @@ matchpoint = False
contract = models/contract/contract-193200

[bidding]
bidder = UCBC 2024/MvsM/Models/bidding-3125000
info = UCBC 2024/MvsM/Models/binfo-3125000
bidder = UCBC 2024/MvsM/Models/bidding_V2-8268000
info = UCBC 2024/MvsM/Models/binfo_V2-5254000
# If there are multiple bids over this threshold make a simulation for the bids
search_threshold = 0.07
# If there is bid above this threshold, make that bid ignoring other bids
Expand Down Expand Up @@ -86,13 +87,13 @@ double_dummy_eval = True
# This is telling if opening lead is included in the neural net for lefty
opening_lead_included = False
lefty_nt = UCBC 2024/Models/jack/lefty-1000000
dummy_nt = UCBC 2024/Models/dummy_nt-475000
dummy_nt = UCBC 2024/Models/decl_nt-950000
righty_nt = UCBC 2024/Models/jack/righty-1000000
decl_nt = UCBC 2024/Models/decl_nt-9500000
decl_nt = UCBC 2024/Models/decl_nt-950000
lefty_suit = UCBC 2024/Models/jack/lefty-1000000
dummy_suit = UCBC 2024/Models/dummy_suit-999000
dummy_suit = UCBC 2024/Models/decl_suit-1278000
righty_suit = UCBC 2024/Models/jack/righty-1000000
decl_suit = UCBC 2024/Models/decl_suit-12780000
decl_suit = UCBC 2024/Models/decl_suit-1278000
# Number of samples when playing the hand
sample_hands_play = 200
# Minimum number of boards we want returned for sampling
Expand Down
24 changes: 13 additions & 11 deletions UCBC 2024/MvsM/MB.conf
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
[models]
# BEN ??
name = default
# BEN vs Microbridge
name = Microbridge
api = true

# Model version 1 drops state for bidding, and introduce different system for NS and EW
# Model version 2 includes 4 bids when making the lookup
model_version = 0
model_version = 2
# Version of tensorflow to use
tf_version = 1
# NS is SAYC and EW is WBridge5 with SAYC
NS = 1
EW = 99
NS = -1
EW = -1
# If using BBA the following NS and EW must match BBA's systems (0 =2/1, 1=SAYC, 2=WJ, 3=PC, 4=Acol)
use_bba = False
# Use SAYC in BBA
Expand All @@ -21,8 +23,8 @@ matchpoint = False
contract = models/contract/contract-193200

[bidding]
bidder = UCBC 2024/MvsM/Models/bidding-3125000
info = UCBC 2024/MvsM/Models/binfo-3125000
bidder = UCBC 2024/MvsM/Models/bidding_V2-8268000
info = UCBC 2024/MvsM/Models/binfo_V2-5254000
# If there are multiple bids over this threshold make a simulation for the bids
search_threshold = 0.07
# If there is bid above this threshold, make that bid ignoring other bids
Expand Down Expand Up @@ -86,13 +88,13 @@ double_dummy_eval = True
# This is telling if opening lead is included in the neural net for lefty
opening_lead_included = False
lefty_nt = UCBC 2024/Models/jack/lefty-1000000
dummy_nt = UCBC 2024/Models/dummy_nt-475000
dummy_nt = UCBC 2024/Models/decl_nt-950000
righty_nt = UCBC 2024/Models/jack/righty-1000000
decl_nt = UCBC 2024/Models/decl_nt-9500000
decl_nt = UCBC 2024/Models/decl_nt-950000
lefty_suit = UCBC 2024/Models/jack/lefty-1000000
dummy_suit = UCBC 2024/Models/dummy_suit-999000
dummy_suit = UCBC 2024/Models/decl_suit-1278000
righty_suit = UCBC 2024/Models/jack/righty-1000000
decl_suit = UCBC 2024/Models/decl_suit-12780000
decl_suit = UCBC 2024/Models/decl_suit-1278000
# Number of samples when playing the hand
sample_hands_play = 200
# Minimum number of boards we want returned for sampling
Expand Down
20 changes: 11 additions & 9 deletions UCBC 2024/MvsM/Q-Plus.conf
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
[models]
# BEN NS
name = Q-Plus
api = true

# Model version 1 drops state for bidding, and introduce different system for NS and EW
# Model version 2 includes 4 bids when making the lookup
model_version = 0
model_version = 2
# Version of tensorflow to use
tf_version = 1
# NS is SAYC and EW is WBridge5 with SAYC
NS = 1
EW = 99
NS = -1
EW = -1
# If using BBA the following NS and EW must match BBA's systems (0 =2/1, 1=SAYC, 2=WJ, 3=PC, 4=Acol)
use_bba = False
# Use SAYC in BBA
Expand All @@ -21,8 +23,8 @@ matchpoint = False
contract = models/contract/contract-193200

[bidding]
bidder = UCBC 2024/MvsM/Models/bidding-3125000
info = UCBC 2024/MvsM/Models/binfo-3125000
bidder = UCBC 2024/MvsM/Models/bidding_V2-8268000
info = UCBC 2024/MvsM/Models/binfo_V2-5254000
# If there are multiple bids over this threshold make a simulation for the bids
search_threshold = 0.07
# If there is bid above this threshold, make that bid ignoring other bids
Expand Down Expand Up @@ -86,13 +88,13 @@ double_dummy_eval = True
# This is telling if opening lead is included in the neural net for lefty
opening_lead_included = False
lefty_nt = UCBC 2024/Models/jack/lefty-1000000
dummy_nt = UCBC 2024/Models/dummy_nt-475000
dummy_nt = UCBC 2024/Models/decl_nt-950000
righty_nt = UCBC 2024/Models/jack/righty-1000000
decl_nt = UCBC 2024/Models/decl_nt-9500000
decl_nt = UCBC 2024/Models/decl_nt-950000
lefty_suit = UCBC 2024/Models/jack/lefty-1000000
dummy_suit = UCBC 2024/Models/dummy_suit-999000
dummy_suit = UCBC 2024/Models/decl_suit-1278000
righty_suit = UCBC 2024/Models/jack/righty-1000000
decl_suit = UCBC 2024/Models/decl_suit-12780000
decl_suit = UCBC 2024/Models/decl_suit-1278000
# Number of samples when playing the hand
sample_hands_play = 200
# Minimum number of boards we want returned for sampling
Expand Down
20 changes: 11 additions & 9 deletions UCBC 2024/MvsM/Shark.conf
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
[models]
# BEN EW
name = Shark
api = true

# Model version 1 drops state for bidding, and introduce different system for NS and EW
# Model version 2 includes 4 bids when making the lookup
model_version = 0
model_version = 2
# Version of tensorflow to use
tf_version = 1
# NS is SAYC and EW is WBridge5 with SAYC
NS = 1
EW = 99
NS = -1
EW = -1
# If using BBA the following NS and EW must match BBA's systems (0 =2/1, 1=SAYC, 2=WJ, 3=PC, 4=Acol)
use_bba = False
# Use SAYC in BBA
Expand All @@ -21,8 +23,8 @@ matchpoint = False
contract = models/contract/contract-193200

[bidding]
bidder = UCBC 2024/MvsM/Models/bidding-3125000
info = UCBC 2024/MvsM/Models/binfo-3125000
bidder = UCBC 2024/MvsM/Models/bidding_V2-8268000
info = UCBC 2024/MvsM/Models/binfo_V2-5254000
# If there are multiple bids over this threshold make a simulation for the bids
search_threshold = 0.07
# If there is bid above this threshold, make that bid ignoring other bids
Expand Down Expand Up @@ -86,13 +88,13 @@ double_dummy_eval = True
# This is telling if opening lead is included in the neural net for lefty
opening_lead_included = False
lefty_nt = UCBC 2024/Models/jack/lefty-1000000
dummy_nt = UCBC 2024/Models/dummy_nt-475000
dummy_nt = UCBC 2024/Models/decl_nt-950000
righty_nt = UCBC 2024/Models/jack/righty-1000000
decl_nt = UCBC 2024/Models/decl_nt-9500000
decl_nt = UCBC 2024/Models/decl_nt-950000
lefty_suit = UCBC 2024/Models/jack/lefty-1000000
dummy_suit = UCBC 2024/Models/dummy_suit-999000
dummy_suit = UCBC 2024/Models/decl_suit-1278000
righty_suit = UCBC 2024/Models/jack/righty-1000000
decl_suit = UCBC 2024/Models/decl_suit-12780000
decl_suit = UCBC 2024/Models/decl_suit-1278000
# Number of samples when playing the hand
sample_hands_play = 200
# Minimum number of boards we want returned for sampling
Expand Down
14 changes: 7 additions & 7 deletions UCBC 2024/MvsM/WBridge5.conf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
name = WBridge5
# Model version 1 drops state for bidding, and introduce different system for NS and EW
# Model version 2 includes 4 bids when making the lookup
model_version = 1
model_version = 2
# Version of tensorflow to use
tf_version = 1
# NS is SAYC and EW is WBridge5 with SAYC
Expand All @@ -21,8 +21,8 @@ matchpoint = False
contract = models/contract/contract-193200

[bidding]
bidder = UCBC 2024/Models/NS1EW99-bidding_same-5556000
info = UCBC 2024/Models/NS1EW99-binfo_same-5556000
bidder = UCBC 2024/MvsM/models/NS1EW99-bidding_V2-3125000
info = UCBC 2024/MvsM/models/NS1EW99-binfo_V2-3125000
# If there are multiple bids over this threshold make a simulation for the bids
search_threshold = 0.07
# If there is bid above this threshold, make that bid ignoring other bids
Expand Down Expand Up @@ -86,13 +86,13 @@ double_dummy_eval = True
# This is telling if opening lead is included in the neural net for lefty
opening_lead_included = False
lefty_nt = UCBC 2024/Models/jack/lefty-1000000
dummy_nt = UCBC 2024/Models/dummy_nt-475000
dummy_nt = UCBC 2024/Models/decl_nt-950000
righty_nt = UCBC 2024/Models/jack/righty-1000000
decl_nt = UCBC 2024/Models/decl_nt-9500000
decl_nt = UCBC 2024/Models/decl_nt-950000
lefty_suit = UCBC 2024/Models/jack/lefty-1000000
dummy_suit = UCBC 2024/Models/dummy_suit-999000
dummy_suit = UCBC 2024/Models/decl_suit-1278000
righty_suit = UCBC 2024/Models/jack/righty-1000000
decl_suit = UCBC 2024/Models/decl_suit-12780000
decl_suit = UCBC 2024/Models/decl_suit-1278000
# Number of samples when playing the hand
sample_hands_play = 200
# Minimum number of boards we want returned for sampling
Expand Down
19 changes: 10 additions & 9 deletions UCBC 2024/MvsM/default.conf
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
[models]
# BEN NS and EW
name = default
api = true
# Model version 1 drops state for bidding, and introduce different system for NS and EW
# Model version 2 includes 4 bids when making the lookup
model_version = 0
model_version = 2
# Version of tensorflow to use
tf_version = 1
# NS is SAYC and EW is WBridge5 with SAYC
NS = 1
EW = 99
NS = -1
EW = -1
# If using BBA the following NS and EW must match BBA's systems (0 =2/1, 1=SAYC, 2=WJ, 3=PC, 4=Acol)
use_bba = False
# Use SAYC in BBA
Expand All @@ -21,8 +22,8 @@ matchpoint = False
contract = models/contract/contract-193200

[bidding]
bidder = UCBC 2024/MvsM/Models/bidding-3125000
info = UCBC 2024/MvsM/Models/binfo-3125000
bidder = UCBC 2024/MvsM/Models/bidding_V2-8268000
info = UCBC 2024/MvsM/Models/binfo_V2-5254000
# If there are multiple bids over this threshold make a simulation for the bids
search_threshold = 0.07
# If there is bid above this threshold, make that bid ignoring other bids
Expand Down Expand Up @@ -86,13 +87,13 @@ double_dummy_eval = True
# This is telling if opening lead is included in the neural net for lefty
opening_lead_included = False
lefty_nt = UCBC 2024/Models/jack/lefty-1000000
dummy_nt = UCBC 2024/Models/dummy_nt-475000
dummy_nt = UCBC 2024/Models/decl_nt-950000
righty_nt = UCBC 2024/Models/jack/righty-1000000
decl_nt = UCBC 2024/Models/decl_nt-9500000
decl_nt = UCBC 2024/Models/decl_nt-950000
lefty_suit = UCBC 2024/Models/jack/lefty-1000000
dummy_suit = UCBC 2024/Models/dummy_suit-999000
dummy_suit = UCBC 2024/Models/decl_suit-1278000
righty_suit = UCBC 2024/Models/jack/righty-1000000
decl_suit = UCBC 2024/Models/decl_suit-12780000
decl_suit = UCBC 2024/Models/decl_suit-1278000
# Number of samples when playing the hand
sample_hands_play = 200
# Minimum number of boards we want returned for sampling
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed UCBC 2024/MvsM/models/bidding-3125000.index
Binary file not shown.
Binary file not shown.
Binary file added UCBC 2024/MvsM/models/bidding_V2-8268000.index
Binary file not shown.
Binary file added UCBC 2024/MvsM/models/bidding_V2-8268000.meta
Binary file not shown.
Binary file not shown.
Binary file removed UCBC 2024/MvsM/models/binfo-3125000.index
Binary file not shown.
Binary file not shown.
Binary file added UCBC 2024/MvsM/models/binfo_V2-5158000.index
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit 558adf5

Please sign in to comment.