Changeset 511:879c55700cd4 in lemon
- Timestamp:
- 02/16/09 16:03:32 (16 years ago)
- Branch:
- default
- Children:
- 512:65f80c81d41c, 513:3f0ddf255524, 517:afd134142111, 562:b9b3473327e3
- Phase:
- public
- Location:
- lemon
- Files:
-
- 2 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
lemon/CMakeLists.txt
r225 r511 5 5 base.cc 6 6 color.cc 7 random.cc) 7 random.cc 8 bits/windows.cc 9 ) 8 10 9 11 INSTALL( -
lemon/Makefile.am
r259 r511 11 11 lemon/base.cc \ 12 12 lemon/color.cc \ 13 lemon/random.cc 13 lemon/random.cc \ 14 lemon/bits/windows.cc 14 15 15 16 #lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS) … … 41 42 lemon/time_measure.h \ 42 43 lemon/tolerance.h \ 43 lemon/unionfind.h 44 lemon/unionfind.h \ 45 lemon/bits/windows.h 44 46 45 47 bits_HEADERS += \ -
lemon/graph_to_eps.h
r509 r511 30 30 #include<ctime> 31 31 #else 32 #ifndef WIN32_LEAN_AND_MEAN 33 #define WIN32_LEAN_AND_MEAN 34 #endif 35 #ifndef NOMINMAX 36 #define NOMINMAX 37 #endif 38 #include<windows.h> 32 #include<lemon/bits/windows.h> 39 33 #endif 40 34 … … 684 678 685 679 { 680 os << "%%CreationDate: "; 686 681 #ifndef WIN32 687 682 timeval tv; … … 690 685 char cbuf[26]; 691 686 ctime_r(&tv.tv_sec,cbuf); 692 os << "%%CreationDate: " <<cbuf;687 os << cbuf; 693 688 #else 694 SYSTEMTIME time; 695 GetSystemTime(&time); 696 #if defined(_MSC_VER) && (_MSC_VER < 1500) 697 LPWSTR buf1, buf2, buf3; 698 if (GetDateFormat(LOCALE_USER_DEFAULT, 0, &time, 699 L"ddd MMM dd", buf1, 11) && 700 GetTimeFormat(LOCALE_USER_DEFAULT, 0, &time, 701 L"HH':'mm':'ss", buf2, 9) && 702 GetDateFormat(LOCALE_USER_DEFAULT, 0, &time, 703 L"yyyy", buf3, 5)) { 704 os << "%%CreationDate: " << buf1 << ' ' 705 << buf2 << ' ' << buf3 << std::endl; 706 } 707 #else 708 char buf1[11], buf2[9], buf3[5]; 709 if (GetDateFormat(LOCALE_USER_DEFAULT, 0, &time, 710 "ddd MMM dd", buf1, 11) && 711 GetTimeFormat(LOCALE_USER_DEFAULT, 0, &time, 712 "HH':'mm':'ss", buf2, 9) && 713 GetDateFormat(LOCALE_USER_DEFAULT, 0, &time, 714 "yyyy", buf3, 5)) { 715 os << "%%CreationDate: " << buf1 << ' ' 716 << buf2 << ' ' << buf3 << std::endl; 717 } 689 os << bits::getWinFormattedDate(); 718 690 #endif 719 #endif 720 }691 } 692 os << std::endl; 721 693 722 694 if (_autoArcWidthScale) { -
lemon/random.h
r391 r511 78 78 #include <unistd.h> 79 79 #else 80 #include < windows.h>80 #include <lemon/bits/windows.h> 81 81 #endif 82 82 … … 667 667 seed(getpid() + tv.tv_sec + tv.tv_usec); 668 668 #else 669 FILETIME time; 670 GetSystemTimeAsFileTime(&time); 671 seed(GetCurrentProcessId() + time.dwHighDateTime + time.dwLowDateTime); 669 seed(bits::getWinRndSeed()); 672 670 #endif 673 671 return true; -
lemon/time_measure.h
r509 r511 25 25 26 26 #ifdef WIN32 27 #ifndef WIN32_LEAN_AND_MEAN 28 #define WIN32_LEAN_AND_MEAN 29 #endif 30 #ifndef NOMINMAX 31 #define NOMINMAX 32 #endif 33 #include <windows.h> 34 #include <cmath> 27 #include <lemon/bits/windows.h> 35 28 #else 36 29 #include <unistd.h> … … 93 86 cstime=ts.tms_cstime/tck; 94 87 #else 95 static const double ch = 4294967296.0e-7; 96 static const double cl = 1.0e-7; 97 98 FILETIME system; 99 GetSystemTimeAsFileTime(&system); 100 rtime = ch * system.dwHighDateTime + cl * system.dwLowDateTime; 101 102 FILETIME create, exit, kernel, user; 103 if (GetProcessTimes(GetCurrentProcess(),&create, &exit, &kernel, &user)) { 104 utime = ch * user.dwHighDateTime + cl * user.dwLowDateTime; 105 stime = ch * kernel.dwHighDateTime + cl * kernel.dwLowDateTime; 106 cutime = 0; 107 cstime = 0; 108 } else { 109 rtime = 0; 110 utime = 0; 111 stime = 0; 112 cutime = 0; 113 cstime = 0; 114 } 88 bits::getWinProcTimes(rtime, utime, stime, cutime, cstime); 115 89 #endif 116 90 }
Note: See TracChangeset
for help on using the changeset viewer.