Update for windows compatibility
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@359 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
parent
5446af5e31
commit
f9693d1e1c
229 changed files with 3759 additions and 2398 deletions
|
|
@ -14,21 +14,25 @@
|
|||
#include "route_init.h"
|
||||
#include "graph.h"
|
||||
|
||||
void RouteInit :: operator () (Route & __route) {
|
||||
|
||||
void RouteInit :: operator () (Route & __route)
|
||||
{
|
||||
|
||||
// Init.
|
||||
__route.clear () ;
|
||||
for (unsigned i = 0 ; i < Graph :: size () ; i ++)
|
||||
__route.push_back (i) ;
|
||||
for (unsigned int i = 0 ; i < Graph :: size () ; i ++)
|
||||
{
|
||||
__route.push_back (i) ;
|
||||
}
|
||||
|
||||
// Swap. cities
|
||||
|
||||
for (unsigned i = 0 ; i < Graph :: size () ; i ++) {
|
||||
//unsigned j = rng.random (Graph :: size ()) ;
|
||||
|
||||
unsigned j = (unsigned) (Graph :: size () * (rand () / (RAND_MAX + 1.0))) ;
|
||||
unsigned city = __route [i] ;
|
||||
__route [i] = __route [j] ;
|
||||
__route [j] = city ;
|
||||
}
|
||||
for (unsigned int i = 0 ; i < Graph :: size () ; i ++)
|
||||
{
|
||||
//unsigned int j = rng.random (Graph :: size ()) ;
|
||||
|
||||
unsigned int j = (unsigned int) (Graph :: size () * (rand () / (RAND_MAX + 1.0))) ;
|
||||
unsigned int city = __route [i] ;
|
||||
__route [i] = __route [j] ;
|
||||
__route [j] = city ;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue