Changeset 2229:4dbb6dd2dd4b in lemon-0.x for lemon
- Timestamp:
- 10/02/06 18:11:00 (18 years ago)
- Branch:
- default
- Phase:
- public
- Convert:
- svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2969
- Location:
- lemon
- Files:
-
- 2 added
- 2 deleted
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
lemon/Makefile.am
r2218 r2229 13 13 lemon/color.cc \ 14 14 lemon/eps.cc \ 15 lemon/bits/mingw32_ rand.cc \16 lemon/ bits/mingw32_time.cc15 lemon/bits/mingw32_time.cc \ 16 lemon/random.cc 17 17 18 18 lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) … … 87 87 lemon/radix_heap.h \ 88 88 lemon/radix_sort.h \ 89 lemon/random.h \ 89 90 lemon/refptr.h \ 90 91 lemon/simann.h \ … … 113 114 lemon/bits/item_writer.h \ 114 115 lemon/bits/map_extender.h \ 115 lemon/bits/mingw32_rand.h \116 116 lemon/bits/mingw32_time.h \ 117 117 lemon/bits/traits.h \ -
lemon/hypercube_graph.h
r2223 r2229 261 261 /// dim2::Point<double> base[DIM]; 262 262 /// for (int k = 0; k < DIM; ++k) { 263 /// base[k].x = rand () / (RAND_MAX + 1.0);264 /// base[k].y = rand () / (RAND_MAX + 1.0);263 /// base[k].x = random.getReal(); 264 /// base[k].y = random.getReal(); 265 265 /// } 266 266 /// HyperCubeGraph::HyperMap<dim2::Point<double> > -
lemon/simann.h
r2035 r2229 32 32 #include <limits> 33 33 #include <lemon/time_measure.h> 34 35 #ifdef WIN32 36 #include <lemon/bits/mingw32_rand.h> 37 #endif 34 #include <lemon/random.h> 38 35 39 36 namespace lemon { … … 242 239 max_no_impr(_max_no_impr), temp(_temp), ann_fact(_ann_fact) 243 240 { 244 srand48(time(0));245 241 } 246 242 /// \brief This is called when a neighbouring state gets accepted. … … 262 258 bool accept() { 263 259 double cost_diff = simann->getCurrCost() - simann->getPrevCost(); 264 return ( drand48() <= exp(-(cost_diff / temp)));260 return (rnd.getReal() <= exp(-(cost_diff / temp))); 265 261 } 266 262 /// \brief Destructor. … … 322 318 ann_fact(_ann_fact), init_ann_fact(_ann_fact), start(false) 323 319 { 324 srand48(time(0));325 320 } 326 321 /// \brief Does initializations before each run. … … 371 366 else { 372 367 double cost_diff = simann->getCurrCost() - simann->getPrevCost(); 373 return ( drand48() <= exp(-(cost_diff / temp)));368 return (rnd.getReal() <= exp(-(cost_diff / temp))); 374 369 } 375 370 }
Note: See TracChangeset
for help on using the changeset viewer.