From: Stefan F. <ste...@we...> - 2013-08-29 10:56:14
|
<html> <head> </head> <body>You coded against Rail 1.x, this part of the code is upgraded in Rails 2.0 branches.<br> Especially the connectivity functions are improved. If you check out Rails 2.0 you will realize that it supports full verification of tile lays. <br> So I suggest that you code that functionally in 2.0 otherwise it will most likely duplicate efforts and will not be mergeable. <br> <br><br><div class="gmail_quote">Michael Alexander <out...@gm...> wrote:<blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;"> <div> So what I found was that the NetworkIterator stopped at nodes that were sinks. If I want to be able to build a graph that just tells me that I'm connected and ignores tokens in the way, I think I need to add a setting to NetworkIterator to tell it if it should ignore sinks. As this is a complicated area of the code, and it's not limited to the 1880 specific areas, I'd appreciate some feedback on my proposed changes:<br/> <br/> diff --git a/rails/algorithms/NetworkCompanyGraph.java b/rails/algorithms/NetworkCompanyGraph.java<br/> index bd93113..0e5b2c8 100644<br/> --- a/rails/algorithms/NetworkCompanyGraph.java<br/> +++ b/rails/algorithms/NetworkCompanyGraph.java<br/> @@ -64,7 +64,8 @@<br/> return phase2Graph;<br/> }<br/> <br/> - public SimpleGraph<NetworkVertex, NetworkEdge> createRouteGraph(boolean addHQ) {<br/> + <br/> + private SimpleGraph<NetworkVertex, NetworkEdge> createGraph(boolean addHQ, boolean ignoreSinks) {<br/> // get mapgraph from builder<br/> SimpleGraph<NetworkVertex, NetworkEdge> mapGraph = graphBuilder.getMapGraph();<br/> <br/> @@ -88,7 +89,7 @@<br/> // add connection to graph<br/> graph.addVertex(vertex);<br/> graph.addEdge(vertex, hqVertex, new NetworkEdge(vertex, hqVertex, false));<br/> - NetworkIterator iterator = new NetworkIterator(mapGraph, vertex, company);<br/> + NetworkIterator iterator = new NetworkIterator(mapGraph, vertex, company, ignoreSinks);<br/> for (;iterator.hasNext();)<br/> vertexes.add(iterator.next());<br/> // restore sink property<br/> @@ -112,6 +113,14 @@<br/> return graph;<br/> }<br/> <br/> + public SimpleGraph<NetworkVertex, NetworkEdge> createRouteGraph(boolean addHQ) {<br/> + return createGraph(addHQ, false);<br/> + }<br/> +<br/> + public SimpleGraph<NetworkVertex, NetworkEdge> createConnectionGraph(boolean addHQ) {<br/> + return createGraph(addHQ, true);<br/> + }<br/> + <br/> public List<NetworkVertex> getCompanyBaseTokenVertexes(PublicCompanyI company) {<br/> List<NetworkVertex> vertexes = new ArrayList<NetworkVertex>();<br/> for (TokenI token:company.getTokens()){<br/> diff --git a/rails/algorithms/NetworkIterator.java b/rails/algorithms/NetworkIterator.java<br/> index f4029e8..1adc0a6 100644<br/> --- a/rails/algorithms/NetworkIterator.java<br/> +++ b/rails/algorithms/NetworkIterator.java<br/> @@ -26,6 +26,7 @@<br/> private NetworkVertex startVertex;<br/> private boolean startVertexVisited;<br/> private boolean routeIterator;<br/> + private boolean ignoreSinks;<br/> <br/> // internal data<br/> private List<NetworkVertex> stack = new ArrayList<NetworkVertex>();<br/> @@ -41,14 +42,14 @@<br/> <br/> public NetworkIterator(Graph<NetworkVertex, NetworkEdge> graph,<br/> NetworkVertex startVertex) {<br/> - this(graph, startVertex, null);<br/> + this(graph, startVertex, null, false);<br/> }<br/> <br/> /**<br/> * Returns NetworkIterator for specific company<br/> */<br/> public NetworkIterator(Graph<NetworkVertex, NetworkEdge> graph, NetworkVertex startVertex,<br/> - PublicCompanyI company) {<br/> + PublicCompanyI company, boolean ignoreSinks) {<br/> super();<br/> <br/> if (graph == null)<br/> @@ -61,6 +62,7 @@<br/> this.startVertex = startVertex;<br/> this.startVertexVisited = false;<br/> this.routeIterator = false;<br/> + this.ignoreSinks = ignoreSinks;<br/> }<br/> <br/> NetworkIterator setRouteIterator(boolean routeIterator) {<br/> @@ -174,7 +176,7 @@<br/> <br/> private void addUnseenChildrenOf(NetworkVertex vertex, boolean greedy) {<br/> <br/> - if (vertex.isSink()) return;<br/> + if (vertex.isSink() && (!ignoreSinks)) return;<br/> log.debug("Iterator: Add unseen children of " + vertex);<br/> <br/> for (NetworkEdge edge : graph.edgesOf(vertex)) {<br/> diff --git a/rails/algorithms/NetworkVertex.java b/rails/algorithms/NetworkVertex.java<br/> index 91356af..03045b9 100644<br/> --- a/rails/algorithms/NetworkVertex.java<br/> +++ b/rails/algorithms/NetworkVertex.java<br/> @@ -311,7 +311,7 @@<br/> */<br/> public static void initAllRailsVertices(Graph<NetworkVertex, NetworkEdge> graph,<br/> PublicCompanyI company, PhaseI phase) {<br/> -<br/> + <br/> // store vertices for removal<br/> List<NetworkVertex> verticesToRemove = new ArrayList<NetworkVertex>();<br/> for (NetworkVertex v:graph.vertexSet()) {<br/> </div> <div class="gmail_extra"> <br/> <br/> <div class="gmail_quote"> On Wed, Aug 28, 2013 at 4:52 PM, Michael Alexander<span> <<a href="mailto:out...@gm..." target="_blank">out...@gm...</a>></span> wrote:<br/> <blockquote class="gmail_quote" style="margin: 0 0 0 0.8ex;border-left: 1.0px rgb(204,204,204) solid;padding-left: 1.0ex;"> <div> <div> Here's what I ended up with so far:<br/> <br/> </div> <div> compA is the private investor<br/> </div> <div> compB is the company to check to see if there is a connection with<br/> </div> <div> <br/> PublicCompanyI compA = operatingCompany.get();<br/> ...<br/> NetworkGraphBuilder nwGraph = NetworkGraphBuilder.create(gameManager);<br/> NetworkCompanyGraph companyGraph = NetworkCompanyGraph.create(nwGraph, compA);<br/> SimpleGraph<NetworkVertex, NetworkEdge> graph = companyGraph.createRouteGraph(true);<br/> Set<NetworkVertex> verticies = graph.vertexSet();<br/> ...<br/> for (TokenI token : compB.getTokens()) {<br/> TokenHolder holder = token.getHolder();<br/> if (!(holder instanceof Stop)) continue;<br/> Stop city = (Stop) holder;<br/> Station station = city.getRelatedStation();<br/> <br/> for (NetworkVertex vert : verticies) {<br/> if (vert.getType() == NetworkVertex.VertexType.STATION) {<br/> Station vertStation = vert.getStation();<br/> if (station == vertStation) {<br/> </div> // There is a link between the companies! Hooray!<br/> <div> }<br/> }<br/> }<br/> }<br/> ...<br/> <br/> </div> <div> This seems to work for simple cases, however, I suspect (without digging too much) that it will get blocked by tokens, which I can't have. I bet it won't be too hard to fix, tho.<br/> <br/> Mike<br/> </div> <div> <br/> </div> </div> <div class="HOEnZb"> <div class="h5"> <div class="gmail_extra"> <br/> <br/> <div class="gmail_quote"> On Wed, Aug 28, 2013 at 2:38 PM, brett lentz<span> <<a href="mailto:bre...@gm..." target="_blank">bre...@gm...</a>></span> wrote:<br/> <blockquote class="gmail_quote" style="margin: 0 0 0 0.8ex;border-left: 1.0px rgb(204,204,204) solid;padding-left: 1.0ex;"> <div> In order to do tile rotations, there is already logic that is aware of the "exits" of a tile. There's also the route suggestion code.<br/> <br/> It might be possible to leverage that same code to create a route graph that enables detection of destination runs.<br/> <br/> It probably needs a fair bit of work to adapt for this purpose, but those are at least places in the code to start looking. <div> <br/> </div> <div> ---Brett. </div> </div> <div class="gmail_extra"> <span><font color="#888888"><br clear="all"/> <div> <br/> ---Brett. </div> </font></span> <div> <div> <br/> <br/> <div class="gmail_quote"> On Wed, Aug 28, 2013 at 9:50 AM, Chris Shaffer<span> <<a href="mailto:chr...@gm..." target="_blank">chr...@gm...</a>></span> wrote:<br/> <blockquote class="gmail_quote" style="margin: 0 0 0 0.8ex;border-left: 1.0px rgb(204,204,204) solid;padding-left: 1.0ex;"> There are games where tokens do block destinations, so whatever code<br/> you write should allow for that possibility. There are also games<br/> where connections are considered complete as soon as the tile is laid,<br/> and others where the check occurs during the relevant company's<br/> operating turn.<br/> <div> <br/> --<br/> Chris<br/> <br/> Please consider the environment before printing this e-mail.<br/> <br/> <br/> </div> <div> <div> On Wed, Aug 28, 2013 at 6:35 AM, Michael Alexander<br/> <<a href="mailto:out...@gm..." target="_blank">out...@gm...</a>> wrote:<br/> > Both Major Companies in 1856 and Foreign Investors in 1880 have the idea of<br/> > needing to reach a destination. Both are implemented by having the game<br/> > player use a special action to tell the game engine that a connection has<br/> > taken place. Once the connection exists, some one time event occurs. It<br/> > seems like if there is code that could be used to determine if a connection<br/> > exists, the game could automatically determine that without relying on the<br/> > player to tell it.<br/> ><br/> > So I actually want something slightly different than what I said. It's not<br/> > that the current company can make a run between two hexes that I want to<br/> > know, it's that a connection exists (regardless of tokens).<br/> ><br/> > Mike<br/> ><br/> ><br/> > On Wed, Aug 28, 2013 at 9:28 AM, Chris Shaffer <<a href="mailto:chr...@gm..." target="_blank">chr...@gm...</a>><br/> > wrote:<br/> >><br/> >> Would this be for games where companies are limited to building track<br/> >> where their trains can actually reach, or some other purpose?<br/> >><br/> >> --<br/> >> Chris<br/> >><br/> >> Please consider the environment before printing this e-mail.<br/> >><br/> >><br/> >> On Tue, Aug 27, 2013 at 11:24 PM, Michael Alexander<br/> >> <<a href="mailto:out...@gm..." target="_blank">out...@gm...</a>> wrote:<br/> >> > Everyone,<br/> >> ><br/> >> > I'd like to add a check to see if the currently operating company<br/> >> > can<br/> >> > run from specific MapHex to another. It seems like there should be a<br/> >> > way to<br/> >> > do this, since a similar calculation would have to be made when<br/> >> > determining<br/> >> > what MapHexs are eligible to have a tile placed, but I can't seem to<br/> >> > figure<br/> >> > out how to do it. What am I missing?<br/> >> ><br/> >> > Thanks,<br/> >> ><br/> >> > Michael Alexander<br/> >> ><br/> >> ><br/> >> > ------------------------------------------------------------------------------<br/> >> > Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!<br/> >> > Discover the easy way to master current and previous Microsoft<br/> >> > technologies<br/> >> > and advance your career. Get an incredible 1,500+ hours of step-by-step<br/> >> > tutorial videos with LearnDevNow. Subscribe today and save!<br/> >> ><br/> >> ><a href="http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk" target="_blank"> http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk</a><br/> >> > _______________________________________________<br/> >> > Rails-devel mailing list<br/> >> ><a href="mailto:Rai...@li..." target="_blank"> Rai...@li...</a><br/> >> ><a href="https://lists.sourceforge.net/lists/listinfo/rails-devel" target="_blank"> https://lists.sourceforge.net/lists/listinfo/rails-devel</a><br/> >> ><br/> >><br/> >><br/> >> ------------------------------------------------------------------------------<br/> >> Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!<br/> >> Discover the easy way to master current and previous Microsoft<br/> >> technologies<br/> >> and advance your career. Get an incredible 1,500+ hours of step-by-step<br/> >> tutorial videos with LearnDevNow. Subscribe today and save!<br/> >><br/> >><a href="http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk" target="_blank"> http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk</a><br/> >> _______________________________________________<br/> >> Rails-devel mailing list<br/> >><a href="mailto:Rai...@li..." target="_blank"> Rai...@li...</a><br/> >><a href="https://lists.sourceforge.net/lists/listinfo/rails-devel" target="_blank"> https://lists.sourceforge.net/lists/listinfo/rails-devel</a><br/> ><br/> ><br/> ><br/> > ------------------------------------------------------------------------------<br/> > Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!<br/> > Discover the easy way to master current and previous Microsoft technologies<br/> > and advance your career. Get an incredible 1,500+ hours of step-by-step<br/> > tutorial videos with LearnDevNow. Subscribe today and save!<br/> ><a href="http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk" target="_blank"> http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk</a><br/> > _______________________________________________<br/> > Rails-devel mailing list<br/> ><a href="mailto:Rai...@li..." target="_blank"> Rai...@li...</a><br/> ><a href="https://lists.sourceforge.net/lists/listinfo/rails-devel" target="_blank"> https://lists.sourceforge.net/lists/listinfo/rails-devel</a><br/> ><br/> <br/> ------------------------------------------------------------------------------<br/> Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!<br/> Discover the easy way to master current and previous Microsoft technologies<br/> and advance your career. Get an incredible 1,500+ hours of step-by-step<br/> tutorial videos with LearnDevNow. Subscribe today and save!<br/> <a href="http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk" target="_blank">http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk</a><br/> _______________________________________________<br/> Rails-devel mailing list<br/> <a href="mailto:Rai...@li..." target="_blank">Rai...@li...</a><br/> <a href="https://lists.sourceforge.net/lists/listinfo/rails-devel" target="_blank">https://lists.sourceforge.net/lists/listinfo/rails-devel</a><br/> </div> </div> </blockquote> </div> <br/> </div> </div> </div> <br/> ------------------------------------------------------------------------------<br/> Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!<br/> Discover the easy way to master current and previous Microsoft technologies<br/> and advance your career. Get an incredible 1,500+ hours of step-by-step<br/> tutorial videos with LearnDevNow. Subscribe today and save!<br/> <a href="http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk" target="_blank">http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk</a><br/> _______________________________________________<br/> Rails-devel mailing list<br/> <a href="mailto:Rai...@li..." target="_blank">Rai...@li...</a><br/> <a href="https://lists.sourceforge.net/lists/listinfo/rails-devel" target="_blank">https://lists.sourceforge.net/lists/listinfo/rails-devel</a><br/> <br/> </blockquote> </div> <br/> </div> </div> </div> </blockquote> </div> <br/> </div> </blockquote></div></body> </html> |
From: Michael A. <out...@gm...> - 2013-08-29 12:18:40
|
How close is 2.0 to being ready to roll out? Should we be considering moving the 1880_specific branch to be under 2.0? On Thu, Aug 29, 2013 at 6:56 AM, Stefan Frey <ste...@we...> wrote: > You coded against Rail 1.x, this part of the code is upgraded in Rails 2.0 > branches. > Especially the connectivity functions are improved. If you check out Rails > 2.0 you will realize that it supports full verification of tile lays. > So I suggest that you code that functionally in 2.0 otherwise it will most > likely duplicate efforts and will not be mergeable. > > > Michael Alexander <out...@gm...> wrote: >> >> So what I found was that the NetworkIterator stopped at nodes that were >> sinks. If I want to be able to build a graph that just tells me that I'm >> connected and ignores tokens in the way, I think I need to add a setting to >> NetworkIterator to tell it if it should ignore sinks. As this is a >> complicated area of the code, and it's not limited to the 1880 specific >> areas, I'd appreciate some feedback on my proposed changes: >> >> diff --git a/rails/algorithms/NetworkCompanyGraph.java >> b/rails/algorithms/NetworkCompanyGraph.java >> index bd93113..0e5b2c8 100644 >> --- a/rails/algorithms/NetworkCompanyGraph.java >> +++ b/rails/algorithms/NetworkCompanyGraph.java >> @@ -64,7 +64,8 @@ >> return phase2Graph; >> } >> >> - public SimpleGraph<NetworkVertex, NetworkEdge> >> createRouteGraph(boolean addHQ) { >> + >> + private SimpleGraph<NetworkVertex, NetworkEdge> createGraph(boolean >> addHQ, boolean ignoreSinks) { >> // get mapgraph from builder >> SimpleGraph<NetworkVertex, NetworkEdge> mapGraph = >> graphBuilder.getMapGraph(); >> >> @@ -88,7 +89,7 @@ >> // add connection to graph >> graph.addVertex(vertex); >> graph.addEdge(vertex, hqVertex, new NetworkEdge(vertex, >> hqVertex, false)); >> - NetworkIterator iterator = new NetworkIterator(mapGraph, >> vertex, company); >> + NetworkIterator iterator = new NetworkIterator(mapGraph, >> vertex, company, ignoreSinks); >> for (;iterator.hasNext();) >> vertexes.add(iterator.next()); >> // restore sink property >> @@ -112,6 +113,14 @@ >> return graph; >> } >> >> + public SimpleGraph<NetworkVertex, NetworkEdge> >> createRouteGraph(boolean addHQ) { >> + return createGraph(addHQ, false); >> + } >> + >> + public SimpleGraph<NetworkVertex, NetworkEdge> >> createConnectionGraph(boolean addHQ) { >> + return createGraph(addHQ, true); >> + } >> + >> public List<NetworkVertex> >> getCompanyBaseTokenVertexes(PublicCompanyI company) { >> List<NetworkVertex> vertexes = new ArrayList<NetworkVertex>(); >> for (TokenI token:company.getTokens()){ >> diff --git a/rails/algorithms/NetworkIterator.java >> b/rails/algorithms/NetworkIterator.java >> index f4029e8..1adc0a6 100644 >> --- a/rails/algorithms/NetworkIterator.java >> +++ b/rails/algorithms/NetworkIterator.java >> @@ -26,6 +26,7 @@ >> private NetworkVertex startVertex; >> private boolean startVertexVisited; >> private boolean routeIterator; >> + private boolean ignoreSinks; >> >> // internal data >> private List<NetworkVertex> stack = new ArrayList<NetworkVertex>(); >> @@ -41,14 +42,14 @@ >> >> public NetworkIterator(Graph<NetworkVertex, NetworkEdge> graph, >> NetworkVertex startVertex) { >> - this(graph, startVertex, null); >> + this(graph, startVertex, null, false); >> } >> >> /** >> * Returns NetworkIterator for specific company >> */ >> public NetworkIterator(Graph<NetworkVertex, NetworkEdge> graph, >> NetworkVertex startVertex, >> - PublicCompanyI company) { >> + PublicCompanyI company, boolean ignoreSinks) { >> super(); >> >> if (graph == null) >> @@ -61,6 +62,7 @@ >> this.startVertex = startVertex; >> this.startVertexVisited = false; >> this.routeIterator = false; >> + this.ignoreSinks = ignoreSinks; >> } >> >> NetworkIterator setRouteIterator(boolean routeIterator) { >> @@ -174,7 +176,7 @@ >> >> private void addUnseenChildrenOf(NetworkVertex vertex, boolean >> greedy) { >> >> - if (vertex.isSink()) return; >> + if (vertex.isSink() && (!ignoreSinks)) return; >> log.debug("Iterator: Add unseen children of " + vertex); >> >> for (NetworkEdge edge : graph.edgesOf(vertex)) { >> diff --git a/rails/algorithms/NetworkVertex.java >> b/rails/algorithms/NetworkVertex.java >> index 91356af..03045b9 100644 >> --- a/rails/algorithms/NetworkVertex.java >> +++ b/rails/algorithms/NetworkVertex.java >> @@ -311,7 +311,7 @@ >> */ >> public static void initAllRailsVertices(Graph<NetworkVertex, >> NetworkEdge> graph, >> PublicCompanyI company, PhaseI phase) { >> - >> + >> // store vertices for removal >> List<NetworkVertex> verticesToRemove = new >> ArrayList<NetworkVertex>(); >> for (NetworkVertex v:graph.vertexSet()) { >> >> >> On Wed, Aug 28, 2013 at 4:52 PM, Michael Alexander < >> out...@gm...> wrote: >> >>> Here's what I ended up with so far: >>> >>> compA is the private investor >>> compB is the company to check to see if there is a connection with >>> >>> PublicCompanyI compA = operatingCompany.get(); >>> ... >>> NetworkGraphBuilder nwGraph = >>> NetworkGraphBuilder.create(gameManager); >>> NetworkCompanyGraph companyGraph = >>> NetworkCompanyGraph.create(nwGraph, compA); >>> SimpleGraph<NetworkVertex, NetworkEdge> graph = >>> companyGraph.createRouteGraph(true); >>> Set<NetworkVertex> verticies = graph.vertexSet(); >>> ... >>> for (TokenI token : compB.getTokens()) { >>> TokenHolder holder = token.getHolder(); >>> if (!(holder instanceof Stop)) continue; >>> Stop city = (Stop) holder; >>> Station station = city.getRelatedStation(); >>> >>> for (NetworkVertex vert : verticies) { >>> if (vert.getType() == >>> NetworkVertex.VertexType.STATION) { >>> Station vertStation = vert.getStation(); >>> if (station == vertStation) { >>> // There is a link between the companies! >>> Hooray! >>> } >>> } >>> } >>> } >>> ... >>> >>> This seems to work for simple cases, however, I suspect (without >>> digging too much) that it will get blocked by tokens, which I can't have. >>> I bet it won't be too hard to fix, tho. >>> >>> Mike >>> >>> >>> >>> On Wed, Aug 28, 2013 at 2:38 PM, brett lentz <bre...@gm...>wrote: >>> >>>> In order to do tile rotations, there is already logic that is aware of >>>> the "exits" of a tile. There's also the route suggestion code. >>>> >>>> It might be possible to leverage that same code to create a route graph >>>> that enables detection of destination runs. >>>> >>>> It probably needs a fair bit of work to adapt for this purpose, but >>>> those are at least places in the code to start looking. >>>> >>>> ---Brett. >>>> >>>> >>>> ---Brett. >>>> >>>> >>>> On Wed, Aug 28, 2013 at 9:50 AM, Chris Shaffer < >>>> chr...@gm...> wrote: >>>> >>>>> There are games where tokens do block destinations, so whatever code >>>>> you write should allow for that possibility. There are also games >>>>> where connections are considered complete as soon as the tile is laid, >>>>> and others where the check occurs during the relevant company's >>>>> operating turn. >>>>> >>>>> -- >>>>> Chris >>>>> >>>>> Please consider the environment before printing this e-mail. >>>>> >>>>> >>>>> On Wed, Aug 28, 2013 at 6:35 AM, Michael Alexander >>>>> <out...@gm...> wrote: >>>>> > Both Major Companies in 1856 and Foreign Investors in 1880 have the >>>>> idea of >>>>> > needing to reach a destination. Both are implemented by having the >>>>> game >>>>> > player use a special action to tell the game engine that a >>>>> connection has >>>>> > taken place. Once the connection exists, some one time event >>>>> occurs. It >>>>> > seems like if there is code that could be used to determine if a >>>>> connection >>>>> > exists, the game could automatically determine that without relying >>>>> on the >>>>> > player to tell it. >>>>> > >>>>> > So I actually want something slightly different than what I said. >>>>> It's not >>>>> > that the current company can make a run between two hexes that I >>>>> want to >>>>> > know, it's that a connection exists (regardless of tokens). >>>>> > >>>>> > Mike >>>>> > >>>>> > >>>>> > On Wed, Aug 28, 2013 at 9:28 AM, Chris Shaffer < >>>>> chr...@gm...> >>>>> > wrote: >>>>> >> >>>>> >> Would this be for games where companies are limited to building >>>>> track >>>>> >> where their trains can actually reach, or some other purpose? >>>>> >> >>>>> >> -- >>>>> >> Chris >>>>> >> >>>>> >> Please consider the environment before printing this e-mail. >>>>> >> >>>>> >> >>>>> >> On Tue, Aug 27, 2013 at 11:24 PM, Michael Alexander >>>>> >> <out...@gm...> wrote: >>>>> >> > Everyone, >>>>> >> > >>>>> >> > I'd like to add a check to see if the currently operating >>>>> company >>>>> >> > can >>>>> >> > run from specific MapHex to another. It seems like there should >>>>> be a >>>>> >> > way to >>>>> >> > do this, since a similar calculation would have to be made when >>>>> >> > determining >>>>> >> > what MapHexs are eligible to have a tile placed, but I can't seem >>>>> to >>>>> >> > figure >>>>> >> > out how to do it. What am I missing? >>>>> >> > >>>>> >> > Thanks, >>>>> >> > >>>>> >> > Michael Alexander >>>>> >> > >>>>> >> > >>>>> >> > >>>>> ------------------------------------------------------------------------------ >>>>> >> > Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, >>>>> more! >>>>> >> > Discover the easy way to master current and previous Microsoft >>>>> >> > technologies >>>>> >> > and advance your career. Get an incredible 1,500+ hours of >>>>> step-by-step >>>>> >> > tutorial videos with LearnDevNow. Subscribe today and save! >>>>> >> > >>>>> >> >http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk >>>>> >> > _______________________________________________ >>>>> >> > Rails-devel mailing list >>>>> >> > Rai...@li... >>>>> >> > https://lists.sourceforge.net/lists/listinfo/rails-devel >>>>> >> > >>>>> >> >>>>> >> >>>>> >> >>>>> ------------------------------------------------------------------------------ >>>>> >> Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, >>>>> more! >>>>> >> Discover the easy way to master current and previous Microsoft >>>>> >> technologies >>>>> >> and advance your career. Get an incredible 1,500+ hours of >>>>> step-by-step >>>>> >> tutorial videos with LearnDevNow. Subscribe today and save! >>>>> >> >>>>> >>http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk >>>>> >> _______________________________________________ >>>>> >> Rails-devel mailing list >>>>> >> Rai...@li... >>>>> >> https://lists.sourceforge.net/lists/listinfo/rails-devel >>>>> > >>>>> > >>>>> > >>>>> > >>>>> ------------------------------------------------------------------------------ >>>>> > Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, >>>>> more! >>>>> > Discover the easy way to master current and previous Microsoft >>>>> technologies >>>>> > and advance your career. Get an incredible 1,500+ hours of >>>>> step-by-step >>>>> > tutorial videos with LearnDevNow. Subscribe today and save! >>>>> >http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk >>>>> > _______________________________________________ >>>>> > Rails-devel mailing list >>>>> > Rai...@li... >>>>> > https://lists.sourceforge.net/lists/listinfo/rails-devel >>>>> > >>>>> >>>>> >>>>> ------------------------------------------------------------------------------ >>>>> Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more! >>>>> Discover the easy way to master current and previous Microsoft >>>>> technologies >>>>> and advance your career. Get an incredible 1,500+ hours of step-by-step >>>>> tutorial videos with LearnDevNow. Subscribe today and save! >>>>> >>>>> http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk >>>>> _______________________________________________ >>>>> Rails-devel mailing list >>>>> Rai...@li... >>>>> https://lists.sourceforge.net/lists/listinfo/rails-devel >>>>> >>>> >>>> >>>> >>>> ------------------------------------------------------------------------------ >>>> Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more! >>>> Discover the easy way to master current and previous Microsoft >>>> technologies >>>> and advance your career. Get an incredible 1,500+ hours of step-by-step >>>> tutorial videos with LearnDevNow. Subscribe today and save! >>>> >>>> http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk >>>> _______________________________________________ >>>> Rails-devel mailing list >>>> Rai...@li... >>>> https://lists.sourceforge.net/lists/listinfo/rails-devel >>>> >>>> >>> >> > > ------------------------------------------------------------------------------ > Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more! > Discover the easy way to master current and previous Microsoft technologies > and advance your career. Get an incredible 1,500+ hours of step-by-step > tutorial videos with LearnDevNow. Subscribe today and save! > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel > > |
From: Stefan F. <ste...@we...> - 2013-09-01 14:05:56
|
Rails 2.0 has been ready to roll out for an alpha release since February. I delayed that as I have not found a reasonable time slot to react on feedback from testers. All changes of the Rails1.x branch that happened after the creation of the Rails2.0 branch were already merged with Rails2.0. The only exception are all work done with respect to 1880. My main issue there is that I have never played 1880, thus I know 1880 only from the rules. And if I remember correctly there are a few things which are not easy to implement as they touch areas of the Rails which might require some re-work. That was the long answer. The short-answer is: * Test releases from Rails2.0 branch are possible already. * I recommend moving 1880 development to Rails2.0 as 1880 would benefit from upcoming rewrite of the code. * If you take care of merging the 1880 changes into Rails2.0, this would help me a lot. However feel free to ask for help anytime. Stefan On 08/29/2013 02:18 PM, Michael Alexander wrote: > How close is 2.0 to being ready to roll out? Should we be considering > moving the 1880_specific branch to be under 2.0? > > > On Thu, Aug 29, 2013 at 6:56 AM, Stefan Frey <ste...@we... > <mailto:ste...@we...>> wrote: > > You coded against Rail 1.x, this part of the code is upgraded in > Rails 2.0 branches. > Especially the connectivity functions are improved. If you check out > Rails 2.0 you will realize that it supports full verification of > tile lays. > So I suggest that you code that functionally in 2.0 otherwise it > will most likely duplicate efforts and will not be mergeable. > > > Michael Alexander <out...@gm... > <mailto:out...@gm...>> wrote: > > So what I found was that the NetworkIterator stopped at nodes > that were sinks. If I want to be able to build a graph that > just tells me that I'm connected and ignores tokens in the way, > I think I need to add a setting to NetworkIterator to tell it if > it should ignore sinks. As this is a complicated area of the > code, and it's not limited to the 1880 specific areas, I'd > appreciate some feedback on my proposed changes: > > diff --git a/rails/algorithms/NetworkCompanyGraph.java > b/rails/algorithms/NetworkCompanyGraph.java > index bd93113..0e5b2c8 100644 > --- a/rails/algorithms/NetworkCompanyGraph.java > +++ b/rails/algorithms/NetworkCompanyGraph.java > @@ -64,7 +64,8 @@ > return phase2Graph; > } > > - public SimpleGraph<NetworkVertex, NetworkEdge> > createRouteGraph(boolean addHQ) { > + > + private SimpleGraph<NetworkVertex, NetworkEdge> > createGraph(boolean addHQ, boolean ignoreSinks) { > // get mapgraph from builder > SimpleGraph<NetworkVertex, NetworkEdge> mapGraph = > graphBuilder.getMapGraph(); > > @@ -88,7 +89,7 @@ > // add connection to graph > graph.addVertex(vertex); > graph.addEdge(vertex, hqVertex, new > NetworkEdge(vertex, hqVertex, false)); > - NetworkIterator iterator = new > NetworkIterator(mapGraph, vertex, company); > + NetworkIterator iterator = new > NetworkIterator(mapGraph, vertex, company, ignoreSinks); > for (;iterator.hasNext();) > vertexes.add(iterator.next()); > // restore sink property > @@ -112,6 +113,14 @@ > return graph; > } > > + public SimpleGraph<NetworkVertex, NetworkEdge> > createRouteGraph(boolean addHQ) { > + return createGraph(addHQ, false); > + } > + > + public SimpleGraph<NetworkVertex, NetworkEdge> > createConnectionGraph(boolean addHQ) { > + return createGraph(addHQ, true); > + } > + > public List<NetworkVertex> > getCompanyBaseTokenVertexes(PublicCompanyI company) { > List<NetworkVertex> vertexes = new > ArrayList<NetworkVertex>(); > for (TokenI token:company.getTokens()){ > diff --git a/rails/algorithms/NetworkIterator.java > b/rails/algorithms/NetworkIterator.java > index f4029e8..1adc0a6 100644 > --- a/rails/algorithms/NetworkIterator.java > +++ b/rails/algorithms/NetworkIterator.java > @@ -26,6 +26,7 @@ > private NetworkVertex startVertex; > private boolean startVertexVisited; > private boolean routeIterator; > + private boolean ignoreSinks; > > // internal data > private List<NetworkVertex> stack = new > ArrayList<NetworkVertex>(); > @@ -41,14 +42,14 @@ > > public NetworkIterator(Graph<NetworkVertex, NetworkEdge> > graph, > NetworkVertex startVertex) { > - this(graph, startVertex, null); > + this(graph, startVertex, null, false); > } > > /** > * Returns NetworkIterator for specific company > */ > public NetworkIterator(Graph<NetworkVertex, NetworkEdge> > graph, NetworkVertex startVertex, > - PublicCompanyI company) { > + PublicCompanyI company, boolean ignoreSinks) { > super(); > > if (graph == null) > @@ -61,6 +62,7 @@ > this.startVertex = startVertex; > this.startVertexVisited = false; > this.routeIterator = false; > + this.ignoreSinks = ignoreSinks; > } > > NetworkIterator setRouteIterator(boolean routeIterator) { > @@ -174,7 +176,7 @@ > > private void addUnseenChildrenOf(NetworkVertex vertex, > boolean greedy) { > > - if (vertex.isSink()) return; > + if (vertex.isSink() && (!ignoreSinks)) return; > log.debug("Iterator: Add unseen children of " + vertex); > > for (NetworkEdge edge : graph.edgesOf(vertex)) { > diff --git a/rails/algorithms/NetworkVertex.java > b/rails/algorithms/NetworkVertex.java > index 91356af..03045b9 100644 > --- a/rails/algorithms/NetworkVertex.java > +++ b/rails/algorithms/NetworkVertex.java > @@ -311,7 +311,7 @@ > */ > public static void > initAllRailsVertices(Graph<NetworkVertex, NetworkEdge> graph, > PublicCompanyI company, PhaseI phase) { > - > + > // store vertices for removal > List<NetworkVertex> verticesToRemove = new > ArrayList<NetworkVertex>(); > for (NetworkVertex v:graph.vertexSet()) { > > > On Wed, Aug 28, 2013 at 4:52 PM, Michael > Alexander<out...@gm... > <mailto:out...@gm...>> wrote: > > Here's what I ended up with so far: > > compA is the private investor > compB is the company to check to see if there is a > connection with > > PublicCompanyI compA = operatingCompany.get(); > ... > NetworkGraphBuilder nwGraph = > NetworkGraphBuilder.create(gameManager); > NetworkCompanyGraph companyGraph = > NetworkCompanyGraph.create(nwGraph, compA); > SimpleGraph<NetworkVertex, NetworkEdge> graph = > companyGraph.createRouteGraph(true); > Set<NetworkVertex> verticies = graph.vertexSet(); > ... > for (TokenI token : compB.getTokens()) { > TokenHolder holder = token.getHolder(); > if (!(holder instanceof Stop)) continue; > Stop city = (Stop) holder; > Station station = city.getRelatedStation(); > > for (NetworkVertex vert : verticies) { > if (vert.getType() == > NetworkVertex.VertexType.STATION) { > Station vertStation = > vert.getStation(); > if (station == vertStation) { > // There is a link between the > companies! Hooray! > } > } > } > } > ... > > This seems to work for simple cases, however, I suspect > (without digging too much) that it will get blocked by > tokens, which I can't have. I bet it won't be too hard to > fix, tho. > > Mike > > > > On Wed, Aug 28, 2013 at 2:38 PM, brett > lentz<bre...@gm... <mailto:bre...@gm...>> > wrote: > > In order to do tile rotations, there is already logic > that is aware of the "exits" of a tile. There's also the > route suggestion code. > > It might be possible to leverage that same code to > create a route graph that enables detection of > destination runs. > > It probably needs a fair bit of work to adapt for this > purpose, but those are at least places in the code to > start looking. > > ---Brett. > > > ---Brett. > > > On Wed, Aug 28, 2013 at 9:50 AM, Chris > Shaffer<chr...@gm... > <mailto:chr...@gm...>> wrote: > > There are games where tokens do block destinations, > so whatever code > you write should allow for that possibility. There > are also games > where connections are considered complete as soon as > the tile is laid, > and others where the check occurs during the > relevant company's > operating turn. > > -- > Chris > > Please consider the environment before printing this > e-mail. > > > On Wed, Aug 28, 2013 at 6:35 AM, Michael Alexander > <out...@gm... > <mailto:out...@gm...>> wrote: > > Both Major Companies in 1856 and Foreign > Investors in 1880 have the idea of > > needing to reach a destination. Both are > implemented by having the game > > player use a special action to tell the game > engine that a connection has > > taken place. Once the connection exists, some > one time event occurs. It > > seems like if there is code that could be used to > determine if a connection > > exists, the game could automatically determine > that without relying on the > > player to tell it. > > > > So I actually want something slightly different > than what I said. It's not > > that the current company can make a run between > two hexes that I want to > > know, it's that a connection exists (regardless > of tokens). > > > > Mike > > > > > > On Wed, Aug 28, 2013 at 9:28 AM, Chris Shaffer > <chr...@gm... > <mailto:chr...@gm...>> > > wrote: > >> > >> Would this be for games where companies are > limited to building track > >> where their trains can actually reach, or some > other purpose? > >> > >> -- > >> Chris > >> > >> Please consider the environment before printing > this e-mail. > >> > >> > >> On Tue, Aug 27, 2013 at 11:24 PM, Michael Alexander > >> <out...@gm... > <mailto:out...@gm...>> wrote: > >> > Everyone, > >> > > >> > I'd like to add a check to see if the > currently operating company > >> > can > >> > run from specific MapHex to another. It seems > like there should be a > >> > way to > >> > do this, since a similar calculation would > have to be made when > >> > determining > >> > what MapHexs are eligible to have a tile > placed, but I can't seem to > >> > figure > >> > out how to do it. What am I missing? > >> > > >> > Thanks, > >> > > >> > Michael Alexander > >> > > >> > > >> > > ------------------------------------------------------------------------------ > >> > Learn the latest--Visual Studio 2012, > SharePoint 2013, SQL 2012, more! > >> > Discover the easy way to master current and > previous Microsoft > >> > technologies > >> > and advance your career. Get an incredible > 1,500+ hours of step-by-step > >> > tutorial videos with LearnDevNow. Subscribe > today and save! > >> > > >> > >http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk <http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk> > >> > _______________________________________________ > >> > Rails-devel mailing list > >> >Rai...@li... > <mailto:Rai...@li...> > >> > >https://lists.sourceforge.net/lists/listinfo/rails-devel <https://lists.sourceforge.net/lists/listinfo/rails-devel> > >> > > >> > >> > >> > ------------------------------------------------------------------------------ > >> Learn the latest--Visual Studio 2012, SharePoint > 2013, SQL 2012, more! > >> Discover the easy way to master current and > previous Microsoft > >> technologies > >> and advance your career. Get an incredible > 1,500+ hours of step-by-step > >> tutorial videos with LearnDevNow. Subscribe > today and save! > >> > >>http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk <http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk> > >> _______________________________________________ > >> Rails-devel mailing list > >>Rai...@li... > <mailto:Rai...@li...> > >>https://lists.sourceforge.net/lists/listinfo/rails-devel <https://lists.sourceforge.net/lists/listinfo/rails-devel> > > > > > > > > > ------------------------------------------------------------------------------ > > Learn the latest--Visual Studio 2012, SharePoint > 2013, SQL 2012, more! > > Discover the easy way to master current and > previous Microsoft technologies > > and advance your career. Get an incredible 1,500+ > hours of step-by-step > > tutorial videos with LearnDevNow. Subscribe today > and save! > >http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk <http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk> > > _______________________________________________ > > Rails-devel mailing list > >Rai...@li... > <mailto:Rai...@li...> > >https://lists.sourceforge.net/lists/listinfo/rails-devel <https://lists.sourceforge.net/lists/listinfo/rails-devel> > > > > ------------------------------------------------------------------------------ > Learn the latest--Visual Studio 2012, SharePoint > 2013, SQL 2012, more! > Discover the easy way to master current and previous > Microsoft technologies > and advance your career. Get an incredible 1,500+ > hours of step-by-step > tutorial videos with LearnDevNow. Subscribe today > and save! > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk > _______________________________________________ > Rails-devel mailing list > Rai...@li... > <mailto:Rai...@li...> > https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > ------------------------------------------------------------------------------ > Learn the latest--Visual Studio 2012, SharePoint 2013, > SQL 2012, more! > Discover the easy way to master current and previous > Microsoft technologies > and advance your career. Get an incredible 1,500+ hours > of step-by-step > tutorial videos with LearnDevNow. Subscribe today and save! > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk > _______________________________________________ > Rails-devel mailing list > Rai...@li... > <mailto:Rai...@li...> > https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > > ------------------------------------------------------------------------------ > Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more! > Discover the easy way to master current and previous Microsoft > technologies > and advance your career. Get an incredible 1,500+ hours of step-by-step > tutorial videos with LearnDevNow. Subscribe today and save! > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk > _______________________________________________ > Rails-devel mailing list > Rai...@li... > <mailto:Rai...@li...> > https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > > ------------------------------------------------------------------------------ > Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more! > Discover the easy way to master current and previous Microsoft technologies > and advance your career. Get an incredible 1,500+ hours of step-by-step > tutorial videos with LearnDevNow. Subscribe today and save! > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk > > > > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel > |
From: Michael A. <out...@gm...> - 2013-09-01 14:29:16
|
I'm hesitant to port it immediately, as it's very close (I think) to be being completely playable under 1.7. We have a couple groups that are actively playing it right now, they just haven't gotten to the stage where it doesn't quite work. Maybe in the very short term we can get it to the stage where they can finish their games, then we could work on porting it to 2.0. I'm more than willing to help port it to 2.0. Is there anything that documents the changes with 2.0? Mike On Sun, Sep 1, 2013 at 10:05 AM, Stefan Frey <ste...@we...> wrote: > Rails 2.0 has been ready to roll out for an alpha release since > February. I delayed that as I have not found a reasonable time slot > to react on feedback from testers. > > All changes of the Rails1.x branch that happened after the creation of > the Rails2.0 branch were already merged with Rails2.0. > > The only exception are all work done with respect to 1880. > My main issue there is that I have never played 1880, thus I know 1880 > only from the rules. And if I remember correctly there are a few things > which are not easy to implement as they touch areas of the Rails which > might require some re-work. > > That was the long answer. The short-answer is: > > * Test releases from Rails2.0 branch are possible already. > > * I recommend moving 1880 development to Rails2.0 as 1880 > would benefit from upcoming rewrite of the code. > > * If you take care of merging the 1880 changes into Rails2.0, this would > help me a lot. However feel free to ask for help anytime. > > Stefan > > > On 08/29/2013 02:18 PM, Michael Alexander wrote: > > How close is 2.0 to being ready to roll out? Should we be considering > > moving the 1880_specific branch to be under 2.0? > > > > > > On Thu, Aug 29, 2013 at 6:56 AM, Stefan Frey <ste...@we... > > <mailto:ste...@we...>> wrote: > > > > You coded against Rail 1.x, this part of the code is upgraded in > > Rails 2.0 branches. > > Especially the connectivity functions are improved. If you check out > > Rails 2.0 you will realize that it supports full verification of > > tile lays. > > So I suggest that you code that functionally in 2.0 otherwise it > > will most likely duplicate efforts and will not be mergeable. > > > > > > Michael Alexander <out...@gm... > > <mailto:out...@gm...>> wrote: > > > > So what I found was that the NetworkIterator stopped at nodes > > that were sinks. If I want to be able to build a graph that > > just tells me that I'm connected and ignores tokens in the way, > > I think I need to add a setting to NetworkIterator to tell it if > > it should ignore sinks. As this is a complicated area of the > > code, and it's not limited to the 1880 specific areas, I'd > > appreciate some feedback on my proposed changes: > > > > diff --git a/rails/algorithms/NetworkCompanyGraph.java > > b/rails/algorithms/NetworkCompanyGraph.java > > index bd93113..0e5b2c8 100644 > > --- a/rails/algorithms/NetworkCompanyGraph.java > > +++ b/rails/algorithms/NetworkCompanyGraph.java > > @@ -64,7 +64,8 @@ > > return phase2Graph; > > } > > > > - public SimpleGraph<NetworkVertex, NetworkEdge> > > createRouteGraph(boolean addHQ) { > > + > > + private SimpleGraph<NetworkVertex, NetworkEdge> > > createGraph(boolean addHQ, boolean ignoreSinks) { > > // get mapgraph from builder > > SimpleGraph<NetworkVertex, NetworkEdge> mapGraph = > > graphBuilder.getMapGraph(); > > > > @@ -88,7 +89,7 @@ > > // add connection to graph > > graph.addVertex(vertex); > > graph.addEdge(vertex, hqVertex, new > > NetworkEdge(vertex, hqVertex, false)); > > - NetworkIterator iterator = new > > NetworkIterator(mapGraph, vertex, company); > > + NetworkIterator iterator = new > > NetworkIterator(mapGraph, vertex, company, ignoreSinks); > > for (;iterator.hasNext();) > > vertexes.add(iterator.next()); > > // restore sink property > > @@ -112,6 +113,14 @@ > > return graph; > > } > > > > + public SimpleGraph<NetworkVertex, NetworkEdge> > > createRouteGraph(boolean addHQ) { > > + return createGraph(addHQ, false); > > + } > > + > > + public SimpleGraph<NetworkVertex, NetworkEdge> > > createConnectionGraph(boolean addHQ) { > > + return createGraph(addHQ, true); > > + } > > + > > public List<NetworkVertex> > > getCompanyBaseTokenVertexes(PublicCompanyI company) { > > List<NetworkVertex> vertexes = new > > ArrayList<NetworkVertex>(); > > for (TokenI token:company.getTokens()){ > > diff --git a/rails/algorithms/NetworkIterator.java > > b/rails/algorithms/NetworkIterator.java > > index f4029e8..1adc0a6 100644 > > --- a/rails/algorithms/NetworkIterator.java > > +++ b/rails/algorithms/NetworkIterator.java > > @@ -26,6 +26,7 @@ > > private NetworkVertex startVertex; > > private boolean startVertexVisited; > > private boolean routeIterator; > > + private boolean ignoreSinks; > > > > // internal data > > private List<NetworkVertex> stack = new > > ArrayList<NetworkVertex>(); > > @@ -41,14 +42,14 @@ > > > > public NetworkIterator(Graph<NetworkVertex, NetworkEdge> > > graph, > > NetworkVertex startVertex) { > > - this(graph, startVertex, null); > > + this(graph, startVertex, null, false); > > } > > > > /** > > * Returns NetworkIterator for specific company > > */ > > public NetworkIterator(Graph<NetworkVertex, NetworkEdge> > > graph, NetworkVertex startVertex, > > - PublicCompanyI company) { > > + PublicCompanyI company, boolean ignoreSinks) { > > super(); > > > > if (graph == null) > > @@ -61,6 +62,7 @@ > > this.startVertex = startVertex; > > this.startVertexVisited = false; > > this.routeIterator = false; > > + this.ignoreSinks = ignoreSinks; > > } > > > > NetworkIterator setRouteIterator(boolean routeIterator) { > > @@ -174,7 +176,7 @@ > > > > private void addUnseenChildrenOf(NetworkVertex vertex, > > boolean greedy) { > > > > - if (vertex.isSink()) return; > > + if (vertex.isSink() && (!ignoreSinks)) return; > > log.debug("Iterator: Add unseen children of " + > vertex); > > > > for (NetworkEdge edge : graph.edgesOf(vertex)) { > > diff --git a/rails/algorithms/NetworkVertex.java > > b/rails/algorithms/NetworkVertex.java > > index 91356af..03045b9 100644 > > --- a/rails/algorithms/NetworkVertex.java > > +++ b/rails/algorithms/NetworkVertex.java > > @@ -311,7 +311,7 @@ > > */ > > public static void > > initAllRailsVertices(Graph<NetworkVertex, NetworkEdge> graph, > > PublicCompanyI company, PhaseI phase) { > > - > > + > > // store vertices for removal > > List<NetworkVertex> verticesToRemove = new > > ArrayList<NetworkVertex>(); > > for (NetworkVertex v:graph.vertexSet()) { > > > > > > On Wed, Aug 28, 2013 at 4:52 PM, Michael > > Alexander<out...@gm... > > <mailto:out...@gm...>> wrote: > > > > Here's what I ended up with so far: > > > > compA is the private investor > > compB is the company to check to see if there is a > > connection with > > > > PublicCompanyI compA = operatingCompany.get(); > > ... > > NetworkGraphBuilder nwGraph = > > NetworkGraphBuilder.create(gameManager); > > NetworkCompanyGraph companyGraph = > > NetworkCompanyGraph.create(nwGraph, compA); > > SimpleGraph<NetworkVertex, NetworkEdge> graph = > > companyGraph.createRouteGraph(true); > > Set<NetworkVertex> verticies = > graph.vertexSet(); > > ... > > for (TokenI token : compB.getTokens()) { > > TokenHolder holder = token.getHolder(); > > if (!(holder instanceof Stop)) continue; > > Stop city = (Stop) holder; > > Station station = city.getRelatedStation(); > > > > for (NetworkVertex vert : verticies) { > > if (vert.getType() == > > NetworkVertex.VertexType.STATION) { > > Station vertStation = > > vert.getStation(); > > if (station == vertStation) { > > // There is a link between the > > companies! Hooray! > > } > > } > > } > > } > > ... > > > > This seems to work for simple cases, however, I suspect > > (without digging too much) that it will get blocked by > > tokens, which I can't have. I bet it won't be too hard to > > fix, tho. > > > > Mike > > > > > > > > On Wed, Aug 28, 2013 at 2:38 PM, brett > > lentz<bre...@gm... <mailto:bre...@gm...>> > > wrote: > > > > In order to do tile rotations, there is already logic > > that is aware of the "exits" of a tile. There's also the > > route suggestion code. > > > > It might be possible to leverage that same code to > > create a route graph that enables detection of > > destination runs. > > > > It probably needs a fair bit of work to adapt for this > > purpose, but those are at least places in the code to > > start looking. > > > > ---Brett. > > > > > > ---Brett. > > > > > > On Wed, Aug 28, 2013 at 9:50 AM, Chris > > Shaffer<chr...@gm... > > <mailto:chr...@gm...>> wrote: > > > > There are games where tokens do block destinations, > > so whatever code > > you write should allow for that possibility. There > > are also games > > where connections are considered complete as soon as > > the tile is laid, > > and others where the check occurs during the > > relevant company's > > operating turn. > > > > -- > > Chris > > > > Please consider the environment before printing this > > e-mail. > > > > > > On Wed, Aug 28, 2013 at 6:35 AM, Michael Alexander > > <out...@gm... > > <mailto:out...@gm...>> wrote: > > > Both Major Companies in 1856 and Foreign > > Investors in 1880 have the idea of > > > needing to reach a destination. Both are > > implemented by having the game > > > player use a special action to tell the game > > engine that a connection has > > > taken place. Once the connection exists, some > > one time event occurs. It > > > seems like if there is code that could be used to > > determine if a connection > > > exists, the game could automatically determine > > that without relying on the > > > player to tell it. > > > > > > So I actually want something slightly different > > than what I said. It's not > > > that the current company can make a run between > > two hexes that I want to > > > know, it's that a connection exists (regardless > > of tokens). > > > > > > Mike > > > > > > > > > On Wed, Aug 28, 2013 at 9:28 AM, Chris Shaffer > > <chr...@gm... > > <mailto:chr...@gm...>> > > > wrote: > > >> > > >> Would this be for games where companies are > > limited to building track > > >> where their trains can actually reach, or some > > other purpose? > > >> > > >> -- > > >> Chris > > >> > > >> Please consider the environment before printing > > this e-mail. > > >> > > >> > > >> On Tue, Aug 27, 2013 at 11:24 PM, Michael > Alexander > > >> <out...@gm... > > <mailto:out...@gm...>> wrote: > > >> > Everyone, > > >> > > > >> > I'd like to add a check to see if the > > currently operating company > > >> > can > > >> > run from specific MapHex to another. It seems > > like there should be a > > >> > way to > > >> > do this, since a similar calculation would > > have to be made when > > >> > determining > > >> > what MapHexs are eligible to have a tile > > placed, but I can't seem to > > >> > figure > > >> > out how to do it. What am I missing? > > >> > > > >> > Thanks, > > >> > > > >> > Michael Alexander > > >> > > > >> > > > >> > > > > ------------------------------------------------------------------------------ > > >> > Learn the latest--Visual Studio 2012, > > SharePoint 2013, SQL 2012, more! > > >> > Discover the easy way to master current and > > previous Microsoft > > >> > technologies > > >> > and advance your career. Get an incredible > > 1,500+ hours of step-by-step > > >> > tutorial videos with LearnDevNow. Subscribe > > today and save! > > >> > > > >> > > > > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk< > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk > > > > >> > _______________________________________________ > > >> > Rails-devel mailing list > > >> >Rai...@li... > > <mailto:Rai...@li...> > > >> > > > > https://lists.sourceforge.net/lists/listinfo/rails-devel < > https://lists.sourceforge.net/lists/listinfo/rails-devel> > > >> > > > >> > > >> > > >> > > > ------------------------------------------------------------------------------ > > >> Learn the latest--Visual Studio 2012, SharePoint > > 2013, SQL 2012, more! > > >> Discover the easy way to master current and > > previous Microsoft > > >> technologies > > >> and advance your career. Get an incredible > > 1,500+ hours of step-by-step > > >> tutorial videos with LearnDevNow. Subscribe > > today and save! > > >> > > >> > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk< > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk > > > > >> _______________________________________________ > > >> Rails-devel mailing list > > >>Rai...@li... > > <mailto:Rai...@li...> > > >> > https://lists.sourceforge.net/lists/listinfo/rails-devel < > https://lists.sourceforge.net/lists/listinfo/rails-devel> > > > > > > > > > > > > > > > ------------------------------------------------------------------------------ > > > Learn the latest--Visual Studio 2012, SharePoint > > 2013, SQL 2012, more! > > > Discover the easy way to master current and > > previous Microsoft technologies > > > and advance your career. Get an incredible 1,500+ > > hours of step-by-step > > > tutorial videos with LearnDevNow. Subscribe today > > and save! > > > > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk< > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk > > > > > _______________________________________________ > > > Rails-devel mailing list > > >Rai...@li... > > <mailto:Rai...@li...> > > > > https://lists.sourceforge.net/lists/listinfo/rails-devel < > https://lists.sourceforge.net/lists/listinfo/rails-devel> > > > > > > > > ------------------------------------------------------------------------------ > > Learn the latest--Visual Studio 2012, SharePoint > > 2013, SQL 2012, more! > > Discover the easy way to master current and previous > > Microsoft technologies > > and advance your career. Get an incredible 1,500+ > > hours of step-by-step > > tutorial videos with LearnDevNow. Subscribe today > > and save! > > > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk > > _______________________________________________ > > Rails-devel mailing list > > Rai...@li... > > <mailto:Rai...@li...> > > > https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > > > > > > ------------------------------------------------------------------------------ > > Learn the latest--Visual Studio 2012, SharePoint 2013, > > SQL 2012, more! > > Discover the easy way to master current and previous > > Microsoft technologies > > and advance your career. Get an incredible 1,500+ hours > > of step-by-step > > tutorial videos with LearnDevNow. Subscribe today and > save! > > > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk > > _______________________________________________ > > Rails-devel mailing list > > Rai...@li... > > <mailto:Rai...@li...> > > https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > > > > > > > > ------------------------------------------------------------------------------ > > Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, > more! > > Discover the easy way to master current and previous Microsoft > > technologies > > and advance your career. Get an incredible 1,500+ hours of > step-by-step > > tutorial videos with LearnDevNow. Subscribe today and save! > > > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk > > _______________________________________________ > > Rails-devel mailing list > > Rai...@li... > > <mailto:Rai...@li...> > > https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > > > > > > > > ------------------------------------------------------------------------------ > > Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more! > > Discover the easy way to master current and previous Microsoft > technologies > > and advance your career. Get an incredible 1,500+ hours of step-by-step > > tutorial videos with LearnDevNow. Subscribe today and save! > > > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk > > > > > > > > _______________________________________________ > > Rails-devel mailing list > > Rai...@li... > > https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > > > ------------------------------------------------------------------------------ > Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more! > Discover the easy way to master current and previous Microsoft technologies > and advance your career. Get an incredible 1,500+ hours of step-by-step > tutorial videos with LearnDevNow. Subscribe today and save! > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel > |
From: Chris S. <chr...@gm...> - 2013-09-01 14:38:44
|
If you port it, we'll happily replay our game up to the point it's at now and port it as well. -- Chris Please consider the environment before printing this e-mail. On Sun, Sep 1, 2013 at 7:29 AM, Michael Alexander <out...@gm...> wrote: > I'm hesitant to port it immediately, as it's very close (I think) to be > being completely playable under 1.7. We have a couple groups that are > actively playing it right now, they just haven't gotten to the stage where > it doesn't quite work. Maybe in the very short term we can get it to the > stage where they can finish their games, then we could work on porting it to > 2.0. I'm more than willing to help port it to 2.0. > > Is there anything that documents the changes with 2.0? > > Mike > > > On Sun, Sep 1, 2013 at 10:05 AM, Stefan Frey <ste...@we...> wrote: >> >> Rails 2.0 has been ready to roll out for an alpha release since >> February. I delayed that as I have not found a reasonable time slot >> to react on feedback from testers. >> >> All changes of the Rails1.x branch that happened after the creation of >> the Rails2.0 branch were already merged with Rails2.0. >> >> The only exception are all work done with respect to 1880. >> My main issue there is that I have never played 1880, thus I know 1880 >> only from the rules. And if I remember correctly there are a few things >> which are not easy to implement as they touch areas of the Rails which >> might require some re-work. >> >> That was the long answer. The short-answer is: >> >> * Test releases from Rails2.0 branch are possible already. >> >> * I recommend moving 1880 development to Rails2.0 as 1880 >> would benefit from upcoming rewrite of the code. >> >> * If you take care of merging the 1880 changes into Rails2.0, this would >> help me a lot. However feel free to ask for help anytime. >> >> Stefan >> >> >> On 08/29/2013 02:18 PM, Michael Alexander wrote: >> > How close is 2.0 to being ready to roll out? Should we be considering >> > moving the 1880_specific branch to be under 2.0? >> > >> > >> > On Thu, Aug 29, 2013 at 6:56 AM, Stefan Frey <ste...@we... >> > <mailto:ste...@we...>> wrote: >> > >> > You coded against Rail 1.x, this part of the code is upgraded in >> > Rails 2.0 branches. >> > Especially the connectivity functions are improved. If you check out >> > Rails 2.0 you will realize that it supports full verification of >> > tile lays. >> > So I suggest that you code that functionally in 2.0 otherwise it >> > will most likely duplicate efforts and will not be mergeable. >> > >> > >> > Michael Alexander <out...@gm... >> > <mailto:out...@gm...>> wrote: >> > >> > So what I found was that the NetworkIterator stopped at nodes >> > that were sinks. If I want to be able to build a graph that >> > just tells me that I'm connected and ignores tokens in the way, >> > I think I need to add a setting to NetworkIterator to tell it if >> > it should ignore sinks. As this is a complicated area of the >> > code, and it's not limited to the 1880 specific areas, I'd >> > appreciate some feedback on my proposed changes: >> > >> > diff --git a/rails/algorithms/NetworkCompanyGraph.java >> > b/rails/algorithms/NetworkCompanyGraph.java >> > index bd93113..0e5b2c8 100644 >> > --- a/rails/algorithms/NetworkCompanyGraph.java >> > +++ b/rails/algorithms/NetworkCompanyGraph.java >> > @@ -64,7 +64,8 @@ >> > return phase2Graph; >> > } >> > >> > - public SimpleGraph<NetworkVertex, NetworkEdge> >> > createRouteGraph(boolean addHQ) { >> > + >> > + private SimpleGraph<NetworkVertex, NetworkEdge> >> > createGraph(boolean addHQ, boolean ignoreSinks) { >> > // get mapgraph from builder >> > SimpleGraph<NetworkVertex, NetworkEdge> mapGraph = >> > graphBuilder.getMapGraph(); >> > >> > @@ -88,7 +89,7 @@ >> > // add connection to graph >> > graph.addVertex(vertex); >> > graph.addEdge(vertex, hqVertex, new >> > NetworkEdge(vertex, hqVertex, false)); >> > - NetworkIterator iterator = new >> > NetworkIterator(mapGraph, vertex, company); >> > + NetworkIterator iterator = new >> > NetworkIterator(mapGraph, vertex, company, ignoreSinks); >> > for (;iterator.hasNext();) >> > vertexes.add(iterator.next()); >> > // restore sink property >> > @@ -112,6 +113,14 @@ >> > return graph; >> > } >> > >> > + public SimpleGraph<NetworkVertex, NetworkEdge> >> > createRouteGraph(boolean addHQ) { >> > + return createGraph(addHQ, false); >> > + } >> > + >> > + public SimpleGraph<NetworkVertex, NetworkEdge> >> > createConnectionGraph(boolean addHQ) { >> > + return createGraph(addHQ, true); >> > + } >> > + >> > public List<NetworkVertex> >> > getCompanyBaseTokenVertexes(PublicCompanyI company) { >> > List<NetworkVertex> vertexes = new >> > ArrayList<NetworkVertex>(); >> > for (TokenI token:company.getTokens()){ >> > diff --git a/rails/algorithms/NetworkIterator.java >> > b/rails/algorithms/NetworkIterator.java >> > index f4029e8..1adc0a6 100644 >> > --- a/rails/algorithms/NetworkIterator.java >> > +++ b/rails/algorithms/NetworkIterator.java >> > @@ -26,6 +26,7 @@ >> > private NetworkVertex startVertex; >> > private boolean startVertexVisited; >> > private boolean routeIterator; >> > + private boolean ignoreSinks; >> > >> > // internal data >> > private List<NetworkVertex> stack = new >> > ArrayList<NetworkVertex>(); >> > @@ -41,14 +42,14 @@ >> > >> > public NetworkIterator(Graph<NetworkVertex, NetworkEdge> >> > graph, >> > NetworkVertex startVertex) { >> > - this(graph, startVertex, null); >> > + this(graph, startVertex, null, false); >> > } >> > >> > /** >> > * Returns NetworkIterator for specific company >> > */ >> > public NetworkIterator(Graph<NetworkVertex, NetworkEdge> >> > graph, NetworkVertex startVertex, >> > - PublicCompanyI company) { >> > + PublicCompanyI company, boolean ignoreSinks) { >> > super(); >> > >> > if (graph == null) >> > @@ -61,6 +62,7 @@ >> > this.startVertex = startVertex; >> > this.startVertexVisited = false; >> > this.routeIterator = false; >> > + this.ignoreSinks = ignoreSinks; >> > } >> > >> > NetworkIterator setRouteIterator(boolean routeIterator) { >> > @@ -174,7 +176,7 @@ >> > >> > private void addUnseenChildrenOf(NetworkVertex vertex, >> > boolean greedy) { >> > >> > - if (vertex.isSink()) return; >> > + if (vertex.isSink() && (!ignoreSinks)) return; >> > log.debug("Iterator: Add unseen children of " + >> > vertex); >> > >> > for (NetworkEdge edge : graph.edgesOf(vertex)) { >> > diff --git a/rails/algorithms/NetworkVertex.java >> > b/rails/algorithms/NetworkVertex.java >> > index 91356af..03045b9 100644 >> > --- a/rails/algorithms/NetworkVertex.java >> > +++ b/rails/algorithms/NetworkVertex.java >> > @@ -311,7 +311,7 @@ >> > */ >> > public static void >> > initAllRailsVertices(Graph<NetworkVertex, NetworkEdge> graph, >> > PublicCompanyI company, PhaseI phase) { >> > - >> > + >> > // store vertices for removal >> > List<NetworkVertex> verticesToRemove = new >> > ArrayList<NetworkVertex>(); >> > for (NetworkVertex v:graph.vertexSet()) { >> > >> > >> > On Wed, Aug 28, 2013 at 4:52 PM, Michael >> > Alexander<out...@gm... >> > <mailto:out...@gm...>> wrote: >> > >> > Here's what I ended up with so far: >> > >> > compA is the private investor >> > compB is the company to check to see if there is a >> > connection with >> > >> > PublicCompanyI compA = operatingCompany.get(); >> > ... >> > NetworkGraphBuilder nwGraph = >> > NetworkGraphBuilder.create(gameManager); >> > NetworkCompanyGraph companyGraph = >> > NetworkCompanyGraph.create(nwGraph, compA); >> > SimpleGraph<NetworkVertex, NetworkEdge> graph = >> > companyGraph.createRouteGraph(true); >> > Set<NetworkVertex> verticies = >> > graph.vertexSet(); >> > ... >> > for (TokenI token : compB.getTokens()) { >> > TokenHolder holder = token.getHolder(); >> > if (!(holder instanceof Stop)) continue; >> > Stop city = (Stop) holder; >> > Station station = city.getRelatedStation(); >> > >> > for (NetworkVertex vert : verticies) { >> > if (vert.getType() == >> > NetworkVertex.VertexType.STATION) { >> > Station vertStation = >> > vert.getStation(); >> > if (station == vertStation) { >> > // There is a link between the >> > companies! Hooray! >> > } >> > } >> > } >> > } >> > ... >> > >> > This seems to work for simple cases, however, I suspect >> > (without digging too much) that it will get blocked by >> > tokens, which I can't have. I bet it won't be too hard to >> > fix, tho. >> > >> > Mike >> > >> > >> > >> > On Wed, Aug 28, 2013 at 2:38 PM, brett >> > lentz<bre...@gm... <mailto:bre...@gm...>> >> > wrote: >> > >> > In order to do tile rotations, there is already logic >> > that is aware of the "exits" of a tile. There's also the >> > route suggestion code. >> > >> > It might be possible to leverage that same code to >> > create a route graph that enables detection of >> > destination runs. >> > >> > It probably needs a fair bit of work to adapt for this >> > purpose, but those are at least places in the code to >> > start looking. >> > >> > ---Brett. >> > >> > >> > ---Brett. >> > >> > >> > On Wed, Aug 28, 2013 at 9:50 AM, Chris >> > Shaffer<chr...@gm... >> > <mailto:chr...@gm...>> wrote: >> > >> > There are games where tokens do block destinations, >> > so whatever code >> > you write should allow for that possibility. There >> > are also games >> > where connections are considered complete as soon as >> > the tile is laid, >> > and others where the check occurs during the >> > relevant company's >> > operating turn. >> > >> > -- >> > Chris >> > >> > Please consider the environment before printing this >> > e-mail. >> > >> > >> > On Wed, Aug 28, 2013 at 6:35 AM, Michael Alexander >> > <out...@gm... >> > <mailto:out...@gm...>> wrote: >> > > Both Major Companies in 1856 and Foreign >> > Investors in 1880 have the idea of >> > > needing to reach a destination. Both are >> > implemented by having the game >> > > player use a special action to tell the game >> > engine that a connection has >> > > taken place. Once the connection exists, some >> > one time event occurs. It >> > > seems like if there is code that could be used to >> > determine if a connection >> > > exists, the game could automatically determine >> > that without relying on the >> > > player to tell it. >> > > >> > > So I actually want something slightly different >> > than what I said. It's not >> > > that the current company can make a run between >> > two hexes that I want to >> > > know, it's that a connection exists (regardless >> > of tokens). >> > > >> > > Mike >> > > >> > > >> > > On Wed, Aug 28, 2013 at 9:28 AM, Chris Shaffer >> > <chr...@gm... >> > <mailto:chr...@gm...>> >> > > wrote: >> > >> >> > >> Would this be for games where companies are >> > limited to building track >> > >> where their trains can actually reach, or some >> > other purpose? >> > >> >> > >> -- >> > >> Chris >> > >> >> > >> Please consider the environment before printing >> > this e-mail. >> > >> >> > >> >> > >> On Tue, Aug 27, 2013 at 11:24 PM, Michael >> > Alexander >> > >> <out...@gm... >> > <mailto:out...@gm...>> wrote: >> > >> > Everyone, >> > >> > >> > >> > I'd like to add a check to see if the >> > currently operating company >> > >> > can >> > >> > run from specific MapHex to another. It seems >> > like there should be a >> > >> > way to >> > >> > do this, since a similar calculation would >> > have to be made when >> > >> > determining >> > >> > what MapHexs are eligible to have a tile >> > placed, but I can't seem to >> > >> > figure >> > >> > out how to do it. What am I missing? >> > >> > >> > >> > Thanks, >> > >> > >> > >> > Michael Alexander >> > >> > >> > >> > >> > >> > >> > >> > ------------------------------------------------------------------------------ >> > >> > Learn the latest--Visual Studio 2012, >> > SharePoint 2013, SQL 2012, more! >> > >> > Discover the easy way to master current and >> > previous Microsoft >> > >> > technologies >> > >> > and advance your career. Get an incredible >> > 1,500+ hours of step-by-step >> > >> > tutorial videos with LearnDevNow. Subscribe >> > today and save! >> > >> > >> > >> >> > >> > >http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk >> > <http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk> >> > >> > >> > _______________________________________________ >> > >> > Rails-devel mailing list >> > >> >Rai...@li... >> > <mailto:Rai...@li...> >> > >> >> > >> > >https://lists.sourceforge.net/lists/listinfo/rails-devel >> > <https://lists.sourceforge.net/lists/listinfo/rails-devel> >> > >> > >> > >> >> > >> >> > >> >> > >> > ------------------------------------------------------------------------------ >> > >> Learn the latest--Visual Studio 2012, SharePoint >> > 2013, SQL 2012, more! >> > >> Discover the easy way to master current and >> > previous Microsoft >> > >> technologies >> > >> and advance your career. Get an incredible >> > 1,500+ hours of step-by-step >> > >> tutorial videos with LearnDevNow. Subscribe >> > today and save! >> > >> >> > >> > >>http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk >> > <http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk> >> > >> _______________________________________________ >> > >> Rails-devel mailing list >> > >>Rai...@li... >> > <mailto:Rai...@li...> >> > >> > >>https://lists.sourceforge.net/lists/listinfo/rails-devel >> > <https://lists.sourceforge.net/lists/listinfo/rails-devel> >> > > >> > > >> > > >> > > >> > >> > ------------------------------------------------------------------------------ >> > > Learn the latest--Visual Studio 2012, SharePoint >> > 2013, SQL 2012, more! >> > > Discover the easy way to master current and >> > previous Microsoft technologies >> > > and advance your career. Get an incredible 1,500+ >> > hours of step-by-step >> > > tutorial videos with LearnDevNow. Subscribe today >> > and save! >> > >> > >http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk >> > <http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk> >> > > _______________________________________________ >> > > Rails-devel mailing list >> > >Rai...@li... >> > <mailto:Rai...@li...> >> > >> > >https://lists.sourceforge.net/lists/listinfo/rails-devel >> > <https://lists.sourceforge.net/lists/listinfo/rails-devel> >> > > >> > >> > >> > ------------------------------------------------------------------------------ >> > Learn the latest--Visual Studio 2012, SharePoint >> > 2013, SQL 2012, more! >> > Discover the easy way to master current and previous >> > Microsoft technologies >> > and advance your career. Get an incredible 1,500+ >> > hours of step-by-step >> > tutorial videos with LearnDevNow. Subscribe today >> > and save! >> > >> > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk >> > _______________________________________________ >> > Rails-devel mailing list >> > Rai...@li... >> > <mailto:Rai...@li...> >> > >> > https://lists.sourceforge.net/lists/listinfo/rails-devel >> > >> > >> > >> > >> > ------------------------------------------------------------------------------ >> > Learn the latest--Visual Studio 2012, SharePoint 2013, >> > SQL 2012, more! >> > Discover the easy way to master current and previous >> > Microsoft technologies >> > and advance your career. Get an incredible 1,500+ hours >> > of step-by-step >> > tutorial videos with LearnDevNow. Subscribe today and >> > save! >> > >> > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk >> > _______________________________________________ >> > Rails-devel mailing list >> > Rai...@li... >> > <mailto:Rai...@li...> >> > https://lists.sourceforge.net/lists/listinfo/rails-devel >> > >> > >> > >> > >> > >> > ------------------------------------------------------------------------------ >> > Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, >> > more! >> > Discover the easy way to master current and previous Microsoft >> > technologies >> > and advance your career. Get an incredible 1,500+ hours of >> > step-by-step >> > tutorial videos with LearnDevNow. Subscribe today and save! >> > >> > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk >> > _______________________________________________ >> > Rails-devel mailing list >> > Rai...@li... >> > <mailto:Rai...@li...> >> > https://lists.sourceforge.net/lists/listinfo/rails-devel >> > >> > >> > >> > >> > >> > ------------------------------------------------------------------------------ >> > Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more! >> > Discover the easy way to master current and previous Microsoft >> > technologies >> > and advance your career. Get an incredible 1,500+ hours of step-by-step >> > tutorial videos with LearnDevNow. Subscribe today and save! >> > >> > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk >> > >> > >> > >> > _______________________________________________ >> > Rails-devel mailing list >> > Rai...@li... >> > https://lists.sourceforge.net/lists/listinfo/rails-devel >> > >> >> >> >> ------------------------------------------------------------------------------ >> Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more! >> Discover the easy way to master current and previous Microsoft >> technologies >> and advance your career. Get an incredible 1,500+ hours of step-by-step >> tutorial videos with LearnDevNow. Subscribe today and save! >> >> http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk >> _______________________________________________ >> Rails-devel mailing list >> Rai...@li... >> https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > ------------------------------------------------------------------------------ > Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more! > Discover the easy way to master current and previous Microsoft technologies > and advance your career. Get an incredible 1,500+ hours of step-by-step > tutorial videos with LearnDevNow. Subscribe today and save! > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel > |
From: Stefan F. <ste...@we...> - 2013-09-01 16:16:08
|
So I have to get myself updated on your progress with 1880. Been some time I had a look at it. How do you release your changes to the users currently, as I have not done any new releases for some time now? Documentation of the new features was mainly done by a set of mails to this list. As soon as time permits I will put them together on the wiki, if it still exists after the sourceforge updates. On 09/01/2013 04:29 PM, Michael Alexander wrote: > I'm hesitant to port it immediately, as it's very close (I think) to be > being completely playable under 1.7. We have a couple groups that are > actively playing it right now, they just haven't gotten to the stage > where it doesn't quite work. Maybe in the very short term we can get it > to the stage where they can finish their games, then we could work on > porting it to 2.0. I'm more than willing to help port it to 2.0. > > Is there anything that documents the changes with 2.0? > > Mike > > > On Sun, Sep 1, 2013 at 10:05 AM, Stefan Frey <ste...@we... > <mailto:ste...@we...>> wrote: > > Rails 2.0 has been ready to roll out for an alpha release since > February. I delayed that as I have not found a reasonable time slot > to react on feedback from testers. > > All changes of the Rails1.x branch that happened after the creation of > the Rails2.0 branch were already merged with Rails2.0. > > The only exception are all work done with respect to 1880. > My main issue there is that I have never played 1880, thus I know 1880 > only from the rules. And if I remember correctly there are a few things > which are not easy to implement as they touch areas of the Rails which > might require some re-work. > > That was the long answer. The short-answer is: > > * Test releases from Rails2.0 branch are possible already. > > * I recommend moving 1880 development to Rails2.0 as 1880 > would benefit from upcoming rewrite of the code. > > * If you take care of merging the 1880 changes into Rails2.0, this would > help me a lot. However feel free to ask for help anytime. > > Stefan > > > On 08/29/2013 02:18 PM, Michael Alexander wrote: > > How close is 2.0 to being ready to roll out? Should we be > considering > > moving the 1880_specific branch to be under 2.0? > > > > > > On Thu, Aug 29, 2013 at 6:56 AM, Stefan Frey <ste...@we... > <mailto:ste...@we...> > > <mailto:ste...@we... <mailto:ste...@we...>>> wrote: > > > > You coded against Rail 1.x, this part of the code is upgraded in > > Rails 2.0 branches. > > Especially the connectivity functions are improved. If you > check out > > Rails 2.0 you will realize that it supports full verification of > > tile lays. > > So I suggest that you code that functionally in 2.0 otherwise it > > will most likely duplicate efforts and will not be mergeable. > > > > > > Michael Alexander <out...@gm... > <mailto:out...@gm...> > > <mailto:out...@gm... > <mailto:out...@gm...>>> wrote: > > > > So what I found was that the NetworkIterator stopped at nodes > > that were sinks. If I want to be able to build a graph that > > just tells me that I'm connected and ignores tokens in > the way, > > I think I need to add a setting to NetworkIterator to > tell it if > > it should ignore sinks. As this is a complicated area of the > > code, and it's not limited to the 1880 specific areas, I'd > > appreciate some feedback on my proposed changes: > > > > diff --git a/rails/algorithms/NetworkCompanyGraph.java > > b/rails/algorithms/NetworkCompanyGraph.java > > index bd93113..0e5b2c8 100644 > > --- a/rails/algorithms/NetworkCompanyGraph.java > > +++ b/rails/algorithms/NetworkCompanyGraph.java > > @@ -64,7 +64,8 @@ > > return phase2Graph; > > } > > > > - public SimpleGraph<NetworkVertex, NetworkEdge> > > createRouteGraph(boolean addHQ) { > > + > > + private SimpleGraph<NetworkVertex, NetworkEdge> > > createGraph(boolean addHQ, boolean ignoreSinks) { > > // get mapgraph from builder > > SimpleGraph<NetworkVertex, NetworkEdge> mapGraph = > > graphBuilder.getMapGraph(); > > > > @@ -88,7 +89,7 @@ > > // add connection to graph > > graph.addVertex(vertex); > > graph.addEdge(vertex, hqVertex, new > > NetworkEdge(vertex, hqVertex, false)); > > - NetworkIterator iterator = new > > NetworkIterator(mapGraph, vertex, company); > > + NetworkIterator iterator = new > > NetworkIterator(mapGraph, vertex, company, ignoreSinks); > > for (;iterator.hasNext();) > > vertexes.add(iterator.next()); > > // restore sink property > > @@ -112,6 +113,14 @@ > > return graph; > > } > > > > + public SimpleGraph<NetworkVertex, NetworkEdge> > > createRouteGraph(boolean addHQ) { > > + return createGraph(addHQ, false); > > + } > > + > > + public SimpleGraph<NetworkVertex, NetworkEdge> > > createConnectionGraph(boolean addHQ) { > > + return createGraph(addHQ, true); > > + } > > + > > public List<NetworkVertex> > > getCompanyBaseTokenVertexes(PublicCompanyI company) { > > List<NetworkVertex> vertexes = new > > ArrayList<NetworkVertex>(); > > for (TokenI token:company.getTokens()){ > > diff --git a/rails/algorithms/NetworkIterator.java > > b/rails/algorithms/NetworkIterator.java > > index f4029e8..1adc0a6 100644 > > --- a/rails/algorithms/NetworkIterator.java > > +++ b/rails/algorithms/NetworkIterator.java > > @@ -26,6 +26,7 @@ > > private NetworkVertex startVertex; > > private boolean startVertexVisited; > > private boolean routeIterator; > > + private boolean ignoreSinks; > > > > // internal data > > private List<NetworkVertex> stack = new > > ArrayList<NetworkVertex>(); > > @@ -41,14 +42,14 @@ > > > > public NetworkIterator(Graph<NetworkVertex, > NetworkEdge> > > graph, > > NetworkVertex startVertex) { > > - this(graph, startVertex, null); > > + this(graph, startVertex, null, false); > > } > > > > /** > > * Returns NetworkIterator for specific company > > */ > > public NetworkIterator(Graph<NetworkVertex, > NetworkEdge> > > graph, NetworkVertex startVertex, > > - PublicCompanyI company) { > > + PublicCompanyI company, boolean ignoreSinks) { > > super(); > > > > if (graph == null) > > @@ -61,6 +62,7 @@ > > this.startVertex = startVertex; > > this.startVertexVisited = false; > > this.routeIterator = false; > > + this.ignoreSinks = ignoreSinks; > > } > > > > NetworkIterator setRouteIterator(boolean > routeIterator) { > > @@ -174,7 +176,7 @@ > > > > private void addUnseenChildrenOf(NetworkVertex vertex, > > boolean greedy) { > > > > - if (vertex.isSink()) return; > > + if (vertex.isSink() && (!ignoreSinks)) return; > > log.debug("Iterator: Add unseen children of " + > vertex); > > > > for (NetworkEdge edge : graph.edgesOf(vertex)) { > > diff --git a/rails/algorithms/NetworkVertex.java > > b/rails/algorithms/NetworkVertex.java > > index 91356af..03045b9 100644 > > --- a/rails/algorithms/NetworkVertex.java > > +++ b/rails/algorithms/NetworkVertex.java > > @@ -311,7 +311,7 @@ > > */ > > public static void > > initAllRailsVertices(Graph<NetworkVertex, NetworkEdge> graph, > > PublicCompanyI company, PhaseI phase) { > > - > > + > > // store vertices for removal > > List<NetworkVertex> verticesToRemove = new > > ArrayList<NetworkVertex>(); > > for (NetworkVertex v:graph.vertexSet()) { > > > > > > On Wed, Aug 28, 2013 at 4:52 PM, Michael > > Alexander<out...@gm... > <mailto:out...@gm...> > > <mailto:out...@gm... > <mailto:out...@gm...>>> wrote: > > > > Here's what I ended up with so far: > > > > compA is the private investor > > compB is the company to check to see if there is a > > connection with > > > > PublicCompanyI compA = operatingCompany.get(); > > ... > > NetworkGraphBuilder nwGraph = > > NetworkGraphBuilder.create(gameManager); > > NetworkCompanyGraph companyGraph = > > NetworkCompanyGraph.create(nwGraph, compA); > > SimpleGraph<NetworkVertex, NetworkEdge> > graph = > > companyGraph.createRouteGraph(true); > > Set<NetworkVertex> verticies = > graph.vertexSet(); > > ... > > for (TokenI token : compB.getTokens()) { > > TokenHolder holder = token.getHolder(); > > if (!(holder instanceof Stop)) continue; > > Stop city = (Stop) holder; > > Station station = > city.getRelatedStation(); > > > > for (NetworkVertex vert : verticies) { > > if (vert.getType() == > > NetworkVertex.VertexType.STATION) { > > Station vertStation = > > vert.getStation(); > > if (station == vertStation) { > > // There is a link > between the > > companies! Hooray! > > } > > } > > } > > } > > ... > > > > This seems to work for simple cases, however, I suspect > > (without digging too much) that it will get blocked by > > tokens, which I can't have. I bet it won't be too > hard to > > fix, tho. > > > > Mike > > > > > > > > On Wed, Aug 28, 2013 at 2:38 PM, brett > > lentz<bre...@gm... > <mailto:bre...@gm...> <mailto:bre...@gm... > <mailto:bre...@gm...>>> > > wrote: > > > > In order to do tile rotations, there is already logic > > that is aware of the "exits" of a tile. There's > also the > > route suggestion code. > > > > It might be possible to leverage that same code to > > create a route graph that enables detection of > > destination runs. > > > > It probably needs a fair bit of work to adapt for > this > > purpose, but those are at least places in the code to > > start looking. > > > > ---Brett. > > > > > > ---Brett. > > > > > > On Wed, Aug 28, 2013 at 9:50 AM, Chris > > Shaffer<chr...@gm... > <mailto:chr...@gm...> > > <mailto:chr...@gm... > <mailto:chr...@gm...>>> wrote: > > > > There are games where tokens do block > destinations, > > so whatever code > > you write should allow for that possibility. > There > > are also games > > where connections are considered complete as > soon as > > the tile is laid, > > and others where the check occurs during the > > relevant company's > > operating turn. > > > > -- > > Chris > > > > Please consider the environment before > printing this > > e-mail. > > > > > > On Wed, Aug 28, 2013 at 6:35 AM, Michael > Alexander > > <out...@gm... > <mailto:out...@gm...> > > <mailto:out...@gm... > <mailto:out...@gm...>>> wrote: > > > Both Major Companies in 1856 and Foreign > > Investors in 1880 have the idea of > > > needing to reach a destination. Both are > > implemented by having the game > > > player use a special action to tell the game > > engine that a connection has > > > taken place. Once the connection exists, some > > one time event occurs. It > > > seems like if there is code that could be > used to > > determine if a connection > > > exists, the game could automatically determine > > that without relying on the > > > player to tell it. > > > > > > So I actually want something slightly > different > > than what I said. It's not > > > that the current company can make a run > between > > two hexes that I want to > > > know, it's that a connection exists > (regardless > > of tokens). > > > > > > Mike > > > > > > > > > On Wed, Aug 28, 2013 at 9:28 AM, Chris Shaffer > > <chr...@gm... > <mailto:chr...@gm...> > > <mailto:chr...@gm... > <mailto:chr...@gm...>>> > > > wrote: > > >> > > >> Would this be for games where companies are > > limited to building track > > >> where their trains can actually reach, or > some > > other purpose? > > >> > > >> -- > > >> Chris > > >> > > >> Please consider the environment before > printing > > this e-mail. > > >> > > >> > > >> On Tue, Aug 27, 2013 at 11:24 PM, Michael > Alexander > > >> <out...@gm... > <mailto:out...@gm...> > > <mailto:out...@gm... > <mailto:out...@gm...>>> wrote: > > >> > Everyone, > > >> > > > >> > I'd like to add a check to see if the > > currently operating company > > >> > can > > >> > run from specific MapHex to another. > It seems > > like there should be a > > >> > way to > > >> > do this, since a similar calculation would > > have to be made when > > >> > determining > > >> > what MapHexs are eligible to have a tile > > placed, but I can't seem to > > >> > figure > > >> > out how to do it. What am I missing? > > >> > > > >> > Thanks, > > >> > > > >> > Michael Alexander > > >> > > > >> > > > >> > > > > ------------------------------------------------------------------------------ > > >> > Learn the latest--Visual Studio 2012, > > SharePoint 2013, SQL 2012, more! > > >> > Discover the easy way to master current and > > previous Microsoft > > >> > technologies > > >> > and advance your career. Get an incredible > > 1,500+ hours of step-by-step > > >> > tutorial videos with LearnDevNow. Subscribe > > today and save! > > >> > > > >> > > > >http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk <http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk> > > >> > > _______________________________________________ > > >> > Rails-devel mailing list > > >> >Rai...@li... > <mailto:Rai...@li...> > > <mailto:Rai...@li... > <mailto:Rai...@li...>> > > >> > > > >https://lists.sourceforge.net/lists/listinfo/rails-devel > <https://lists.sourceforge.net/lists/listinfo/rails-devel> > > >> > > > >> > > >> > > >> > > > ------------------------------------------------------------------------------ > > >> Learn the latest--Visual Studio 2012, > SharePoint > > 2013, SQL 2012, more! > > >> Discover the easy way to master current and > > previous Microsoft > > >> technologies > > >> and advance your career. Get an incredible > > 1,500+ hours of step-by-step > > >> tutorial videos with LearnDevNow. Subscribe > > today and save! > > >> > > > >>http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk <http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk> > > >> > _______________________________________________ > > >> Rails-devel mailing list > > >>Rai...@li... > <mailto:Rai...@li...> > > <mailto:Rai...@li... > <mailto:Rai...@li...>> > > > >>https://lists.sourceforge.net/lists/listinfo/rails-devel > <https://lists.sourceforge.net/lists/listinfo/rails-devel> > > > > > > > > > > > > > > > ------------------------------------------------------------------------------ > > > Learn the latest--Visual Studio 2012, > SharePoint > > 2013, SQL 2012, more! > > > Discover the easy way to master current and > > previous Microsoft technologies > > > and advance your career. Get an incredible > 1,500+ > > hours of step-by-step > > > tutorial videos with LearnDevNow. > Subscribe today > > and save! > > > >http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk <http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk> > > > > _______________________________________________ > > > Rails-devel mailing list > > >Rai...@li... > <mailto:Rai...@li...> > > <mailto:Rai...@li... > <mailto:Rai...@li...>> > > > >https://lists.sourceforge.net/lists/listinfo/rails-devel > <https://lists.sourceforge.net/lists/listinfo/rails-devel> > > > > > > > > ------------------------------------------------------------------------------ > > Learn the latest--Visual Studio 2012, SharePoint > > 2013, SQL 2012, more! > > Discover the easy way to master current and > previous > > Microsoft technologies > > and advance your career. Get an incredible 1,500+ > > hours of step-by-step > > tutorial videos with LearnDevNow. Subscribe today > > and save! > > > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk > > _______________________________________________ > > Rails-devel mailing list > > Rai...@li... > <mailto:Rai...@li...> > > <mailto:Rai...@li... > <mailto:Rai...@li...>> > > https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > > > > > > ------------------------------------------------------------------------------ > > Learn the latest--Visual Studio 2012, SharePoint > 2013, > > SQL 2012, more! > > Discover the easy way to master current and previous > > Microsoft technologies > > and advance your career. Get an incredible 1,500+ > hours > > of step-by-step > > tutorial videos with LearnDevNow. Subscribe today > and save! > > > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk > > _______________________________________________ > > Rails-devel mailing list > > Rai...@li... > <mailto:Rai...@li...> > > <mailto:Rai...@li... > <mailto:Rai...@li...>> > > https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > > > > > > > > ------------------------------------------------------------------------------ > > Learn the latest--Visual Studio 2012, SharePoint 2013, SQL > 2012, more! > > Discover the easy way to master current and previous Microsoft > > technologies > > and advance your career. Get an incredible 1,500+ hours of > step-by-step > > tutorial videos with LearnDevNow. Subscribe today and save! > > > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk > > _______________________________________________ > > Rails-devel mailing list > > Rai...@li... > <mailto:Rai...@li...> > > <mailto:Rai...@li... > <mailto:Rai...@li...>> > > https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > > > > > > > > ------------------------------------------------------------------------------ > > Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, > more! > > Discover the easy way to master current and previous Microsoft > technologies > > and advance your career. Get an incredible 1,500+ hours of > step-by-step > > tutorial videos with LearnDevNow. Subscribe today and save! > > > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk > > > > > > > > _______________________________________________ > > Rails-devel mailing list > > Rai...@li... > <mailto:Rai...@li...> > > https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > > ------------------------------------------------------------------------------ > Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more! > Discover the easy way to master current and previous Microsoft > technologies > and advance your career. Get an incredible 1,500+ hours of step-by-step > tutorial videos with LearnDevNow. Subscribe today and save! > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk > _______________________________________________ > Rails-devel mailing list > Rai...@li... > <mailto:Rai...@li...> > https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > > ------------------------------------------------------------------------------ > Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more! > Discover the easy way to master current and previous Microsoft technologies > and advance your career. Get an incredible 1,500+ hours of step-by-step > tutorial videos with LearnDevNow. Subscribe today and save! > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk > > > > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel > |
From: Michael A. <out...@gm...> - 2013-09-01 16:40:05
|
I have not currently released the specific version I'm working on to anyone. I was planning on just making a .jar file and sending it to the group I'm in who are playing, and someone from the other group asked for it as well. Both groups seem interested in the current progress, and it's well known that it's still at an alpha/beta stage. On Sun, Sep 1, 2013 at 12:15 PM, Stefan Frey <ste...@we...> wrote: > So I have to get myself updated on your progress with 1880. > Been some time I had a look at it. > > How do you release your changes to the users currently, as I have not > done any new releases for some time now? > > Documentation of the new features was mainly done by a set of mails > to this list. As soon as time permits I will put them together > on the wiki, if it still exists after the sourceforge updates. > > > > On 09/01/2013 04:29 PM, Michael Alexander wrote: > > I'm hesitant to port it immediately, as it's very close (I think) to be > > being completely playable under 1.7. We have a couple groups that are > > actively playing it right now, they just haven't gotten to the stage > > where it doesn't quite work. Maybe in the very short term we can get it > > to the stage where they can finish their games, then we could work on > > porting it to 2.0. I'm more than willing to help port it to 2.0. > > > > Is there anything that documents the changes with 2.0? > > > > Mike > > > > > > On Sun, Sep 1, 2013 at 10:05 AM, Stefan Frey <ste...@we... > > <mailto:ste...@we...>> wrote: > > > > Rails 2.0 has been ready to roll out for an alpha release since > > February. I delayed that as I have not found a reasonable time slot > > to react on feedback from testers. > > > > All changes of the Rails1.x branch that happened after the creation > of > > the Rails2.0 branch were already merged with Rails2.0. > > > > The only exception are all work done with respect to 1880. > > My main issue there is that I have never played 1880, thus I know > 1880 > > only from the rules. And if I remember correctly there are a few > things > > which are not easy to implement as they touch areas of the Rails > which > > might require some re-work. > > > > That was the long answer. The short-answer is: > > > > * Test releases from Rails2.0 branch are possible already. > > > > * I recommend moving 1880 development to Rails2.0 as 1880 > > would benefit from upcoming rewrite of the code. > > > > * If you take care of merging the 1880 changes into Rails2.0, this > would > > help me a lot. However feel free to ask for help anytime. > > > > Stefan > > > > > > On 08/29/2013 02:18 PM, Michael Alexander wrote: > > > How close is 2.0 to being ready to roll out? Should we be > > considering > > > moving the 1880_specific branch to be under 2.0? > > > > > > > > > On Thu, Aug 29, 2013 at 6:56 AM, Stefan Frey <ste...@we... > > <mailto:ste...@we...> > > > <mailto:ste...@we... <mailto:ste...@we...>>> wrote: > > > > > > You coded against Rail 1.x, this part of the code is upgraded > in > > > Rails 2.0 branches. > > > Especially the connectivity functions are improved. If you > > check out > > > Rails 2.0 you will realize that it supports full verification > of > > > tile lays. > > > So I suggest that you code that functionally in 2.0 otherwise > it > > > will most likely duplicate efforts and will not be mergeable. > > > > > > > > > Michael Alexander <out...@gm... > > <mailto:out...@gm...> > > > <mailto:out...@gm... > > <mailto:out...@gm...>>> wrote: > > > > > > So what I found was that the NetworkIterator stopped at > nodes > > > that were sinks. If I want to be able to build a graph > that > > > just tells me that I'm connected and ignores tokens in > > the way, > > > I think I need to add a setting to NetworkIterator to > > tell it if > > > it should ignore sinks. As this is a complicated area of > the > > > code, and it's not limited to the 1880 specific areas, I'd > > > appreciate some feedback on my proposed changes: > > > > > > diff --git a/rails/algorithms/NetworkCompanyGraph.java > > > b/rails/algorithms/NetworkCompanyGraph.java > > > index bd93113..0e5b2c8 100644 > > > --- a/rails/algorithms/NetworkCompanyGraph.java > > > +++ b/rails/algorithms/NetworkCompanyGraph.java > > > @@ -64,7 +64,8 @@ > > > return phase2Graph; > > > } > > > > > > - public SimpleGraph<NetworkVertex, NetworkEdge> > > > createRouteGraph(boolean addHQ) { > > > + > > > + private SimpleGraph<NetworkVertex, NetworkEdge> > > > createGraph(boolean addHQ, boolean ignoreSinks) { > > > // get mapgraph from builder > > > SimpleGraph<NetworkVertex, NetworkEdge> > mapGraph = > > > graphBuilder.getMapGraph(); > > > > > > @@ -88,7 +89,7 @@ > > > // add connection to graph > > > graph.addVertex(vertex); > > > graph.addEdge(vertex, hqVertex, new > > > NetworkEdge(vertex, hqVertex, false)); > > > - NetworkIterator iterator = new > > > NetworkIterator(mapGraph, vertex, company); > > > + NetworkIterator iterator = new > > > NetworkIterator(mapGraph, vertex, company, ignoreSinks); > > > for (;iterator.hasNext();) > > > vertexes.add(iterator.next()); > > > // restore sink property > > > @@ -112,6 +113,14 @@ > > > return graph; > > > } > > > > > > + public SimpleGraph<NetworkVertex, NetworkEdge> > > > createRouteGraph(boolean addHQ) { > > > + return createGraph(addHQ, false); > > > + } > > > + > > > + public SimpleGraph<NetworkVertex, NetworkEdge> > > > createConnectionGraph(boolean addHQ) { > > > + return createGraph(addHQ, true); > > > + } > > > + > > > public List<NetworkVertex> > > > getCompanyBaseTokenVertexes(PublicCompanyI company) { > > > List<NetworkVertex> vertexes = new > > > ArrayList<NetworkVertex>(); > > > for (TokenI token:company.getTokens()){ > > > diff --git a/rails/algorithms/NetworkIterator.java > > > b/rails/algorithms/NetworkIterator.java > > > index f4029e8..1adc0a6 100644 > > > --- a/rails/algorithms/NetworkIterator.java > > > +++ b/rails/algorithms/NetworkIterator.java > > > @@ -26,6 +26,7 @@ > > > private NetworkVertex startVertex; > > > private boolean startVertexVisited; > > > private boolean routeIterator; > > > + private boolean ignoreSinks; > > > > > > // internal data > > > private List<NetworkVertex> stack = new > > > ArrayList<NetworkVertex>(); > > > @@ -41,14 +42,14 @@ > > > > > > public NetworkIterator(Graph<NetworkVertex, > > NetworkEdge> > > > graph, > > > NetworkVertex startVertex) { > > > - this(graph, startVertex, null); > > > + this(graph, startVertex, null, false); > > > } > > > > > > /** > > > * Returns NetworkIterator for specific company > > > */ > > > public NetworkIterator(Graph<NetworkVertex, > > NetworkEdge> > > > graph, NetworkVertex startVertex, > > > - PublicCompanyI company) { > > > + PublicCompanyI company, boolean ignoreSinks) > { > > > super(); > > > > > > if (graph == null) > > > @@ -61,6 +62,7 @@ > > > this.startVertex = startVertex; > > > this.startVertexVisited = false; > > > this.routeIterator = false; > > > + this.ignoreSinks = ignoreSinks; > > > } > > > > > > NetworkIterator setRouteIterator(boolean > > routeIterator) { > > > @@ -174,7 +176,7 @@ > > > > > > private void addUnseenChildrenOf(NetworkVertex > vertex, > > > boolean greedy) { > > > > > > - if (vertex.isSink()) return; > > > + if (vertex.isSink() && (!ignoreSinks)) return; > > > log.debug("Iterator: Add unseen children of " + > > vertex); > > > > > > for (NetworkEdge edge : graph.edgesOf(vertex)) { > > > diff --git a/rails/algorithms/NetworkVertex.java > > > b/rails/algorithms/NetworkVertex.java > > > index 91356af..03045b9 100644 > > > --- a/rails/algorithms/NetworkVertex.java > > > +++ b/rails/algorithms/NetworkVertex.java > > > @@ -311,7 +311,7 @@ > > > */ > > > public static void > > > initAllRailsVertices(Graph<NetworkVertex, NetworkEdge> > graph, > > > PublicCompanyI company, PhaseI phase) { > > > - > > > + > > > // store vertices for removal > > > List<NetworkVertex> verticesToRemove = new > > > ArrayList<NetworkVertex>(); > > > for (NetworkVertex v:graph.vertexSet()) { > > > > > > > > > On Wed, Aug 28, 2013 at 4:52 PM, Michael > > > Alexander<out...@gm... > > <mailto:out...@gm...> > > > <mailto:out...@gm... > > <mailto:out...@gm...>>> wrote: > > > > > > Here's what I ended up with so far: > > > > > > compA is the private investor > > > compB is the company to check to see if there is > a > > > connection with > > > > > > PublicCompanyI compA = > operatingCompany.get(); > > > ... > > > NetworkGraphBuilder nwGraph = > > > NetworkGraphBuilder.create(gameManager); > > > NetworkCompanyGraph companyGraph = > > > NetworkCompanyGraph.create(nwGraph, compA); > > > SimpleGraph<NetworkVertex, NetworkEdge> > > graph = > > > companyGraph.createRouteGraph(true); > > > Set<NetworkVertex> verticies = > > graph.vertexSet(); > > > ... > > > for (TokenI token : compB.getTokens()) { > > > TokenHolder holder = > token.getHolder(); > > > if (!(holder instanceof Stop)) > continue; > > > Stop city = (Stop) holder; > > > Station station = > > city.getRelatedStation(); > > > > > > for (NetworkVertex vert : verticies) > { > > > if (vert.getType() == > > > NetworkVertex.VertexType.STATION) { > > > Station vertStation = > > > vert.getStation(); > > > if (station == vertStation) { > > > // There is a link > > between the > > > companies! Hooray! > > > } > > > } > > > } > > > } > > > ... > > > > > > This seems to work for simple cases, however, I > suspect > > > (without digging too much) that it will get blocked by > > > tokens, which I can't have. I bet it won't be too > > hard to > > > fix, tho. > > > > > > Mike > > > > > > > > > > > > On Wed, Aug 28, 2013 at 2:38 PM, brett > > > lentz<bre...@gm... > > <mailto:bre...@gm...> <mailto:bre...@gm... > > <mailto:bre...@gm...>>> > > > wrote: > > > > > > In order to do tile rotations, there is already > logic > > > that is aware of the "exits" of a tile. There's > > also the > > > route suggestion code. > > > > > > It might be possible to leverage that same code to > > > create a route graph that enables detection of > > > destination runs. > > > > > > It probably needs a fair bit of work to adapt for > > this > > > purpose, but those are at least places in the > code to > > > start looking. > > > > > > ---Brett. > > > > > > > > > ---Brett. > > > > > > > > > On Wed, Aug 28, 2013 at 9:50 AM, Chris > > > Shaffer<chr...@gm... > > <mailto:chr...@gm...> > > > <mailto:chr...@gm... > > <mailto:chr...@gm...>>> wrote: > > > > > > There are games where tokens do block > > destinations, > > > so whatever code > > > you write should allow for that possibility. > > There > > > are also games > > > where connections are considered complete as > > soon as > > > the tile is laid, > > > and others where the check occurs during the > > > relevant company's > > > operating turn. > > > > > > -- > > > Chris > > > > > > Please consider the environment before > > printing this > > > e-mail. > > > > > > > > > On Wed, Aug 28, 2013 at 6:35 AM, Michael > > Alexander > > > <out...@gm... > > <mailto:out...@gm...> > > > <mailto:out...@gm... > > <mailto:out...@gm...>>> wrote: > > > > Both Major Companies in 1856 and Foreign > > > Investors in 1880 have the idea of > > > > needing to reach a destination. Both are > > > implemented by having the game > > > > player use a special action to tell the > game > > > engine that a connection has > > > > taken place. Once the connection exists, > some > > > one time event occurs. It > > > > seems like if there is code that could be > > used to > > > determine if a connection > > > > exists, the game could automatically > determine > > > that without relying on the > > > > player to tell it. > > > > > > > > So I actually want something slightly > > different > > > than what I said. It's not > > > > that the current company can make a run > > between > > > two hexes that I want to > > > > know, it's that a connection exists > > (regardless > > > of tokens). > > > > > > > > Mike > > > > > > > > > > > > On Wed, Aug 28, 2013 at 9:28 AM, Chris > Shaffer > > > <chr...@gm... > > <mailto:chr...@gm...> > > > <mailto:chr...@gm... > > <mailto:chr...@gm...>>> > > > > wrote: > > > >> > > > >> Would this be for games where companies > are > > > limited to building track > > > >> where their trains can actually reach, or > > some > > > other purpose? > > > >> > > > >> -- > > > >> Chris > > > >> > > > >> Please consider the environment before > > printing > > > this e-mail. > > > >> > > > >> > > > >> On Tue, Aug 27, 2013 at 11:24 PM, Michael > > Alexander > > > >> <out...@gm... > > <mailto:out...@gm...> > > > <mailto:out...@gm... > > <mailto:out...@gm...>>> wrote: > > > >> > Everyone, > > > >> > > > > >> > I'd like to add a check to see if > the > > > currently operating company > > > >> > can > > > >> > run from specific MapHex to another. > > It seems > > > like there should be a > > > >> > way to > > > >> > do this, since a similar calculation > would > > > have to be made when > > > >> > determining > > > >> > what MapHexs are eligible to have a tile > > > placed, but I can't seem to > > > >> > figure > > > >> > out how to do it. What am I missing? > > > >> > > > > >> > Thanks, > > > >> > > > > >> > Michael Alexander > > > >> > > > > >> > > > > >> > > > > > > > ------------------------------------------------------------------------------ > > > >> > Learn the latest--Visual Studio 2012, > > > SharePoint 2013, SQL 2012, more! > > > >> > Discover the easy way to master current > and > > > previous Microsoft > > > >> > technologies > > > >> > and advance your career. Get an > incredible > > > 1,500+ hours of step-by-step > > > >> > tutorial videos with LearnDevNow. > Subscribe > > > today and save! > > > >> > > > > >> > > > > > > > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk< > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk > > > > > >> > > > _______________________________________________ > > > >> > Rails-devel mailing list > > > >> >Rai...@li... > > <mailto:Rai...@li...> > > > <mailto:Rai...@li... > > <mailto:Rai...@li...>> > > > >> > > > > > >https://lists.sourceforge.net/lists/listinfo/rails-devel > > <https://lists.sourceforge.net/lists/listinfo/rails-devel> > > > >> > > > > >> > > > >> > > > >> > > > > > > ------------------------------------------------------------------------------ > > > >> Learn the latest--Visual Studio 2012, > > SharePoint > > > 2013, SQL 2012, more! > > > >> Discover the easy way to master current > and > > > previous Microsoft > > > >> technologies > > > >> and advance your career. Get an incredible > > > 1,500+ hours of step-by-step > > > >> tutorial videos with LearnDevNow. > Subscribe > > > today and save! > > > >> > > > > > >> > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk< > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk > > > > > >> > > _______________________________________________ > > > >> Rails-devel mailing list > > > >>Rai...@li... > > <mailto:Rai...@li...> > > > <mailto:Rai...@li... > > <mailto:Rai...@li...>> > > > > > >>https://lists.sourceforge.net/lists/listinfo/rails-devel > > <https://lists.sourceforge.net/lists/listinfo/rails-devel> > > > > > > > > > > > > > > > > > > > > > > ------------------------------------------------------------------------------ > > > > Learn the latest--Visual Studio 2012, > > SharePoint > > > 2013, SQL 2012, more! > > > > Discover the easy way to master current and > > > previous Microsoft technologies > > > > and advance your career. Get an incredible > > 1,500+ > > > hours of step-by-step > > > > tutorial videos with LearnDevNow. > > Subscribe today > > > and save! > > > > > > > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk< > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk > > > > > > > > _______________________________________________ > > > > Rails-devel mailing list > > > >Rai...@li... > > <mailto:Rai...@li...> > > > <mailto:Rai...@li... > > <mailto:Rai...@li...>> > > > > > >https://lists.sourceforge.net/lists/listinfo/rails-devel > > <https://lists.sourceforge.net/lists/listinfo/rails-devel> > > > > > > > > > > > > > ------------------------------------------------------------------------------ > > > Learn the latest--Visual Studio 2012, > SharePoint > > > 2013, SQL 2012, more! > > > Discover the easy way to master current and > > previous > > > Microsoft technologies > > > and advance your career. Get an incredible > 1,500+ > > > hours of step-by-step > > > tutorial videos with LearnDevNow. Subscribe > today > > > and save! > > > > > > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk > > > > _______________________________________________ > > > Rails-devel mailing list > > > Rai...@li... > > <mailto:Rai...@li...> > > > <mailto:Rai...@li... > > <mailto:Rai...@li...>> > > > https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > > > > > > > > > > > > ------------------------------------------------------------------------------ > > > Learn the latest--Visual Studio 2012, SharePoint > > 2013, > > > SQL 2012, more! > > > Discover the easy way to master current and > previous > > > Microsoft technologies > > > and advance your career. Get an incredible 1,500+ > > hours > > > of step-by-step > > > tutorial videos with LearnDevNow. Subscribe today > > and save! > > > > > > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk > > > _______________________________________________ > > > Rails-devel mailing list > > > Rai...@li... > > <mailto:Rai...@li...> > > > <mailto:Rai...@li... > > <mailto:Rai...@li...>> > > > https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > > > > > > > > > > > > > > > ------------------------------------------------------------------------------ > > > Learn the latest--Visual Studio 2012, SharePoint 2013, SQL > > 2012, more! > > > Discover the easy way to master current and previous Microsoft > > > technologies > > > and advance your career. Get an incredible 1,500+ hours of > > step-by-step > > > tutorial videos with LearnDevNow. Subscribe today and save! > > > > > > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk > > > _______________________________________________ > > > Rails-devel mailing list > > > Rai...@li... > > <mailto:Rai...@li...> > > > <mailto:Rai...@li... > > <mailto:Rai...@li...>> > > > https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > > > > > > > > > > > > > > > ------------------------------------------------------------------------------ > > > Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, > > more! > > > Discover the easy way to master current and previous Microsoft > > technologies > > > and advance your career. Get an incredible 1,500+ hours of > > step-by-step > > > tutorial videos with LearnDevNow. Subscribe today and save! > > > > > > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk > > > > > > > > > > > > _______________________________________________ > > > Rails-devel mailing list > > > Rai...@li... > > <mailto:Rai...@li...> > > > https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > > > > > > > ------------------------------------------------------------------------------ > > Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, > more! > > Discover the easy way to master current and previous Microsoft > > technologies > > and advance your career. Get an incredible 1,500+ hours of > step-by-step > > tutorial videos with LearnDevNow. Subscribe today and save! > > > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk > > _______________________________________________ > > Rails-devel mailing list > > Rai...@li... > > <mailto:Rai...@li...> > > https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > > > > > > > > ------------------------------------------------------------------------------ > > Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more! > > Discover the easy way to master current and previous Microsoft > technologies > > and advance your career. Get an incredible 1,500+ hours of step-by-step > > tutorial videos with LearnDevNow. Subscribe today and save! > > > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk > > > > > > > > _______________________________________________ > > Rails-devel mailing list > > Rai...@li... > > https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > > > ------------------------------------------------------------------------------ > Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more! > Discover the easy way to master current and previous Microsoft technologies > and advance your career. Get an incredible 1,500+ hours of step-by-step > tutorial videos with LearnDevNow. Subscribe today and save! > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel > |
From: Martin B. <dr....@t-...> - 2013-09-01 17:26:42
Attachments:
signature.asc
|
Am 01.09.2013 18:39, schrieb Michael Alexander: > I have not currently released the specific version I'm working on to > anyone. I was planning on just making a .jar file and sending it to > the group I'm in who are playing, and someone from the other group > asked for it as well. Both groups seem interested in the current > progress, and it's well known that it's still at an alpha/beta stage. > > > On Sun, Sep 1, 2013 at 12:15 PM, Stefan Frey <ste...@we... > <mailto:ste...@we...>> wrote: > > So I have to get myself updated on your progress with 1880. > Been some time I had a look at it. > > How do you release your changes to the users currently, as I have not > done any new releases for some time now? > > Documentation of the new features was mainly done by a set of mails > to this list. As soon as time permits I will put them together > on the wiki, if it still exists after the sourceforge updates. > Hello Stefan & Michael, releases for 1880 are currently based on 1.7.12. I have merged the 1880_specific into the 1.7.12 stream. I'll try to merge that locally into the 2.0 dev-stream tonight. I'll incorporate Michaels Fixes to the 1880_specific before that though. The release process is handled by myself building the ZIP-File locally and put that into a public dropbox share as i dont have admin access to sourceforge-rails currently. Regadrs, Martin |
From: Stefan F. <ste...@we...> - 2013-09-01 19:38:46
|
Hi Martin, merging changes from Rails1.x into Rails 2.0 is a non-trivial task, especially if you have sub-classed Round classes. Please let me review the code of the 1880 branch and then decide how to proceed. Otherwise I fear you will spend a lot of time with no progress or more likely even breaking something. Stefan On 09/01/2013 07:26 PM, Martin Brumm wrote: > Am 01.09.2013 18:39, schrieb Michael Alexander: >> I have not currently released the specific version I'm working on to >> anyone. I was planning on just making a .jar file and sending it to >> the group I'm in who are playing, and someone from the other group >> asked for it as well. Both groups seem interested in the current >> progress, and it's well known that it's still at an alpha/beta stage. >> >> >> On Sun, Sep 1, 2013 at 12:15 PM, Stefan Frey <ste...@we... >> <mailto:ste...@we...>> wrote: >> >> So I have to get myself updated on your progress with 1880. >> Been some time I had a look at it. >> >> How do you release your changes to the users currently, as I have not >> done any new releases for some time now? >> >> Documentation of the new features was mainly done by a set of mails >> to this list. As soon as time permits I will put them together >> on the wiki, if it still exists after the sourceforge updates. >> > > Hello Stefan & Michael, > > releases for 1880 are currently based on 1.7.12. I have merged the > 1880_specific into the 1.7.12 stream. > > I'll try to merge that locally into the 2.0 dev-stream tonight. I'll > incorporate Michaels Fixes to the 1880_specific before that though. > > The release process is handled by myself building the ZIP-File locally > and put that into a public dropbox share as i dont have admin access to > sourceforge-rails currently. > > Regadrs, Martin > > > > > ------------------------------------------------------------------------------ > Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more! > Discover the easy way to master current and previous Microsoft technologies > and advance your career. Get an incredible 1,500+ hours of step-by-step > tutorial videos with LearnDevNow. Subscribe today and save! > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk > > > > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel > |
From: Michael A. <out...@gm...> - 2013-09-01 22:48:44
|
How do I make the .jar file? I ran "build.xml" with ant from eclipse, and got the following in the console: Buildfile: C:\Documents and Settings\Michael\git\code\build.xml Duplicated project name in import. Project Rails defined first in C:\Documents and Settings\Michael\git\code\build.xml and again in C:\Documents and Settings\Michael\git\code\buildRails.xml build-subprojects: init: [copy] Copying 1403 files to C:\Documents and Settings\Michael\git\code\classes build-project: [echo] Rails: C:\Documents and Settings\Michael\git\code\build.xml [javac] C:\Documents and Settings\Michael\git\code\build.xml:99: warning: 'includeantruntime' was not set, defaulting to build.sysclasspath=last; set to false for repeatable builds [javac] Compiling 3 source files to C:\Documents and Settings\Michael\git\code\classes build: BUILD SUCCESSFUL Total time: 41 seconds But I don't appear to have a jar... On Sun, Sep 1, 2013 at 3:38 PM, Stefan Frey <ste...@we...> wrote: > Hi Martin, > merging changes from Rails1.x into Rails 2.0 is a non-trivial task, > especially if you have sub-classed Round classes. > > Please let me review the code of the 1880 branch and then decide how to > proceed. Otherwise I fear you will spend a lot of time with no progress > or more likely even breaking something. > > Stefan > > On 09/01/2013 07:26 PM, Martin Brumm wrote: > > Am 01.09.2013 18:39, schrieb Michael Alexander: > >> I have not currently released the specific version I'm working on to > >> anyone. I was planning on just making a .jar file and sending it to > >> the group I'm in who are playing, and someone from the other group > >> asked for it as well. Both groups seem interested in the current > >> progress, and it's well known that it's still at an alpha/beta stage. > >> > >> > >> On Sun, Sep 1, 2013 at 12:15 PM, Stefan Frey <ste...@we... > >> <mailto:ste...@we...>> wrote: > >> > >> So I have to get myself updated on your progress with 1880. > >> Been some time I had a look at it. > >> > >> How do you release your changes to the users currently, as I have > not > >> done any new releases for some time now? > >> > >> Documentation of the new features was mainly done by a set of mails > >> to this list. As soon as time permits I will put them together > >> on the wiki, if it still exists after the sourceforge updates. > >> > > > > Hello Stefan & Michael, > > > > releases for 1880 are currently based on 1.7.12. I have merged the > > 1880_specific into the 1.7.12 stream. > > > > I'll try to merge that locally into the 2.0 dev-stream tonight. I'll > > incorporate Michaels Fixes to the 1880_specific before that though. > > > > The release process is handled by myself building the ZIP-File locally > > and put that into a public dropbox share as i dont have admin access to > > sourceforge-rails currently. > > > > Regadrs, Martin > > > > > > > > > > > ------------------------------------------------------------------------------ > > Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more! > > Discover the easy way to master current and previous Microsoft > technologies > > and advance your career. Get an incredible 1,500+ hours of step-by-step > > tutorial videos with LearnDevNow. Subscribe today and save! > > > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk > > > > > > > > _______________________________________________ > > Rails-devel mailing list > > Rai...@li... > > https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > > > ------------------------------------------------------------------------------ > Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more! > Discover the easy way to master current and previous Microsoft technologies > and advance your career. Get an incredible 1,500+ hours of step-by-step > tutorial videos with LearnDevNow. Subscribe today and save! > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel > |
From: Stefan F. <ste...@we...> - 2013-09-02 12:14:29
|
Wiki contains information on creating a jar and other issues for releases: http://sourceforge.net/apps/mediawiki/rails/index.php?title=Release_Management However it is not fully up-to-date, as all steps are automated and available from ant: You should only use the following targets from the ant-script: (Choose via Run As => Ant Build ..., scroll down, those are the last of the available targets) * build_release: Builds the jar and puts it inside of zip and tar archives. * publish_release: Transfer it to sourceforge. * clean_release: Clean up after publish. I will update the wiki tonight. Please report any issues, as I use a Linux setup which might differ in some nasty bits from Windows. Or to be more precise: vice versa ;-)v On 09/02/2013 12:48 AM, Michael Alexander wrote: > How do I make the .jar file? I ran "build.xml" with ant from eclipse, > and got the following in the console: > > Buildfile: C:\Documents and Settings\Michael\git\code\build.xml > Duplicated project name in import. Project Rails defined first in > C:\Documents and Settings\Michael\git\code\build.xml and again in > C:\Documents and Settings\Michael\git\code\buildRails.xml > build-subprojects: > init: > [copy] Copying 1403 files to C:\Documents and > Settings\Michael\git\code\classes > build-project: > [echo] Rails: C:\Documents and Settings\Michael\git\code\build.xml > [javac] C:\Documents and Settings\Michael\git\code\build.xml:99: > warning: 'includeantruntime' was not set, defaulting to > build.sysclasspath=last; set to false for repeatable builds > [javac] Compiling 3 source files to C:\Documents and > Settings\Michael\git\code\classes > build: > BUILD SUCCESSFUL > Total time: 41 seconds > > > But I don't appear to have a jar... > > > On Sun, Sep 1, 2013 at 3:38 PM, Stefan Frey <ste...@we... > <mailto:ste...@we...>> wrote: > > Hi Martin, > merging changes from Rails1.x into Rails 2.0 is a non-trivial task, > especially if you have sub-classed Round classes. > > Please let me review the code of the 1880 branch and then decide how to > proceed. Otherwise I fear you will spend a lot of time with no progress > or more likely even breaking something. > > Stefan > > On 09/01/2013 07:26 PM, Martin Brumm wrote: > > Am 01.09.2013 18:39, schrieb Michael Alexander: > >> I have not currently released the specific version I'm working on to > >> anyone. I was planning on just making a .jar file and sending it to > >> the group I'm in who are playing, and someone from the other group > >> asked for it as well. Both groups seem interested in the current > >> progress, and it's well known that it's still at an alpha/beta > stage. > >> > >> > >> On Sun, Sep 1, 2013 at 12:15 PM, Stefan Frey <ste...@we... > <mailto:ste...@we...> > >> <mailto:ste...@we... <mailto:ste...@we...>>> wrote: > >> > >> So I have to get myself updated on your progress with 1880. > >> Been some time I had a look at it. > >> > >> How do you release your changes to the users currently, as I > have not > >> done any new releases for some time now? > >> > >> Documentation of the new features was mainly done by a set > of mails > >> to this list. As soon as time permits I will put them together > >> on the wiki, if it still exists after the sourceforge updates. > >> > > > > Hello Stefan & Michael, > > > > releases for 1880 are currently based on 1.7.12. I have merged the > > 1880_specific into the 1.7.12 stream. > > > > I'll try to merge that locally into the 2.0 dev-stream tonight. I'll > > incorporate Michaels Fixes to the 1880_specific before that though. > > > > The release process is handled by myself building the ZIP-File > locally > > and put that into a public dropbox share as i dont have admin > access to > > sourceforge-rails currently. > > > > Regadrs, Martin > > > > > > > > > > > ------------------------------------------------------------------------------ > > Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, > more! > > Discover the easy way to master current and previous Microsoft > technologies > > and advance your career. Get an incredible 1,500+ hours of > step-by-step > > tutorial videos with LearnDevNow. Subscribe today and save! > > > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk > > > > > > > > _______________________________________________ > > Rails-devel mailing list > > Rai...@li... > <mailto:Rai...@li...> > > https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > > ------------------------------------------------------------------------------ > Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more! > Discover the easy way to master current and previous Microsoft > technologies > and advance your career. Get an incredible 1,500+ hours of step-by-step > tutorial videos with LearnDevNow. Subscribe today and save! > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk > _______________________________________________ > Rails-devel mailing list > Rai...@li... > <mailto:Rai...@li...> > https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > > ------------------------------------------------------------------------------ > Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more! > Discover the easy way to master current and previous Microsoft technologies > and advance your career. Get an incredible 1,500+ hours of step-by-step > tutorial videos with LearnDevNow. Subscribe today and save! > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk > > > > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel > |
From: Michael A. <out...@gm...> - 2013-09-02 13:26:50
|
That worked great, even on my windows box. ;) I had been looking this page instead: http://sourceforge.net/apps/mediawiki/rails/index.php?title=Building_the_JAR which is why I was confused. On Mon, Sep 2, 2013 at 8:14 AM, Stefan Frey <ste...@we...> wrote: > Wiki contains information on creating a jar and other issues for releases: > > > http://sourceforge.net/apps/mediawiki/rails/index.php?title=Release_Management > > However it is not fully up-to-date, as all steps are automated and > available from ant: > > You should only use the following targets from the ant-script: > (Choose via Run As => Ant Build ..., scroll down, those are the last > of the available targets) > > * build_release: Builds the jar and puts it inside of zip and tar archives. > > * publish_release: Transfer it to sourceforge. > > * clean_release: Clean up after publish. > > I will update the wiki tonight. > > Please report any issues, as I use a Linux setup which might differ in > some nasty bits from Windows. Or to be more precise: vice versa ;-)v > > > On 09/02/2013 12:48 AM, Michael Alexander wrote: > > How do I make the .jar file? I ran "build.xml" with ant from eclipse, > > and got the following in the console: > > > > Buildfile: C:\Documents and Settings\Michael\git\code\build.xml > > Duplicated project name in import. Project Rails defined first in > > C:\Documents and Settings\Michael\git\code\build.xml and again in > > C:\Documents and Settings\Michael\git\code\buildRails.xml > > build-subprojects: > > init: > > [copy] Copying 1403 files to C:\Documents and > > Settings\Michael\git\code\classes > > build-project: > > [echo] Rails: C:\Documents and Settings\Michael\git\code\build.xml > > [javac] C:\Documents and Settings\Michael\git\code\build.xml:99: > > warning: 'includeantruntime' was not set, defaulting to > > build.sysclasspath=last; set to false for repeatable builds > > [javac] Compiling 3 source files to C:\Documents and > > Settings\Michael\git\code\classes > > build: > > BUILD SUCCESSFUL > > Total time: 41 seconds > > > > > > But I don't appear to have a jar... > > > > > > On Sun, Sep 1, 2013 at 3:38 PM, Stefan Frey <ste...@we... > > <mailto:ste...@we...>> wrote: > > > > Hi Martin, > > merging changes from Rails1.x into Rails 2.0 is a non-trivial task, > > especially if you have sub-classed Round classes. > > > > Please let me review the code of the 1880 branch and then decide how > to > > proceed. Otherwise I fear you will spend a lot of time with no > progress > > or more likely even breaking something. > > > > Stefan > > > > On 09/01/2013 07:26 PM, Martin Brumm wrote: > > > Am 01.09.2013 18:39, schrieb Michael Alexander: > > >> I have not currently released the specific version I'm working > on to > > >> anyone. I was planning on just making a .jar file and sending > it to > > >> the group I'm in who are playing, and someone from the other > group > > >> asked for it as well. Both groups seem interested in the current > > >> progress, and it's well known that it's still at an alpha/beta > > stage. > > >> > > >> > > >> On Sun, Sep 1, 2013 at 12:15 PM, Stefan Frey <ste...@we... > > <mailto:ste...@we...> > > >> <mailto:ste...@we... <mailto:ste...@we...>>> wrote: > > >> > > >> So I have to get myself updated on your progress with 1880. > > >> Been some time I had a look at it. > > >> > > >> How do you release your changes to the users currently, as I > > have not > > >> done any new releases for some time now? > > >> > > >> Documentation of the new features was mainly done by a set > > of mails > > >> to this list. As soon as time permits I will put them > together > > >> on the wiki, if it still exists after the sourceforge > updates. > > >> > > > > > > Hello Stefan & Michael, > > > > > > releases for 1880 are currently based on 1.7.12. I have merged the > > > 1880_specific into the 1.7.12 stream. > > > > > > I'll try to merge that locally into the 2.0 dev-stream tonight. > I'll > > > incorporate Michaels Fixes to the 1880_specific before that > though. > > > > > > The release process is handled by myself building the ZIP-File > > locally > > > and put that into a public dropbox share as i dont have admin > > access to > > > sourceforge-rails currently. > > > > > > Regadrs, Martin > > > > > > > > > > > > > > > > > > ------------------------------------------------------------------------------ > > > Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, > > more! > > > Discover the easy way to master current and previous Microsoft > > technologies > > > and advance your career. Get an incredible 1,500+ hours of > > step-by-step > > > tutorial videos with LearnDevNow. Subscribe today and save! > > > > > > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk > > > > > > > > > > > > _______________________________________________ > > > Rails-devel mailing list > > > Rai...@li... > > <mailto:Rai...@li...> > > > https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > > > > > > > ------------------------------------------------------------------------------ > > Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, > more! > > Discover the easy way to master current and previous Microsoft > > technologies > > and advance your career. Get an incredible 1,500+ hours of > step-by-step > > tutorial videos with LearnDevNow. Subscribe today and save! > > > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk > > _______________________________________________ > > Rails-devel mailing list > > Rai...@li... > > <mailto:Rai...@li...> > > https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > > > > > > > > ------------------------------------------------------------------------------ > > Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more! > > Discover the easy way to master current and previous Microsoft > technologies > > and advance your career. Get an incredible 1,500+ hours of step-by-step > > tutorial videos with LearnDevNow. Subscribe today and save! > > > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk > > > > > > > > _______________________________________________ > > Rails-devel mailing list > > Rai...@li... > > https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > > > ------------------------------------------------------------------------------ > Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more! > Discover the easy way to master current and previous Microsoft technologies > and advance your career. Get an incredible 1,500+ hours of step-by-step > tutorial videos with LearnDevNow. Subscribe today and save! > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel > |