Re: [Rails-devel] Rails_2_develop vs 1.8.7

[Martin B. <dr....@t-...>]

Am 16.02.2014 15:51, schrieb Stefan Frey:
> Martin & Mike:
> I have some troubles with the rails_2_develop_1880 branch: On my system 
> there are several compile errors (12) in this branch, that do not seem 
> to be linked to the issue discussed below.
> Are you sure you pushed everything to this branch?
> Stefan
>
> On 02/10/2014 02:58 PM, Michael Alexander wrote:
>> The reason I did that originally was to determine when a foreign
>> investor was connected to it's parent company.  I was having trouble
>> with the existing implementation because it was "connecting" through an
>> off-map station (going in one side and out the other).  I had thought at
>> the time that there was no other way I could do it.
>>
>> As it turns out, a handful of weeks after that, I noticed that the
>> off-map station was defined wrong in the XML.  I suspect that once it
>> was defined correctly (which I did), that the original
>> NetworkCompanyGraph would have worked - but I wasn't sure it was worth
>> changing it back until 2.0.
>>
>> The function that has to work is Investor_1880::isConnectedtoLinkedCompany()
>>
>> Mike
>>
>>
>>
>>
>> On Mon, Feb 10, 2014 at 5:17 AM, Stefan Frey <ste...@we...
>> <mailto:ste...@we...>> wrote:
>>
>>     Martin & Mike:
>>     I can do later today, however could someone of you remind me for what
>>     reason you have sub-classed NetworkCompanyGraph? I have done some
>>     changes in Rails 2.0 to those classes to support tile laying and usually
>>     it is better to use the interfaces (here most likely the
>>     NetworkGraphModifier) instead of sub-classes.
>>     Stefan
>>
>>
>>     On 02/09/2014 11:31 PM, Michael Alexander wrote:
>>      > I'll take a look, but it will probably not be until mid-week.
>>      >
>>      > Mike
>>      >
>>      >
>>      > On Sun, Feb 9, 2014 at 2:53 PM, Martin Brumm
>>      > <dr....@t-... <mailto:dr....@t-...>
>>     <mailto:dr....@t-...
>>     <mailto:dr....@t-...>>> wrote:
>>      >
>>      >     Hi Stefan, Brett, Erik, Mike & Rest of the crew,
>>      >
>>      >     i created a branch of Rails_2_develop called
>>     Rails_2_develop_1880 since
>>      >     i didnt want to mess with Stefans work.
>>      >     In that branch if i assume right that Stefan started from
>>     1.7.12 with
>>      >     his work in Rails_2_develop everything but some local side
>>     projects by
>>      >     me (1824, 1837) has been rebased from 1.8.7+ on Rails 2.0.
>>     Three bugs
>>      >     remain that i cant fix with my current understanding of the
>>     Network
>>      >     Code :).
>>      >
>>      >          public SimpleGraph<NetworkVertex, NetworkEdge>
>>      >     createConnectionGraph(boolean addHQ) {
>>      >
>>      >     in NetworkCompanyGraph_1880 contains 3 bug indications. If
>>     anyone so
>>      >     brave could have a look at the code and fix that, it should
>>     be ready for
>>      >     extensive testing with a number of save files :)
>>      >
>>      >     Kind Regards,
>>      >     Martin
>>      >
>>      >
>>      >
>>

Good Evening,

@Stefan: I found in my migration effort that certain Fixes/Enhancement
Erik had done to the basis code to enable flexible handling of player
ordering (reordering the seating of players) had not been pushed to the
rails 2 branch, you probably cherry picked the fixes and didnt transport
the 1880 related improvements at that time.

The compile errors come mostly from that parts thats currently in
migration into the 2_develop_1880 branch.

I didnt have enough time this weekend to fix everything there. Hopefully
i'll find some time tonight or on the week.
Reason why i pushed that code is, i use different machines to work
during weekdays or weekends on that branch.

Regards,
Martin