From 7ec919853d7daee19a2d8d6a90fc301e215b6df1 Mon Sep 17 00:00:00 2001 From: Martin Bruse Date: Thu, 5 Apr 2018 09:37:33 +0200 Subject: [PATCH] Moved the godip/common code to godip. --- datc/datc.go | 90 ++++----- gae/common/common.go | 2 +- common/common.go => godip.go | 2 +- graph/graph.go | 90 ++++----- graph/graph_test.go | 10 +- orders/build.go | 2 +- orders/convoy.go | 2 +- orders/disband.go | 2 +- orders/hold.go | 2 +- orders/move.go | 2 +- orders/parser.go | 2 +- orders/support.go | 2 +- state/judge_test.go | 28 +-- state/resolver.go | 48 ++--- state/state.go | 190 +++++++++--------- .../ancientmediterranean.go | 2 +- .../ancientmediterranean_test.go | 2 +- variants/ancientmediterranean/games_test.go | 2 +- variants/classical/classical.go | 2 +- variants/classical/classical_test.go | 2 +- variants/classical/common/common.go | 2 +- variants/classical/datc.go | 2 +- .../classical/droidippy/droidippy_test.go | 2 +- variants/classical/orders/orders.go | 2 +- variants/classical/phase.go | 2 +- variants/classical/start/map.go | 2 +- variants/classical/start/supply_centers.go | 6 +- variants/classical/start/units.go | 54 ++--- variants/coldwar/coldwar.go | 2 +- variants/coldwar/coldwar_test.go | 2 +- variants/coldwar/games_test.go | 2 +- variants/common/common.go | 2 +- variants/common/common_test.go | 2 +- variants/fleetrome/fleetrome.go | 2 +- variants/franceaustria/franceaustria.go | 2 +- variants/generator/generate.py | 2 +- variants/hundred/games_test.go | 2 +- variants/hundred/hundred.go | 2 +- variants/hundred/hundred_test.go | 2 +- variants/hundred/hundredphase.go | 2 +- variants/pure/pure.go | 2 +- variants/testing/games_testing.go | 2 +- variants/testing/testing.go | 2 +- variants/variants_test.go | 2 +- variants/youngstownredux/games_test.go | 2 +- variants/youngstownredux/youngstownredux.go | 2 +- .../youngstownredux/youngstownredux_test.go | 2 +- 47 files changed, 297 insertions(+), 297 deletions(-) rename common/common.go => godip.go (99%) diff --git a/datc/datc.go b/datc/datc.go index 828cc081..2340ff7b 100644 --- a/datc/datc.go +++ b/datc/datc.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/zond/godip/common" + "github.com/zond/godip" ) var clearCommentReg = regexp.MustCompile("(?m)^\\s*([^#\n\t]+?)\\s*(#.*)?$") @@ -40,18 +40,18 @@ const ( func newState() *State { return &State{ - SCs: make(map[common.Province]common.Nation), - Units: make(map[common.Province]common.Unit), - Dislodgeds: make(map[common.Province]common.Unit), - Orders: make(map[common.Province]NationalizedOrder), - FailedOrders: make(map[common.Province]NationalizedOrder), - SuccessfulOrders: make(map[common.Province]NationalizedOrder), + SCs: make(map[godip.Province]godip.Nation), + Units: make(map[godip.Province]godip.Unit), + Dislodgeds: make(map[godip.Province]godip.Unit), + Orders: make(map[godip.Province]NationalizedOrder), + FailedOrders: make(map[godip.Province]NationalizedOrder), + SuccessfulOrders: make(map[godip.Province]NationalizedOrder), } } type NationalizedOrder struct { - Order common.Adjudicator - Nation common.Nation + Order godip.Adjudicator + Nation godip.Nation } func (self NationalizedOrder) String() string { @@ -59,13 +59,13 @@ func (self NationalizedOrder) String() string { } type State struct { - SCs map[common.Province]common.Nation - Units map[common.Province]common.Unit - Dislodgeds map[common.Province]common.Unit - Orders map[common.Province]NationalizedOrder - FailedOrders map[common.Province]NationalizedOrder - SuccessfulOrders map[common.Province]NationalizedOrder - Phase common.Phase + SCs map[godip.Province]godip.Nation + Units map[godip.Province]godip.Unit + Dislodgeds map[godip.Province]godip.Unit + Orders map[godip.Province]NationalizedOrder + FailedOrders map[godip.Province]NationalizedOrder + SuccessfulOrders map[godip.Province]NationalizedOrder + Phase godip.Phase } func (self *State) copyFrom(o *State) { @@ -99,15 +99,15 @@ func (self *StatePair) copyBeforeToAfter() { type StatePairHandler func(states *StatePair) -type OrderParser func(text string) (common.Province, common.Adjudicator, error) +type OrderParser func(text string) (godip.Province, godip.Adjudicator, error) -type PhaseParser func(season string, year int, typ string) (common.Phase, error) +type PhaseParser func(season string, year int, typ string) (godip.Phase, error) -type NationParser func(nation string) (common.Nation, error) +type NationParser func(nation string) (godip.Nation, error) -type UnitTypeParser func(typ string) (common.UnitType, error) +type UnitTypeParser func(typ string) (godip.UnitType, error) -type ProvinceParser func(prov string) (common.Province, error) +type ProvinceParser func(prov string) (godip.Province, error) type Parser struct { Variant string @@ -153,11 +153,11 @@ func (self Parser) Parse(r io.Reader, handler StatePairHandler) (err error) { } case inPrestateSupplycenterOwners: if match = stateReg.FindStringSubmatch(line); match != nil { - var owner common.Nation + var owner godip.Nation if owner, err = self.NationParser(match[1]); err != nil { return } - var prov common.Province + var prov godip.Province if prov, err = self.ProvinceParser(match[3]); err != nil { return } @@ -188,19 +188,19 @@ func (self Parser) Parse(r io.Reader, handler StatePairHandler) (err error) { } case inPrestate: if match = stateReg.FindStringSubmatch(line); match != nil { - var prov common.Province + var prov godip.Province if prov, err = self.ProvinceParser(match[3]); err != nil { return } - var unit common.UnitType + var unit godip.UnitType if unit, err = self.UnitTypeParser(match[2]); err != nil { return } - var nation common.Nation + var nation godip.Nation if nation, err = self.NationParser(match[1]); err != nil { return } - statePair.Before.Units[prov] = common.Unit{ + statePair.Before.Units[prov] = godip.Unit{ unit, nation, } @@ -218,19 +218,19 @@ func (self Parser) Parse(r io.Reader, handler StatePairHandler) (err error) { } case inPoststate: if match = stateReg.FindStringSubmatch(line); match != nil { - var prov common.Province + var prov godip.Province if prov, err = self.ProvinceParser(match[3]); err != nil { return } - var unit common.UnitType + var unit godip.UnitType if unit, err = self.UnitTypeParser(match[2]); err != nil { return } - var nation common.Nation + var nation godip.Nation if nation, err = self.NationParser(match[1]); err != nil { return } - statePair.After.Units[prov] = common.Unit{ + statePair.After.Units[prov] = godip.Unit{ unit, nation, } @@ -246,19 +246,19 @@ func (self Parser) Parse(r io.Reader, handler StatePairHandler) (err error) { } case inPrestateDislodged: if match = stateReg.FindStringSubmatch(line); match != nil { - var prov common.Province + var prov godip.Province if prov, err = self.ProvinceParser(match[3]); err != nil { return } - var unit common.UnitType + var unit godip.UnitType if unit, err = self.UnitTypeParser(match[2]); err != nil { return } - var nation common.Nation + var nation godip.Nation if nation, err = self.NationParser(match[1]); err != nil { return } - statePair.Before.Dislodgeds[prov] = common.Unit{ + statePair.Before.Dislodgeds[prov] = godip.Unit{ unit, nation, } @@ -272,12 +272,12 @@ func (self Parser) Parse(r io.Reader, handler StatePairHandler) (err error) { } case inPrestateResults: if match = preOrderReg.FindStringSubmatch(line); match != nil { - var prov common.Province - var order common.Adjudicator + var prov godip.Province + var order godip.Adjudicator if prov, order, err = self.OrderParser(match[3]); err != nil { return } - var nation common.Nation + var nation godip.Nation if nation, err = self.NationParser(match[2]); err != nil { return } @@ -301,19 +301,19 @@ func (self Parser) Parse(r io.Reader, handler StatePairHandler) (err error) { } case inPoststateDislodged: if match = stateReg.FindStringSubmatch(line); match != nil { - var prov common.Province + var prov godip.Province if prov, err = self.ProvinceParser(match[3]); err != nil { return } - var unit common.UnitType + var unit godip.UnitType if unit, err = self.UnitTypeParser(match[2]); err != nil { return } - var nation common.Nation + var nation godip.Nation if nation, err = self.NationParser(match[1]); err != nil { return } - statePair.After.Dislodgeds[prov] = common.Unit{ + statePair.After.Dislodgeds[prov] = godip.Unit{ unit, nation, } @@ -327,12 +327,12 @@ func (self Parser) Parse(r io.Reader, handler StatePairHandler) (err error) { } case inOrders: if match = ordersReg.FindStringSubmatch(line); match != nil { - var prov common.Province - var order common.Adjudicator + var prov godip.Province + var order godip.Adjudicator if prov, order, err = self.OrderParser(match[2]); err != nil { return } - var nation common.Nation + var nation godip.Nation if nation, err = self.NationParser(match[1]); err != nil { return } diff --git a/gae/common/common.go b/gae/common/common.go index a9b5967a..6b57ad88 100644 --- a/gae/common/common.go +++ b/gae/common/common.go @@ -6,7 +6,7 @@ import ( "github.com/zond/godip/orders" "github.com/zond/godip/variants/common" - dip "github.com/zond/godip/common" + dip "github.com/zond/godip" ) type Phase struct { diff --git a/common/common.go b/godip.go similarity index 99% rename from common/common.go rename to godip.go index bb8e3d98..08b2ab5c 100644 --- a/common/common.go +++ b/godip.go @@ -1,4 +1,4 @@ -package common +package godip import ( "bytes" diff --git a/graph/graph.go b/graph/graph.go index 3f3a4331..01e4f6ac 100644 --- a/graph/graph.go +++ b/graph/graph.go @@ -4,19 +4,19 @@ import ( "bytes" "fmt" - "github.com/zond/godip/common" + "github.com/zond/godip" c "github.com/zond/godip/variants/classical/common" ) func New() *Graph { return &Graph{ - Nodes: make(map[common.Province]*Node), + Nodes: make(map[godip.Province]*Node), } } type Graph struct { - Nodes map[common.Province]*Node + Nodes map[godip.Province]*Node } func (self *Graph) String() string { @@ -27,7 +27,7 @@ func (self *Graph) String() string { return string(buf.Bytes()) } -func (self *Graph) Has(n common.Province) (result bool) { +func (self *Graph) Has(n godip.Province) (result bool) { p, c := n.Split() if node, ok := self.Nodes[p]; ok { if _, ok := node.Subs[c]; ok { @@ -37,8 +37,8 @@ func (self *Graph) Has(n common.Province) (result bool) { return } -func (self *Graph) AllFlags(n common.Province) (result map[common.Flag]bool) { - result = map[common.Flag]bool{} +func (self *Graph) AllFlags(n godip.Province) (result map[godip.Flag]bool) { + result = map[godip.Flag]bool{} p, _ := n.Split() if node, ok := self.Nodes[p]; ok { for _, sub := range node.Subs { @@ -50,7 +50,7 @@ func (self *Graph) AllFlags(n common.Province) (result map[common.Flag]bool) { return } -func (self *Graph) Flags(n common.Province) (result map[common.Flag]bool) { +func (self *Graph) Flags(n godip.Province) (result map[godip.Flag]bool) { p, c := n.Split() if node, ok := self.Nodes[p]; ok { if sub, ok := node.Subs[c]; ok { @@ -60,14 +60,14 @@ func (self *Graph) Flags(n common.Province) (result map[common.Flag]bool) { return } -func (self *Graph) SC(n common.Province) (result *common.Nation) { +func (self *Graph) SC(n godip.Province) (result *godip.Nation) { if node, ok := self.Nodes[n.Super()]; ok { result = node.SC } return } -func (self *Graph) SCs(n common.Nation) (result []common.Province) { +func (self *Graph) SCs(n godip.Nation) (result []godip.Province) { for name, node := range self.Nodes { if node.SC != nil && *node.SC == n { result = append(result, name) @@ -76,15 +76,15 @@ func (self *Graph) SCs(n common.Nation) (result []common.Province) { return } -func (self *Graph) Edges(n common.Province) (result map[common.Province]map[common.Flag]bool) { - result = map[common.Province]map[common.Flag]bool{} +func (self *Graph) Edges(n godip.Province) (result map[godip.Province]map[godip.Flag]bool) { + result = map[godip.Province]map[godip.Flag]bool{} for p, edge := range self.edges(n) { result[p] = edge.Flags } return } -func (self *Graph) edges(n common.Province) (result map[common.Province]*edge) { +func (self *Graph) edges(n godip.Province) (result map[godip.Province]*edge) { p, c := n.Split() if node, ok := self.Nodes[p]; ok { if sub, ok := node.Subs[c]; ok { @@ -95,22 +95,22 @@ func (self *Graph) edges(n common.Province) (result map[common.Province]*edge) { } type pathStep struct { - path []common.Province - src common.Province - dst common.Province + path []godip.Province + src godip.Province + dst godip.Province } -func (self *Graph) pathHelper(dst common.Province, queue []pathStep, seen map[[2]common.Province]bool, filter common.PathFilter) []common.Province { +func (self *Graph) pathHelper(dst godip.Province, queue []pathStep, seen map[[2]godip.Province]bool, filter godip.PathFilter) []godip.Province { var newQueue []pathStep for _, step := range queue { - key := [2]common.Province{step.src, step.dst} + key := [2]godip.Province{step.src, step.dst} if seen[key] { continue } seen[key] = true for name, edge := range self.edges(step.dst) { if filter == nil || filter(name, edge.Flags, edge.sub.Flags, edge.sub.node.SC, step.path) { - thisPath := append(append([]common.Province{}, step.path...), name) + thisPath := append(append([]godip.Province{}, step.path...), name) if name == dst { return thisPath } @@ -128,7 +128,7 @@ func (self *Graph) pathHelper(dst common.Province, queue []pathStep, seen map[[2 return nil } -func (self *Graph) Path(src, dst common.Province, filter common.PathFilter) []common.Province { +func (self *Graph) Path(src, dst godip.Province, filter godip.PathFilter) []godip.Province { queue := []pathStep{ pathStep{ path: nil, @@ -136,10 +136,10 @@ func (self *Graph) Path(src, dst common.Province, filter common.PathFilter) []co dst: src, }, } - return self.pathHelper(dst, queue, map[[2]common.Province]bool{}, filter) + return self.pathHelper(dst, queue, map[[2]godip.Province]bool{}, filter) } -func (self *Graph) Coasts(prov common.Province) (result []common.Province) { +func (self *Graph) Coasts(prov godip.Province) (result []godip.Province) { if node, ok := self.Nodes[prov.Super()]; ok { for _, sub := range node.Subs { result = append(result, sub.getName()) @@ -148,33 +148,33 @@ func (self *Graph) Coasts(prov common.Province) (result []common.Province) { return } -func (self *Graph) Prov(n common.Province) *SubNode { +func (self *Graph) Prov(n godip.Province) *SubNode { p, c := n.Split() if self.Nodes[p] == nil { self.Nodes[p] = &Node{ Name: p, - Subs: make(map[common.Province]*SubNode), + Subs: make(map[godip.Province]*SubNode), graph: self, } } return self.Nodes[p].sub(c) } -func (self *Graph) Nations() (result []common.Nation) { - found := map[common.Nation]bool{} +func (self *Graph) Nations() (result []godip.Nation) { + found := map[godip.Nation]bool{} for _, node := range self.Nodes { if node.SC != nil && *node.SC != c.Neutral { found[*node.SC] = true } } - result = make([]common.Nation, 0, len(found)) + result = make([]godip.Nation, 0, len(found)) for nation := range found { result = append(result, nation) } return } -func (self *Graph) Provinces() (result []common.Province) { +func (self *Graph) Provinces() (result []godip.Province) { for _, node := range self.Nodes { for _, sub := range node.Subs { result = append(result, sub.getName()) @@ -184,9 +184,9 @@ func (self *Graph) Provinces() (result []common.Province) { } type Node struct { - Name common.Province - Subs map[common.Province]*SubNode - SC *common.Nation + Name godip.Province + Subs map[godip.Province]*SubNode + SC *godip.Nation graph *Graph } @@ -208,28 +208,28 @@ func (self *Node) String() string { return string(buf.Bytes()) } -func (self *Node) sub(n common.Province) *SubNode { +func (self *Node) sub(n godip.Province) *SubNode { if self.Subs[n] == nil { self.Subs[n] = &SubNode{ Name: n, - Edges: make(map[common.Province]*edge), + Edges: make(map[godip.Province]*edge), node: self, - Flags: make(map[common.Flag]bool), + Flags: make(map[godip.Flag]bool), } } return self.Subs[n] } type edge struct { - Flags map[common.Flag]bool + Flags map[godip.Flag]bool sub *SubNode } type SubNode struct { - Name common.Province - Edges map[common.Province]*edge - Flags map[common.Flag]bool + Name godip.Province + Edges map[godip.Province]*edge + Flags map[godip.Flag]bool node *Node } @@ -239,7 +239,7 @@ func (self *SubNode) String() string { if self.Name != "" { fmt.Fprintf(buf, "%v ", self.Name) } - flags := make([]common.Flag, 0, len(self.Flags)) + flags := make([]godip.Flag, 0, len(self.Flags)) for flag, _ := range self.Flags { flags = append(flags, flag) } @@ -248,7 +248,7 @@ func (self *SubNode) String() string { } dests := make([]string, 0, len(self.Edges)) for n, edge := range self.Edges { - var flags []common.Flag + var flags []godip.Flag for f, _ := range edge.Flags { flags = append(flags, f) } @@ -262,13 +262,13 @@ func (self *SubNode) String() string { return string(buf.Bytes()) } -func (self *SubNode) getName() common.Province { +func (self *SubNode) getName() godip.Province { return self.node.Name.Join(self.Name) } -func (self *SubNode) Conn(n common.Province, flags ...common.Flag) *SubNode { +func (self *SubNode) Conn(n godip.Province, flags ...godip.Flag) *SubNode { target := self.node.graph.Prov(n) - flagMap := make(map[common.Flag]bool) + flagMap := make(map[godip.Flag]bool) for _, flag := range flags { flagMap[flag] = true } @@ -279,19 +279,19 @@ func (self *SubNode) Conn(n common.Province, flags ...common.Flag) *SubNode { return self } -func (self *SubNode) SC(n common.Nation) *SubNode { +func (self *SubNode) SC(n godip.Nation) *SubNode { self.node.SC = &n return self } -func (self *SubNode) Flag(flags ...common.Flag) *SubNode { +func (self *SubNode) Flag(flags ...godip.Flag) *SubNode { for _, flag := range flags { self.Flags[flag] = true } return self } -func (self *SubNode) Prov(n common.Province) *SubNode { +func (self *SubNode) Prov(n godip.Province) *SubNode { return self.node.graph.Prov(n) } diff --git a/graph/graph_test.go b/graph/graph_test.go index b2498d11..930d1356 100644 --- a/graph/graph_test.go +++ b/graph/graph_test.go @@ -1,12 +1,12 @@ package graph import ( - "github.com/zond/godip/common" + "github.com/zond/godip" "reflect" "testing" ) -func assertPath(t *testing.T, g *Graph, src, dst common.Province, found []common.Province) { +func assertPath(t *testing.T, g *Graph, src, dst godip.Province, found []godip.Province) { if f := g.Path(src, dst, nil); !reflect.DeepEqual(f, found) { t.Errorf("%v should have a path between %v and %v like %v but found %v", g, src, dst, found, f) } @@ -24,7 +24,7 @@ func TestPath(t *testing.T) { Prov("h").Conn("a").Conn("c").Conn("d").Conn("g"). Prov("i").Conn("c"). Done() - assertPath(t, g, "a", "e", []common.Province{"f", "e"}) - assertPath(t, g, "a", "d", []common.Province{"h", "d"}) - assertPath(t, g, "a", "i", []common.Province{"h", "c", "i"}) + assertPath(t, g, "a", "e", []godip.Province{"f", "e"}) + assertPath(t, g, "a", "d", []godip.Province{"h", "d"}) + assertPath(t, g, "a", "i", []godip.Province{"h", "c", "i"}) } diff --git a/orders/build.go b/orders/build.go index 33fe9360..0fdc38cf 100644 --- a/orders/build.go +++ b/orders/build.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - dip "github.com/zond/godip/common" + dip "github.com/zond/godip" cla "github.com/zond/godip/variants/classical/common" ) diff --git a/orders/convoy.go b/orders/convoy.go index 520c900c..297cb82c 100644 --- a/orders/convoy.go +++ b/orders/convoy.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - dip "github.com/zond/godip/common" + dip "github.com/zond/godip" cla "github.com/zond/godip/variants/classical/common" ) diff --git a/orders/disband.go b/orders/disband.go index 7d560c25..17b1be42 100644 --- a/orders/disband.go +++ b/orders/disband.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - dip "github.com/zond/godip/common" + dip "github.com/zond/godip" cla "github.com/zond/godip/variants/classical/common" ) diff --git a/orders/hold.go b/orders/hold.go index f29d7bde..5f7da3e5 100644 --- a/orders/hold.go +++ b/orders/hold.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - dip "github.com/zond/godip/common" + dip "github.com/zond/godip" cla "github.com/zond/godip/variants/classical/common" ) diff --git a/orders/move.go b/orders/move.go index afb10665..012688e8 100644 --- a/orders/move.go +++ b/orders/move.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - dip "github.com/zond/godip/common" + dip "github.com/zond/godip" cla "github.com/zond/godip/variants/classical/common" ) diff --git a/orders/parser.go b/orders/parser.go index f04fd351..3842a90d 100644 --- a/orders/parser.go +++ b/orders/parser.go @@ -3,7 +3,7 @@ package orders import ( "fmt" - dip "github.com/zond/godip/common" + dip "github.com/zond/godip" ) type Parser struct { diff --git a/orders/support.go b/orders/support.go index 0008d8d4..c3e7b253 100644 --- a/orders/support.go +++ b/orders/support.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - dip "github.com/zond/godip/common" + dip "github.com/zond/godip" cla "github.com/zond/godip/variants/classical/common" ) diff --git a/state/judge_test.go b/state/judge_test.go index 63e842f1..9402aa26 100644 --- a/state/judge_test.go +++ b/state/judge_test.go @@ -4,40 +4,40 @@ import ( "testing" "time" - "github.com/zond/godip/common" + "github.com/zond/godip" "github.com/zond/godip/graph" ) type testOrder int -func (self testOrder) Options(v common.Validator, nation common.Nation, src common.Province) (result common.Options) { +func (self testOrder) Options(v godip.Validator, nation godip.Nation, src godip.Province) (result godip.Options) { return nil } -func (self testOrder) DisplayType() common.OrderType { +func (self testOrder) DisplayType() godip.OrderType { return "" } -func (self testOrder) Type() common.OrderType { +func (self testOrder) Type() godip.OrderType { return "" } -func (self testOrder) Flags() map[common.Flag]bool { +func (self testOrder) Flags() map[godip.Flag]bool { return nil } -func (self testOrder) Parse(parts []string) (common.Adjudicator, error) { +func (self testOrder) Parse(parts []string) (godip.Adjudicator, error) { return nil, nil } func (self testOrder) At() time.Time { return time.Now() } -func (self testOrder) Targets() []common.Province { +func (self testOrder) Targets() []godip.Province { return nil } -func (self testOrder) Adjudicate(common.Resolver) error { +func (self testOrder) Adjudicate(godip.Resolver) error { return nil } -func (self testOrder) Validate(common.Validator) (common.Nation, error) { +func (self testOrder) Validate(godip.Validator) (godip.Nation, error) { return "", nil } -func (self testOrder) Execute(common.State) { +func (self testOrder) Execute(godip.State) { } /* @@ -45,7 +45,7 @@ func (self testOrder) Execute(common.State) { A B D */ -func testGraph() common.Graph { +func testGraph() godip.Graph { return graph.New(). Prov("a").Conn("b").Conn("b/sc").Conn("b/nc"). Prov("b").Conn("a").Conn("c").Conn("d"). @@ -57,7 +57,7 @@ func testGraph() common.Graph { Done() } -func assertOrderLocation(t *testing.T, j *State, prov common.Province, order common.Order, ok bool) { +func assertOrderLocation(t *testing.T, j *State, prov godip.Province, order godip.Order, ok bool) { if o, _, k := j.Order(prov); o != order || k != ok { t.Errorf("Wrong order, wanted %v, %v at %v but got %v, %v", order, ok, prov, o, k) } @@ -65,11 +65,11 @@ func assertOrderLocation(t *testing.T, j *State, prov common.Province, order com func TestStateLocations(t *testing.T) { j := New(testGraph(), nil, nil) - j.SetOrders(map[common.Province]common.Adjudicator{ + j.SetOrders(map[godip.Province]godip.Adjudicator{ "a": testOrder(1), "b/ec": testOrder(2), }) - j.SetOrders(map[common.Province]common.Adjudicator{ + j.SetOrders(map[godip.Province]godip.Adjudicator{ "b": testOrder(2), }) assertOrderLocation(t, j, "a", nil, false) diff --git a/state/resolver.go b/state/resolver.go index 3060a4b7..fdeb4303 100644 --- a/state/resolver.go +++ b/state/resolver.go @@ -3,37 +3,37 @@ package state import ( "fmt" - "github.com/zond/godip/common" + "github.com/zond/godip" ) type resolver struct { *State - deps []common.Province - guesses map[common.Province]error - resolving map[common.Province]bool + deps []godip.Province + guesses map[godip.Province]error + resolving map[godip.Province]bool } -func (self *resolver) adjudicate(prov common.Province) (err error) { - common.Logf("Adj(%v)", prov) - common.Indent(" ") +func (self *resolver) adjudicate(prov godip.Province) (err error) { + godip.Logf("Adj(%v)", prov) + godip.Indent(" ") err = self.State.orders[prov].Adjudicate(self) - common.DeIndent() + godip.DeIndent() if err == nil { - common.Logf("%v: Success", prov) + godip.Logf("%v: Success", prov) } else { - common.Logf("%v: Failure: %v", prov, err) + godip.Logf("%v: Failure: %v", prov, err) } return } -func (self *resolver) Resolve(prov common.Province) (err error) { - common.Logf("Res(%v) (deps %v)", prov, self.deps) - common.Indent(" ") +func (self *resolver) Resolve(prov godip.Province) (err error) { + godip.Logf("Res(%v) (deps %v)", prov, self.deps) + godip.Indent(" ") var ok bool if err, ok = self.State.resolutions[prov]; !ok { if err, ok = self.guesses[prov]; !ok { if self.resolving[prov] { - common.Logf("Already resolving %v, making negative guess", prov) + godip.Logf("Already resolving %v, making negative guess", prov) err = fmt.Errorf("Negative guess") self.guesses[prov] = err self.deps = append(self.deps, prov) @@ -43,40 +43,40 @@ func (self *resolver) Resolve(prov common.Province) (err error) { err = self.adjudicate(prov) delete(self.resolving, prov) if _, ok = self.guesses[prov]; ok { - common.Logf("Guess made for %v, changing guess to positive", prov) + godip.Logf("Guess made for %v, changing guess to positive", prov) self.guesses[prov] = nil secondErr := self.adjudicate(prov) delete(self.guesses, prov) if (err == nil) != (secondErr == nil) { - common.Logf("Calling backup rule with %v", self.deps) + godip.Logf("Calling backup rule with %v", self.deps) if err = self.State.backupRule(self, self.deps); err != nil { return } self.deps = nil err = self.Resolve(prov) } else { - common.Logf("Only one consistent result, returning %+v", err) + godip.Logf("Only one consistent result, returning %+v", err) } } else if len(self.guesses) != n_guesses { - common.Logf("Made new guess, adding %v to deps", prov) + godip.Logf("Made new guess, adding %v to deps", prov) self.deps = append(self.deps, prov) } } } else { - common.Logf("Guessed") + godip.Logf("Guessed") } if len(self.guesses) == 0 { - common.Logf("No guessing, resolving %v", prov) + godip.Logf("No guessing, resolving %v", prov) self.State.resolutions[prov] = err } } else { - common.Logf("Resolved") + godip.Logf("Resolved") } - common.DeIndent() + godip.DeIndent() if err == nil { - common.Logf("%v: Success (deps %v)", prov, self.deps) + godip.Logf("%v: Success (deps %v)", prov, self.deps) } else { - common.Logf("%v: Failure: %v (deps %v)", prov, err, self.deps) + godip.Logf("%v: Failure: %v (deps %v)", prov, err, self.deps) } return } diff --git a/state/state.go b/state/state.go index 2c685f3e..13b5a2c2 100644 --- a/state/state.go +++ b/state/state.go @@ -4,30 +4,30 @@ import ( "fmt" "time" - "github.com/zond/godip/common" + "github.com/zond/godip" ) -func New(graph common.Graph, phase common.Phase, backupRule common.BackupRule) *State { +func New(graph godip.Graph, phase godip.Phase, backupRule godip.BackupRule) *State { return &State{ graph: graph, phase: phase, backupRule: backupRule, - orders: make(map[common.Province]common.Adjudicator), - units: make(map[common.Province]common.Unit), - dislodgeds: make(map[common.Province]common.Unit), - supplyCenters: make(map[common.Province]common.Nation), - dislodgers: make(map[common.Province]common.Province), - bounces: make(map[common.Province]map[common.Province]bool), + orders: make(map[godip.Province]godip.Adjudicator), + units: make(map[godip.Province]godip.Unit), + dislodgeds: make(map[godip.Province]godip.Unit), + supplyCenters: make(map[godip.Province]godip.Nation), + dislodgers: make(map[godip.Province]godip.Province), + bounces: make(map[godip.Province]map[godip.Province]bool), profile: make(map[string]time.Duration), profileCounts: make(map[string]int), - memoizedProvSlices: make(map[string][]common.Province), + memoizedProvSlices: make(map[string][]godip.Province), } } type movement struct { - src common.Province - dst common.Province - unit common.Unit + src godip.Province + dst godip.Province + unit godip.Unit preventRetreat bool } @@ -39,7 +39,7 @@ func (self *movement) prepare(s *State) (err error) { } else { s.RemoveUnit(self.src) } - common.Logf("Lifted %v from %v", self.unit, self.src) + godip.Logf("Lifted %v from %v", self.unit, self.src) return } @@ -52,30 +52,30 @@ func (self *movement) execute(s *State) (err error) { if self.preventRetreat { s.SetDislodger(self.src, prov) } - common.Logf("Dislodged %v from %v", dislodged, self.dst) + godip.Logf("Dislodged %v from %v", dislodged, self.dst) } if err = s.SetUnit(self.dst, self.unit); err != nil { return } - common.Logf("Dropped %v in %v", self.unit, self.dst) + godip.Logf("Dropped %v in %v", self.unit, self.dst) return } type State struct { - orders map[common.Province]common.Adjudicator - units map[common.Province]common.Unit - dislodgeds map[common.Province]common.Unit - supplyCenters map[common.Province]common.Nation - graph common.Graph - phase common.Phase - backupRule common.BackupRule - resolutions map[common.Province]error - dislodgers map[common.Province]common.Province + orders map[godip.Province]godip.Adjudicator + units map[godip.Province]godip.Unit + dislodgeds map[godip.Province]godip.Unit + supplyCenters map[godip.Province]godip.Nation + graph godip.Graph + phase godip.Phase + backupRule godip.BackupRule + resolutions map[godip.Province]error + dislodgers map[godip.Province]godip.Province movements []*movement - bounces map[common.Province]map[common.Province]bool + bounces map[godip.Province]map[godip.Province]bool profile map[string]time.Duration profileCounts map[string]int - memoizedProvSlices map[string][]common.Province + memoizedProvSlices map[string][]godip.Province } func (self *State) Profile(a string, t time.Time) { @@ -83,7 +83,7 @@ func (self *State) Profile(a string, t time.Time) { self.profileCounts[a] += 1 } -func (self *State) MemoizeProvSlice(key string, f func() []common.Province) []common.Province { +func (self *State) MemoizeProvSlice(key string, f func() []godip.Province) []godip.Province { old, found := self.memoizedProvSlices[key] if found { return old @@ -100,18 +100,18 @@ func (self *State) GetProfile() (map[string]time.Duration, map[string]int) { func (self *State) resolver() *resolver { return &resolver{ State: self, - guesses: make(map[common.Province]error), - resolving: make(map[common.Province]bool), + guesses: make(map[godip.Province]error), + resolving: make(map[godip.Province]bool), } } -func (self *State) Graph() common.Graph { +func (self *State) Graph() godip.Graph { return self.graph } -func (self *State) Options(orders []common.Order, nation common.Nation) (result common.Options) { +func (self *State) Options(orders []godip.Order, nation godip.Nation) (result godip.Options) { defer self.Profile("Options", time.Now()) - result = common.Options{} + result = godip.Options{} for _, prov := range self.graph.Provinces() { for _, order := range orders { before := time.Now() @@ -120,7 +120,7 @@ func (self *State) Options(orders []common.Order, nation common.Nation) (result if len(opts) > 0 { provOpts, found := result[prov] if !found { - provOpts = common.Options{} + provOpts = godip.Options{} result[prov] = provOpts } provOpts[order.DisplayType()] = opts @@ -130,11 +130,11 @@ func (self *State) Options(orders []common.Order, nation common.Nation) (result return } -func (self *State) Find(filter common.StateFilter) (provinces []common.Province, orders []common.Order, units []*common.Unit) { - visitedProvinces := make(map[common.Province]bool) +func (self *State) Find(filter godip.StateFilter) (provinces []godip.Province, orders []godip.Order, units []*godip.Unit) { + visitedProvinces := make(map[godip.Province]bool) for prov, unit := range self.units { visitedProvinces[prov] = true - var order common.Order + var order godip.Order var ok bool if order, _, ok = self.Order(prov); !ok { order = nil @@ -162,12 +162,12 @@ func (self *State) Next() (err error) { /* Sanitize orders. */ - self.resolutions = make(map[common.Province]error) + self.resolutions = make(map[godip.Province]error) for prov, order := range self.orders { if _, err := order.Validate(self); err != nil { self.resolutions[prov] = err delete(self.orders, prov) - common.Logf("Deleted %v due to %v", prov, err) + godip.Logf("Deleted %v due to %v", prov, err) } } @@ -201,7 +201,7 @@ func (self *State) Next() (err error) { order.Execute(self.resolver()) } } - self.orders = make(map[common.Province]common.Adjudicator) + self.orders = make(map[godip.Province]godip.Adjudicator) /* Execute movements. @@ -223,30 +223,30 @@ func (self *State) Next() (err error) { } self.phase = self.phase.Next() - self.memoizedProvSlices = map[string][]common.Province{} + self.memoizedProvSlices = map[string][]godip.Province{} return } -func (self *State) Phase() common.Phase { +func (self *State) Phase() godip.Phase { return self.phase } // Bulk setters -func (self *State) SetOrders(orders map[common.Province]common.Adjudicator) *State { - self.memoizedProvSlices = map[string][]common.Province{} +func (self *State) SetOrders(orders map[godip.Province]godip.Adjudicator) *State { + self.memoizedProvSlices = map[string][]godip.Province{} - self.orders = make(map[common.Province]common.Adjudicator) + self.orders = make(map[godip.Province]godip.Adjudicator) for prov, order := range orders { self.SetOrder(prov, order) } return self } -func (self *State) SetUnits(units map[common.Province]common.Unit) (err error) { - self.memoizedProvSlices = map[string][]common.Province{} +func (self *State) SetUnits(units map[godip.Province]godip.Unit) (err error) { + self.memoizedProvSlices = map[string][]godip.Province{} - self.units = make(map[common.Province]common.Unit) + self.units = make(map[godip.Province]godip.Unit) for prov, unit := range units { if err = self.SetUnit(prov, unit); err != nil { return @@ -255,10 +255,10 @@ func (self *State) SetUnits(units map[common.Province]common.Unit) (err error) { return } -func (self *State) SetDislodgeds(dislodgeds map[common.Province]common.Unit) (err error) { - self.memoizedProvSlices = map[string][]common.Province{} +func (self *State) SetDislodgeds(dislodgeds map[godip.Province]godip.Unit) (err error) { + self.memoizedProvSlices = map[string][]godip.Province{} - self.dislodgeds = make(map[common.Province]common.Unit) + self.dislodgeds = make(map[godip.Province]godip.Unit) for prov, unit := range dislodgeds { if err = self.SetDislodged(prov, unit); err != nil { return @@ -267,28 +267,28 @@ func (self *State) SetDislodgeds(dislodgeds map[common.Province]common.Unit) (er return } -func (self *State) SetSupplyCenters(supplyCenters map[common.Province]common.Nation) *State { - self.memoizedProvSlices = map[string][]common.Province{} +func (self *State) SetSupplyCenters(supplyCenters map[godip.Province]godip.Nation) *State { + self.memoizedProvSlices = map[string][]godip.Province{} self.supplyCenters = supplyCenters return self } func (self *State) ClearBounces() { - self.bounces = make(map[common.Province]map[common.Province]bool) + self.bounces = make(map[godip.Province]map[godip.Province]bool) } func (self *State) ClearDislodgers() { - self.dislodgers = make(map[common.Province]common.Province) + self.dislodgers = make(map[godip.Province]godip.Province) } func (self *State) Load( - units map[common.Province]common.Unit, - supplyCenters map[common.Province]common.Nation, - dislodgeds map[common.Province]common.Unit, - dislodgers map[common.Province]common.Province, - bounces map[common.Province]map[common.Province]bool, - orders map[common.Province]common.Adjudicator) *State { + units map[godip.Province]godip.Unit, + supplyCenters map[godip.Province]godip.Nation, + dislodgeds map[godip.Province]godip.Unit, + dislodgers map[godip.Province]godip.Province, + bounces map[godip.Province]map[godip.Province]bool, + orders map[godip.Province]godip.Adjudicator) *State { self.units, self.supplyCenters, self.dislodgeds, self.dislodgers, self.bounces, self.orders = units, supplyCenters, dislodgeds, dislodgers, bounces, orders @@ -298,36 +298,36 @@ func (self *State) Load( // Singular setters -func (self *State) SetDislodger(attacker, victim common.Province) { - self.memoizedProvSlices = map[string][]common.Province{} +func (self *State) SetDislodger(attacker, victim godip.Province) { + self.memoizedProvSlices = map[string][]godip.Province{} self.dislodgers[attacker.Super()] = victim.Super() } -func (self *State) AddBounce(src, dst common.Province) { +func (self *State) AddBounce(src, dst godip.Province) { if existing, ok := self.bounces[dst.Super()]; ok { existing[src.Super()] = true } else { - self.bounces[dst.Super()] = map[common.Province]bool{ + self.bounces[dst.Super()] = map[godip.Province]bool{ src.Super(): true, } } } -func (self *State) SetResolution(p common.Province, err error) { - self.memoizedProvSlices = map[string][]common.Province{} +func (self *State) SetResolution(p godip.Province, err error) { + self.memoizedProvSlices = map[string][]godip.Province{} self.resolutions[p] = err } -func (self *State) SetSC(p common.Province, n common.Nation) { - self.memoizedProvSlices = map[string][]common.Province{} +func (self *State) SetSC(p godip.Province, n godip.Nation) { + self.memoizedProvSlices = map[string][]godip.Province{} self.supplyCenters[p] = n } -func (self *State) SetDislodged(prov common.Province, unit common.Unit) (err error) { - self.memoizedProvSlices = map[string][]common.Province{} +func (self *State) SetDislodged(prov godip.Province, unit godip.Unit) (err error) { + self.memoizedProvSlices = map[string][]godip.Province{} if found, _, ok := self.Dislodged(prov); ok { err = fmt.Errorf("%v is already at %v", found, prov) @@ -337,8 +337,8 @@ func (self *State) SetDislodged(prov common.Province, unit common.Unit) (err err return } -func (self *State) SetUnit(prov common.Province, unit common.Unit) (err error) { - self.memoizedProvSlices = map[string][]common.Province{} +func (self *State) SetUnit(prov godip.Province, unit godip.Unit) (err error) { + self.memoizedProvSlices = map[string][]godip.Province{} if found, _, ok := self.Unit(prov); ok { err = fmt.Errorf("%v is already at %v", found, prov) @@ -348,8 +348,8 @@ func (self *State) SetUnit(prov common.Province, unit common.Unit) (err error) { return } -func (self *State) SetOrder(prov common.Province, order common.Adjudicator) (err error) { - self.memoizedProvSlices = map[string][]common.Province{} +func (self *State) SetOrder(prov godip.Province, order godip.Adjudicator) (err error) { + self.memoizedProvSlices = map[string][]godip.Province{} if found, _, ok := self.Order(prov); ok { err = fmt.Errorf("%v is already at %v", found, prov) @@ -359,13 +359,13 @@ func (self *State) SetOrder(prov common.Province, order common.Adjudicator) (err return } -func (self *State) RemoveUnit(prov common.Province) { +func (self *State) RemoveUnit(prov godip.Province) { if _, p, ok := self.Unit(prov); ok { delete(self.units, p) } } -func (self *State) RemoveDislodged(prov common.Province) { +func (self *State) RemoveDislodged(prov godip.Province) { if _, p, ok := self.Dislodged(prov); ok { delete(self.dislodgeds, p) } @@ -373,33 +373,33 @@ func (self *State) RemoveDislodged(prov common.Province) { // Bulk getters -func (self *State) Resolutions() map[common.Province]error { +func (self *State) Resolutions() map[godip.Province]error { return self.resolutions } -func (self *State) SupplyCenters() map[common.Province]common.Nation { +func (self *State) SupplyCenters() map[godip.Province]godip.Nation { return self.supplyCenters } -func (self *State) Units() map[common.Province]common.Unit { +func (self *State) Units() map[godip.Province]godip.Unit { return self.units } -func (self *State) Dislodgeds() map[common.Province]common.Unit { +func (self *State) Dislodgeds() map[godip.Province]godip.Unit { return self.dislodgeds } -func (self *State) Orders() map[common.Province]common.Adjudicator { +func (self *State) Orders() map[godip.Province]godip.Adjudicator { return self.orders } func (self *State) Dump() ( - units map[common.Province]common.Unit, - supplyCenters map[common.Province]common.Nation, - dislodgeds map[common.Province]common.Unit, - dislodgers map[common.Province]common.Province, - bounces map[common.Province]map[common.Province]bool, - resolutions map[common.Province]error) { + units map[godip.Province]godip.Unit, + supplyCenters map[godip.Province]godip.Nation, + dislodgeds map[godip.Province]godip.Unit, + dislodgers map[godip.Province]godip.Province, + bounces map[godip.Province]map[godip.Province]bool, + resolutions map[godip.Province]error) { return self.units, self.supplyCenters, @@ -411,7 +411,7 @@ func (self *State) Dump() ( // Singular getters, will search all coasts of a province -func (self *State) Bounce(src, dst common.Province) bool { +func (self *State) Bounce(src, dst godip.Province) bool { if sources, ok := self.bounces[dst.Super()]; ok { if dislodger, ok := self.dislodgers[dst.Super()]; ok { if len(sources) == 1 && sources[dislodger.Super()] { @@ -426,7 +426,7 @@ func (self *State) Bounce(src, dst common.Province) bool { return false } -func (self *State) Dislodged(prov common.Province) (u common.Unit, p common.Province, ok bool) { +func (self *State) Dislodged(prov godip.Province) (u godip.Unit, p godip.Province, ok bool) { if u, ok = self.dislodgeds[prov]; ok { p = prov return @@ -445,7 +445,7 @@ func (self *State) Dislodged(prov common.Province) (u common.Unit, p common.Prov return } -func (self *State) Unit(prov common.Province) (u common.Unit, p common.Province, ok bool) { +func (self *State) Unit(prov godip.Province) (u godip.Unit, p godip.Province, ok bool) { if u, ok = self.units[prov]; ok { p = prov return @@ -464,7 +464,7 @@ func (self *State) Unit(prov common.Province) (u common.Unit, p common.Province, return } -func (self *State) SupplyCenter(prov common.Province) (n common.Nation, p common.Province, ok bool) { +func (self *State) SupplyCenter(prov godip.Province) (n godip.Nation, p godip.Province, ok bool) { if n, ok = self.supplyCenters[prov]; ok { p = prov return @@ -483,7 +483,7 @@ func (self *State) SupplyCenter(prov common.Province) (n common.Nation, p common return } -func (self *State) Order(prov common.Province) (o common.Order, p common.Province, ok bool) { +func (self *State) Order(prov godip.Province) (o godip.Order, p godip.Province, ok bool) { if o, ok = self.orders[prov]; ok { p = prov return @@ -504,7 +504,7 @@ func (self *State) Order(prov common.Province) (o common.Order, p common.Provinc // Mutators -func (self *State) Move(src, dst common.Province, preventRetreat bool) { +func (self *State) Move(src, dst godip.Province, preventRetreat bool) { self.movements = append(self.movements, &movement{ src: src, dst: dst, @@ -512,7 +512,7 @@ func (self *State) Move(src, dst common.Province, preventRetreat bool) { }) } -func (self *State) Retreat(src, dst common.Province) (err error) { +func (self *State) Retreat(src, dst godip.Province) (err error) { if unit, prov, ok := self.Dislodged(src); !ok { err = fmt.Errorf("No dislodged at %v?", src) return @@ -521,7 +521,7 @@ func (self *State) Retreat(src, dst common.Province) (err error) { if err = self.SetUnit(dst, unit); err != nil { return } - common.Logf("Moving dislodged %v from %v to %v", unit, src, dst) + godip.Logf("Moving dislodged %v from %v to %v", unit, src, dst) } return } diff --git a/variants/ancientmediterranean/ancientmediterranean.go b/variants/ancientmediterranean/ancientmediterranean.go index 9df250a6..ac8fc708 100644 --- a/variants/ancientmediterranean/ancientmediterranean.go +++ b/variants/ancientmediterranean/ancientmediterranean.go @@ -7,7 +7,7 @@ import ( "github.com/zond/godip/variants/classical/orders" "github.com/zond/godip/variants/common" - dip "github.com/zond/godip/common" + dip "github.com/zond/godip" cla "github.com/zond/godip/variants/classical/common" ) diff --git a/variants/ancientmediterranean/ancientmediterranean_test.go b/variants/ancientmediterranean/ancientmediterranean_test.go index 723d7638..a47b0482 100644 --- a/variants/ancientmediterranean/ancientmediterranean_test.go +++ b/variants/ancientmediterranean/ancientmediterranean_test.go @@ -7,7 +7,7 @@ import ( "github.com/zond/godip/state" "github.com/zond/godip/orders" - dip "github.com/zond/godip/common" + dip "github.com/zond/godip" cla "github.com/zond/godip/variants/classical/common" tst "github.com/zond/godip/variants/testing" ) diff --git a/variants/ancientmediterranean/games_test.go b/variants/ancientmediterranean/games_test.go index 70fb41a8..8ce7c5cd 100644 --- a/variants/ancientmediterranean/games_test.go +++ b/variants/ancientmediterranean/games_test.go @@ -3,7 +3,7 @@ package ancientmediterranean import ( "testing" - dip "github.com/zond/godip/common" + dip "github.com/zond/godip" tst "github.com/zond/godip/variants/testing" ) diff --git a/variants/classical/classical.go b/variants/classical/classical.go index fa0ae46b..0746006d 100644 --- a/variants/classical/classical.go +++ b/variants/classical/classical.go @@ -7,7 +7,7 @@ import ( "github.com/zond/godip/variants/classical/start" "github.com/zond/godip/variants/common" - dip "github.com/zond/godip/common" + dip "github.com/zond/godip" cla "github.com/zond/godip/variants/classical/common" ord "github.com/zond/godip/variants/classical/orders" ) diff --git a/variants/classical/classical_test.go b/variants/classical/classical_test.go index 3ffcafc0..93b105aa 100644 --- a/variants/classical/classical_test.go +++ b/variants/classical/classical_test.go @@ -10,7 +10,7 @@ import ( "github.com/zond/godip/state" "github.com/zond/godip/variants/classical/start" - dip "github.com/zond/godip/common" + dip "github.com/zond/godip" cla "github.com/zond/godip/variants/classical/common" ord "github.com/zond/godip/variants/classical/orders" tst "github.com/zond/godip/variants/testing" diff --git a/variants/classical/common/common.go b/variants/classical/common/common.go index 3e2b2a7d..8df0f25d 100644 --- a/variants/classical/common/common.go +++ b/variants/classical/common/common.go @@ -5,7 +5,7 @@ import ( "sort" "time" - . "github.com/zond/godip/common" + . "github.com/zond/godip" ) const ( diff --git a/variants/classical/datc.go b/variants/classical/datc.go index 0e6ca5cc..4996ffdb 100644 --- a/variants/classical/datc.go +++ b/variants/classical/datc.go @@ -9,7 +9,7 @@ import ( cla "github.com/zond/godip/variants/classical/common" "github.com/zond/godip/orders" "github.com/zond/godip/variants/classical/start" - dip "github.com/zond/godip/common" + dip "github.com/zond/godip" ) func init() { diff --git a/variants/classical/droidippy/droidippy_test.go b/variants/classical/droidippy/droidippy_test.go index 8bcad703..b8063029 100644 --- a/variants/classical/droidippy/droidippy_test.go +++ b/variants/classical/droidippy/droidippy_test.go @@ -5,7 +5,7 @@ import ( "github.com/zond/godip/variants/classical" - dip "github.com/zond/godip/common" + dip "github.com/zond/godip" tst "github.com/zond/godip/variants/testing" ) diff --git a/variants/classical/orders/orders.go b/variants/classical/orders/orders.go index b19d6419..11435aa0 100644 --- a/variants/classical/orders/orders.go +++ b/variants/classical/orders/orders.go @@ -3,7 +3,7 @@ package orders import ( "github.com/zond/godip/orders" - dip "github.com/zond/godip/common" + dip "github.com/zond/godip" ) var ClassicalParser = orders.NewParser([]dip.Order{ diff --git a/variants/classical/phase.go b/variants/classical/phase.go index a9c63538..cfb295c9 100644 --- a/variants/classical/phase.go +++ b/variants/classical/phase.go @@ -8,7 +8,7 @@ import ( "github.com/zond/godip/orders" - dip "github.com/zond/godip/common" + dip "github.com/zond/godip" cla "github.com/zond/godip/variants/classical/common" ord "github.com/zond/godip/variants/classical/orders" ) diff --git a/variants/classical/start/map.go b/variants/classical/start/map.go index 16a92b7e..c2712eb4 100644 --- a/variants/classical/start/map.go +++ b/variants/classical/start/map.go @@ -2,7 +2,7 @@ package start import ( c "github.com/zond/godip/variants/classical/common" - dip "github.com/zond/godip/common" + dip "github.com/zond/godip" "github.com/zond/godip/graph" ) diff --git a/variants/classical/start/supply_centers.go b/variants/classical/start/supply_centers.go index 860b1ab7..bc17e6ad 100644 --- a/variants/classical/start/supply_centers.go +++ b/variants/classical/start/supply_centers.go @@ -1,12 +1,12 @@ package start import ( + "github.com/zond/godip" . "github.com/zond/godip/variants/classical/common" - "github.com/zond/godip/common" ) -func SupplyCenters() map[common.Province]common.Nation { - return map[common.Province]common.Nation{ +func SupplyCenters() map[godip.Province]godip.Nation { + return map[godip.Province]godip.Nation{ "edi": England, "lvp": England, "lon": England, diff --git a/variants/classical/start/units.go b/variants/classical/start/units.go index 4787579b..9bb872b2 100644 --- a/variants/classical/start/units.go +++ b/variants/classical/start/units.go @@ -1,33 +1,33 @@ package start import ( - . "github.com/zond/godip/variants/classical/common" - "github.com/zond/godip/common" + "github.com/zond/godip" + . "github.com/zond/godip/variants/classical/common" ) -func Units() map[common.Province]common.Unit { - return map[common.Province]common.Unit{ - "edi": common.Unit{Fleet, England}, - "lvp": common.Unit{Army, England}, - "lon": common.Unit{Fleet, England}, - "bre": common.Unit{Fleet, France}, - "par": common.Unit{Army, France}, - "mar": common.Unit{Army, France}, - "kie": common.Unit{Fleet, Germany}, - "ber": common.Unit{Army, Germany}, - "mun": common.Unit{Army, Germany}, - "ven": common.Unit{Army, Italy}, - "rom": common.Unit{Army, Italy}, - "nap": common.Unit{Fleet, Italy}, - "tri": common.Unit{Fleet, Austria}, - "vie": common.Unit{Army, Austria}, - "bud": common.Unit{Army, Austria}, - "stp/sc": common.Unit{Fleet, Russia}, - "mos": common.Unit{Army, Russia}, - "war": common.Unit{Army, Russia}, - "sev": common.Unit{Fleet, Russia}, - "con": common.Unit{Army, Turkey}, - "smy": common.Unit{Army, Turkey}, - "ank": common.Unit{Fleet, Turkey}, - } +func Units() map[godip.Province]godip.Unit { + return map[godip.Province]godip.Unit{ + "edi": godip.Unit{Fleet, England}, + "lvp": godip.Unit{Army, England}, + "lon": godip.Unit{Fleet, England}, + "bre": godip.Unit{Fleet, France}, + "par": godip.Unit{Army, France}, + "mar": godip.Unit{Army, France}, + "kie": godip.Unit{Fleet, Germany}, + "ber": godip.Unit{Army, Germany}, + "mun": godip.Unit{Army, Germany}, + "ven": godip.Unit{Army, Italy}, + "rom": godip.Unit{Army, Italy}, + "nap": godip.Unit{Fleet, Italy}, + "tri": godip.Unit{Fleet, Austria}, + "vie": godip.Unit{Army, Austria}, + "bud": godip.Unit{Army, Austria}, + "stp/sc": godip.Unit{Fleet, Russia}, + "mos": godip.Unit{Army, Russia}, + "war": godip.Unit{Army, Russia}, + "sev": godip.Unit{Fleet, Russia}, + "con": godip.Unit{Army, Turkey}, + "smy": godip.Unit{Army, Turkey}, + "ank": godip.Unit{Fleet, Turkey}, + } } diff --git a/variants/coldwar/coldwar.go b/variants/coldwar/coldwar.go index a63d6407..606255f1 100644 --- a/variants/coldwar/coldwar.go +++ b/variants/coldwar/coldwar.go @@ -7,7 +7,7 @@ import ( "github.com/zond/godip/variants/classical/orders" "github.com/zond/godip/variants/common" - dip "github.com/zond/godip/common" + dip "github.com/zond/godip" cla "github.com/zond/godip/variants/classical/common" ) diff --git a/variants/coldwar/coldwar_test.go b/variants/coldwar/coldwar_test.go index 5d8126aa..abcec02f 100644 --- a/variants/coldwar/coldwar_test.go +++ b/variants/coldwar/coldwar_test.go @@ -7,7 +7,7 @@ import ( "github.com/zond/godip/variants/classical" "github.com/zond/godip/orders" - dip "github.com/zond/godip/common" + dip "github.com/zond/godip" cla "github.com/zond/godip/variants/classical/common" tst "github.com/zond/godip/variants/testing" ) diff --git a/variants/coldwar/games_test.go b/variants/coldwar/games_test.go index 7bde06bd..dee5dcdf 100644 --- a/variants/coldwar/games_test.go +++ b/variants/coldwar/games_test.go @@ -3,7 +3,7 @@ package coldwar import ( "testing" - dip "github.com/zond/godip/common" + dip "github.com/zond/godip" tst "github.com/zond/godip/variants/testing" ) diff --git a/variants/common/common.go b/variants/common/common.go index 22febdec..32d3abbe 100644 --- a/variants/common/common.go +++ b/variants/common/common.go @@ -4,7 +4,7 @@ import ( "github.com/zond/godip/orders" "github.com/zond/godip/state" - dip "github.com/zond/godip/common" + dip "github.com/zond/godip" ) // Variant defines a dippy variant supported by godip. diff --git a/variants/common/common_test.go b/variants/common/common_test.go index ba2af63f..504c7842 100644 --- a/variants/common/common_test.go +++ b/variants/common/common_test.go @@ -5,7 +5,7 @@ import ( "github.com/zond/godip/state" - dip "github.com/zond/godip/common" + dip "github.com/zond/godip" ) const ( diff --git a/variants/fleetrome/fleetrome.go b/variants/fleetrome/fleetrome.go index a0697357..d4d30bd0 100644 --- a/variants/fleetrome/fleetrome.go +++ b/variants/fleetrome/fleetrome.go @@ -7,7 +7,7 @@ import ( "github.com/zond/godip/variants/classical/start" "github.com/zond/godip/variants/common" - dip "github.com/zond/godip/common" + dip "github.com/zond/godip" cla "github.com/zond/godip/variants/classical/common" ) diff --git a/variants/franceaustria/franceaustria.go b/variants/franceaustria/franceaustria.go index d98294d0..4cf2740e 100644 --- a/variants/franceaustria/franceaustria.go +++ b/variants/franceaustria/franceaustria.go @@ -7,7 +7,7 @@ import ( "github.com/zond/godip/variants/classical/start" "github.com/zond/godip/variants/common" - dip "github.com/zond/godip/common" + dip "github.com/zond/godip" cla "github.com/zond/godip/variants/classical/common" ) diff --git a/variants/generator/generate.py b/variants/generator/generate.py index bc7d8f85..89953dea 100755 --- a/variants/generator/generate.py +++ b/variants/generator/generate.py @@ -789,7 +789,7 @@ def createGraphFile(fileName, provinces): "github.com/zond/godip/variants/classical/orders" "github.com/zond/godip/variants/common" - dip "github.com/zond/godip/common" + dip "github.com/zond/godip" cla "github.com/zond/godip/variants/classical/common" ) diff --git a/variants/hundred/games_test.go b/variants/hundred/games_test.go index f0390fe6..cae2b421 100644 --- a/variants/hundred/games_test.go +++ b/variants/hundred/games_test.go @@ -3,7 +3,7 @@ package hundred import ( "testing" - dip "github.com/zond/godip/common" + dip "github.com/zond/godip" tst "github.com/zond/godip/variants/testing" ) diff --git a/variants/hundred/hundred.go b/variants/hundred/hundred.go index ad421c60..51abebce 100644 --- a/variants/hundred/hundred.go +++ b/variants/hundred/hundred.go @@ -7,7 +7,7 @@ import ( "github.com/zond/godip/orders" "github.com/zond/godip/variants/common" - dip "github.com/zond/godip/common" + dip "github.com/zond/godip" ord "github.com/zond/godip/orders" cla "github.com/zond/godip/variants/classical/common" ) diff --git a/variants/hundred/hundred_test.go b/variants/hundred/hundred_test.go index 6935204a..6fb8c1b2 100644 --- a/variants/hundred/hundred_test.go +++ b/variants/hundred/hundred_test.go @@ -8,7 +8,7 @@ import ( "github.com/zond/godip/variants/classical" "github.com/zond/godip/orders" - dip "github.com/zond/godip/common" + dip "github.com/zond/godip" cla "github.com/zond/godip/variants/classical/common" tst "github.com/zond/godip/variants/testing" ) diff --git a/variants/hundred/hundredphase.go b/variants/hundred/hundredphase.go index bc9e6f7f..7c582914 100644 --- a/variants/hundred/hundredphase.go +++ b/variants/hundred/hundredphase.go @@ -8,7 +8,7 @@ import ( "github.com/zond/godip/variants/classical" "github.com/zond/godip/orders" - dip "github.com/zond/godip/common" + dip "github.com/zond/godip" cla "github.com/zond/godip/variants/classical/common" ) diff --git a/variants/pure/pure.go b/variants/pure/pure.go index 81490202..dabd7970 100644 --- a/variants/pure/pure.go +++ b/variants/pure/pure.go @@ -7,7 +7,7 @@ import ( "github.com/zond/godip/orders" "github.com/zond/godip/variants/common" - dip "github.com/zond/godip/common" + dip "github.com/zond/godip" ord "github.com/zond/godip/orders" cla "github.com/zond/godip/variants/classical/common" ) diff --git a/variants/testing/games_testing.go b/variants/testing/games_testing.go index ec9c1821..320864d0 100644 --- a/variants/testing/games_testing.go +++ b/variants/testing/games_testing.go @@ -16,7 +16,7 @@ import ( "github.com/zond/godip/orders" "github.com/zond/godip/variants/common" - dip "github.com/zond/godip/common" + dip "github.com/zond/godip" cla "github.com/zond/godip/variants/classical/common" ) diff --git a/variants/testing/testing.go b/variants/testing/testing.go index 9f4c59aa..da7e9f70 100644 --- a/variants/testing/testing.go +++ b/variants/testing/testing.go @@ -10,7 +10,7 @@ import ( "github.com/zond/godip/state" "github.com/zond/godip/orders" - dip "github.com/zond/godip/common" + dip "github.com/zond/godip" cla "github.com/zond/godip/variants/classical/common" ) diff --git a/variants/variants_test.go b/variants/variants_test.go index 852c1f1e..dd7621d2 100644 --- a/variants/variants_test.go +++ b/variants/variants_test.go @@ -13,7 +13,7 @@ import ( "strings" "testing" - dip "github.com/zond/godip/common" + dip "github.com/zond/godip" cla "github.com/zond/godip/variants/classical/common" vrt "github.com/zond/godip/variants/common" ) diff --git a/variants/youngstownredux/games_test.go b/variants/youngstownredux/games_test.go index af121a13..6246c2b9 100644 --- a/variants/youngstownredux/games_test.go +++ b/variants/youngstownredux/games_test.go @@ -3,7 +3,7 @@ package youngstownredux import ( "testing" - dip "github.com/zond/godip/common" + dip "github.com/zond/godip" tst "github.com/zond/godip/variants/testing" ) diff --git a/variants/youngstownredux/youngstownredux.go b/variants/youngstownredux/youngstownredux.go index 09945679..5cd4218c 100644 --- a/variants/youngstownredux/youngstownredux.go +++ b/variants/youngstownredux/youngstownredux.go @@ -7,7 +7,7 @@ import ( "github.com/zond/godip/variants/classical/orders" "github.com/zond/godip/variants/common" - dip "github.com/zond/godip/common" + dip "github.com/zond/godip" cla "github.com/zond/godip/variants/classical/common" ) diff --git a/variants/youngstownredux/youngstownredux_test.go b/variants/youngstownredux/youngstownredux_test.go index ed777aab..79141d56 100644 --- a/variants/youngstownredux/youngstownredux_test.go +++ b/variants/youngstownredux/youngstownredux_test.go @@ -7,7 +7,7 @@ import ( "github.com/zond/godip/variants/classical" "github.com/zond/godip/orders" - dip "github.com/zond/godip/common" + dip "github.com/zond/godip" cla "github.com/zond/godip/variants/classical/common" tst "github.com/zond/godip/variants/testing" )