=================================================================== Modification le : Tue Sep 4 10:59:20 CEST 2001 Par : xtof =================================================================== Update of /users/outil/alliance/cvsroot/alliance/sources/ocp/src In directory bip.lip6.fr:/users/cao/xtof/alliance/sources/ocp/src Modified Files: PMove.cpp PMove.h PPlacement.cpp PPlacement.h PSubRow.h Log Message: =================================================================== Index: PMove.cpp =================================================================== RCS file: /users/outil/alliance/cvsroot/alliance/sources/ocp/src/PMove.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -r1.1 -r1.2 11,24d10 < static double < PositionRand(const double Position, const double Distance, const double Max, const double Min) < { < double BorneInf, BorneSup; < < if ((BorneSup = Position + (double)(int)(Distance * Max + 0.5) ) > Max ) < BorneSup = Max; < < if ((BorneInf = Position - (double)(int)(Distance * Max + 0.5) ) < Min ) < BorneInf = Min; < < return BorneInf + (double)(int)((BorneSup - BorneInf) * rand() / (RAND_MAX+1.0)); < } < 97,100c83,86 < vector<PIns*>::iterator ifirst = net->GetInss().begin(); < vector<PIns*>::iterator ilast = net->GetInss().end(); < while (ifirst != ilast) < check_bbox.Merge((*ifirst++)->GetPos()); --- > vector<PElem*>::iterator efirst = net->GetElems().begin(); > vector<PElem*>::iterator elast = net->GetElems().end(); > while (efirst != elast) > check_bbox.Merge((*efirst++)->GetPos()); 123,126c109,112 < vector<PIns*>::iterator ifirst = net->GetInss().begin(); < vector<PIns*>::iterator ilast = net->GetInss().end(); < while (ifirst != ilast) < check_bbox.Merge((*ifirst++)->GetPos()); --- > vector<PElem*>::iterator efirst = net->GetElems().begin(); > vector<PElem*>::iterator elast = net->GetElems().end(); > while (efirst != elast) > check_bbox.Merge((*efirst++)->GetPos()); 173a160 > _srcRow = _srcSubRow->GetRow(); 179,181c166 < DstPos.SetY(PositionRand(SrcPos.GetY(), Dist, Placement.GetMaxY(), Placement.GetMinY())); < _dstRow = &Placement.GetRow(DstPos.GetY()); < DstPos.SetX(PositionRand(SrcPos.GetX(), Dist, _dstRow->GetMaxX(), _dstRow->GetMinX())); --- > _dstRow = &Placement.GetRow(_srcRow, Dist); Index: PMove.h =================================================================== Ce message est envoyé au personnes abonnées à alliance-programmers Pour plus d'information sur cette mailling-list, visitez : http://asim.lip6.fr/alliance/mailing-lists/