alliance-programmers '02
(no subject)


Hugo Clement (Hugo.Clement@asim.lip6.fr)
Fri, 22 Feb 2002 16:21:06 +0100 (MET)

=================================================================== Modification le : Fri Feb 22 16:20:50 MET 2002 Par : hcl =================================================================== Update of /users/outil/alliance/cvsroot/alliance/sources/ocr/sce/rout In directory rondo:/users/cao/hcl/alliance/sources/ocr/sce/rout Modified Files: ocrAstar.c ocrRouter.c Log Message: A* is ready =================================================================== Index: ocrAstar.c =================================================================== RCS file: /users/outil/alliance/cvsroot/alliance/sources/ocr/sce/rout/ocrAstar.c,v retrieving revision 1.3 retrieving revision 1.4 diff -r1.3 -r1.4 8a9,11 > Revision 1.4 2002/02/22 15:20:49 hcl > A* is ready > 157c160 < } else if ( ((elem->HCOST) == (list->HCOST)) && ((elem->COST) <= (list->COST)) ){ --- > } else if ( ((elem->HCOST) == (list->HCOST)) && ((elem->COST) > (list->COST)) ){ 308c311 < aux = NULL; --- > aux = i_pSignal->SEGMENT; 315a319,328 > /* > > seg, seg->ROOT > nseg <= split (seg) > > nseg -> NEXT = prevseg; > prevseg = nseg; > > */ > 320c333 < display (LEVEL, DEBUG, "p (%ld, %ld, %ld) -> (%ld, %ld, %ld) : %ld\n", xp, yp, seg->LAYER, xn, yn, seg->LAYER, distance); --- > display (LEVEL, DEBUG, "p (%ld, %ld, %ld) -> (%ld, %ld, %ld) : d=%ld, c=%ld, h=%ld, hc=%ld\n", xp, yp, seg->LAYER, xn, yn, seg->LAYER, distance, seg->COST, seg->H, seg->HCOST); 327,329c340,341 < if (!(aux)) < aux = nseg; < nseg->NEXT = root; --- > nseg->NEXT = aux; > aux = nseg; 342c354 < root = seg->ROOT; --- > /*root = seg->ROOT;*/ 349,351c361,363 < if (!(aux)) < aux = nseg; < nseg->NEXT = root; --- > nseg->NEXT = aux;

 



Alliance Web Site © 1997, 2002 ASIM/LIP6/UPMC, page maintained by Czo [Olivier Sirol] , last updated on 22 February 2002.