[Freeciv-Dev] Re: [Patch] CMA2.0

[Gregory Berkolaiko <gberkolaiko@xxxxxxxxxxx>]

 --- Raimar Falke <hawk@xxxxxxxxxxxxxxxxxxxxxxx> wrote: 
> 
> The client doesn't had enough information: the trade route values were
> calculated wrong. Please test attached patch.
> 
>       Raimar

Tried your patch + (patch on patch).
Looks very nice, but aborts on large cities (>3 ?)
===========================================
2: sizeof(struct cma_result)=62
2: sizeof(struct combination)=196
2: sizeof(cache2)=81008
2: sizeof(cache3)=329296
civclient: citizen_management.c:637: update_cache2: Assertion
`p->production == result->production[5] && p->surplus ==
result->surplus[5]' failed.   
===========================================
#0  0x402b14e1 in __kill () from /lib/libc.so.6
#1  0x402b1156 in raise (sig=6) at ../sysdeps/posix/raise.c:27
#2  0x402b2868 in abort () at ../sysdeps/generic/abort.c:88
#3  0x402ab3ce in __assert_fail (
    assertion=0x80ca3a0 "p->production == result->production[5] &&
p->surplus == result->surplus[5]", file=0x80ca152 "citizen_management.c",
line=637,
    function=0x80ca354 "update_cache2") at assert.c:59
#4  0x80b8f0d in update_cache2 (result=0xbffff200) at
citizen_management.c:636
#5  0x80b91e7 in real_fill_out_result (pcity=0x82dc150,
result=0xbffff200)
    at citizen_management.c:752
#6  0x80b9a67 in fill_out_result (pcity=0x82dc150, result=0xbffff200,
    base_combination=0x819ea44, scientists=0, taxmans=0)
    at citizen_management.c:1057
#7  0x80ba2c3 in optimize_final (pcity=0x82dc150, parameter=0x811bd84,
    best_result=0x811bda8) at citizen_management.c:1429
#8  0x80ba5ee in cma_query_result (pcity=0x82dc150, parameter=0x811bd84,
    result=0x811bda8) at citizen_management.c:1576
#9  0x8099b5b in update_result ()
    at citizen_management_agent_frontend_gtk.c:100
#10 0x809a6d0 in popup_cma_dialog (pcity=0x82dc150, shell=0x8201ae0)
    at citizen_management_agent_frontend_gtk.c:329
#11 0x8076fd8 in cma_callback (w=0x82a1b7c, data=0x82f7488) at
citydlg.c:2843
#12 0x400cab4d in gtk_marshal_NONE__NONE () from /usr/lib/libgtk-1.2.so.0

etc 

want savegame?

G.

____________________________________________________________
Do You Yahoo!?
Get your free @yahoo.co.uk address at http://mail.yahoo.co.uk
or your free @yahoo.ie address at http://mail.yahoo.ie