Changeset - r489:2a136de8e3f2
« 487:06787d
« 488:9b9ffe
490:2eb5c8 »
gravatar
alpar (Alpar Juttner)
alpar@cs.elte.hu
Merge
0 5 0
merge default
0 files changed with 34 insertions and 11 deletions:
lemon/graph_to_eps.h
18
2
lemon/lp_base.cc
4
2
lemon/lp_base.h
6
6
lemon/math.h
1
1
lemon/time_measure.h
5
↑ Collapse diff ↑
lemon/graph_to_eps.h
Show white space 6 line context
... ... 
@@ -29,8 +29,12 @@
29 29 
#include<sys/time.h>
30 30 
#include<ctime>
31 31 
#else
32 
#ifndef WIN32_LEAN_AND_MEAN
32 33 
#define WIN32_LEAN_AND_MEAN
34 
#endif
35 
#ifndef NOMINMAX
33 36 
#define NOMINMAX
37 
#endif
34 38 
#include<windows.h>
35 39 
#endif
36 40 

			




	...
	...
	
		
@@ -688,9 +692,20 @@


			




	688
	692
	
		
      os << "%%CreationDate: " << cbuf;


			




	689
	693
	
		
#else


			




	690
	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


			




	691
	708
	
		
      char buf1[11], buf2[9], buf3[5];


			




	692
	
	
		

			




	693
	
	
		
      GetSystemTime(&time);


			




	694
	709
	
		
      if (GetDateFormat(LOCALE_USER_DEFAULT, 0, &time,


			




	695
	710
	
		
                        "ddd MMM dd", buf1, 11) &&


			




	696
	711
	
		
          GetTimeFormat(LOCALE_USER_DEFAULT, 0, &time,


			




	...
	...
	
		
@@ -701,6 +716,7 @@


			




	701
	716
	
		
           << buf2 << ' ' << buf3 << std::endl;


			




	702
	717
	
		
      }


			




	703
	718
	
		
#endif


			




	
	719
	
		
#endif


			




	704
	720
	
		
    }


			




	705
	721
	
		

			




	706
	722
	
		
    if (_autoArcWidthScale) {

			




        

    

    

    

        

            

                

                    lemon/lp_base.cc
                

                

                  
                  
                  
                  Show white space
                  6 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -22,7 +22,9 @@


			




	22
	22
	
		
#include <lemon/lp_base.h>


			




	23
	23
	
		
namespace lemon {


			




	24
	24
	
		

			




	25
	
	
		
  const LpBase::Value LpBase::INF = std::numeric_limits<Value>::infinity();


			




	26
	
	
		
  const LpBase::Value LpBase::NaN = std::numeric_limits<Value>::quiet_NaN();


			




	
	25
	
		
  const LpBase::Value LpBase::INF =


			




	
	26
	
		
    std::numeric_limits<LpBase::Value>::infinity();


			




	
	27
	
		
  const LpBase::Value LpBase::NaN =


			




	
	28
	
		
    std::numeric_limits<LpBase::Value>::quiet_NaN();


			




	27
	29
	
		

			




	28
	30
	
		
} //namespace lemon

			




        

    

    

    

        

            

                

                    lemon/lp_base.h
                

                

                  
                  
                  
                  Show white space
                  6 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -597,11 +597,11 @@


			




	597
	597
	
		
      const Value &upperBound() const { return _ub; }


			




	598
	598
	
		
      ///Is the constraint lower bounded?


			




	599
	599
	
		
      bool lowerBounded() const {


			




	600
	
	
		
        return _lb != -INF && !isnan(_lb);


			




	
	600
	
		
        return _lb != -INF && !isNaN(_lb);


			




	601
	601
	
		
      }


			




	602
	602
	
		
      ///Is the constraint upper bounded?


			




	603
	603
	
		
      bool upperBounded() const {


			




	604
	
	
		
        return _ub != INF && !isnan(_ub);


			




	
	604
	
		
        return _ub != INF && !isNaN(_ub);


			




	605
	605
	
		
      }


			




	606
	606
	
		

			




	607
	607
	
		
    };


			




	...
	...
	
		
@@ -1666,7 +1666,7 @@


			




	1666
	1666
	
		
  inline LpBase::Constr operator<=(const LpBase::Value &n,


			




	1667
	1667
	
		
                                   const LpBase::Constr &c) {


			




	1668
	1668
	
		
    LpBase::Constr tmp(c);


			




	1669
	
	
		
    LEMON_ASSERT(isnan(tmp.lowerBound()), "Wrong LP constraint");


			




	
	1669
	
		
    LEMON_ASSERT(isNaN(tmp.lowerBound()), "Wrong LP constraint");


			




	1670
	1670
	
		
    tmp.lowerBound()=n;


			




	1671
	1671
	
		
    return tmp;


			




	1672
	1672
	
		
  }


			




	...
	...
	
		
@@ -1678,7 +1678,7 @@


			




	1678
	1678
	
		
                                   const LpBase::Value &n)


			




	1679
	1679
	
		
  {


			




	1680
	1680
	
		
    LpBase::Constr tmp(c);


			




	1681
	
	
		
    LEMON_ASSERT(isnan(tmp.upperBound()), "Wrong LP constraint");


			




	
	1681
	
		
    LEMON_ASSERT(isNaN(tmp.upperBound()), "Wrong LP constraint");


			




	1682
	1682
	
		
    tmp.upperBound()=n;


			




	1683
	1683
	
		
    return tmp;


			




	1684
	1684
	
		
  }


			




	...
	...
	
		
@@ -1690,7 +1690,7 @@


			




	1690
	1690
	
		
  inline LpBase::Constr operator>=(const LpBase::Value &n,


			




	1691
	1691
	
		
                                   const LpBase::Constr &c) {


			




	1692
	1692
	
		
    LpBase::Constr tmp(c);


			




	1693
	
	
		
    LEMON_ASSERT(isnan(tmp.upperBound()), "Wrong LP constraint");


			




	
	1693
	
		
    LEMON_ASSERT(isNaN(tmp.upperBound()), "Wrong LP constraint");


			




	1694
	1694
	
		
    tmp.upperBound()=n;


			




	1695
	1695
	
		
    return tmp;


			




	1696
	1696
	
		
  }


			




	...
	...
	
		
@@ -1702,7 +1702,7 @@


			




	1702
	1702
	
		
                                   const LpBase::Value &n)


			




	1703
	1703
	
		
  {


			




	1704
	1704
	
		
    LpBase::Constr tmp(c);


			




	1705
	
	
		
    LEMON_ASSERT(isnan(tmp.lowerBound()), "Wrong LP constraint");


			




	
	1705
	
		
    LEMON_ASSERT(isNaN(tmp.lowerBound()), "Wrong LP constraint");


			




	1706
	1706
	
		
    tmp.lowerBound()=n;


			




	1707
	1707
	
		
    return tmp;


			




	1708
	1708
	
		
  }

			




        

    

    

    

        

            

                

                    lemon/math.h
                

                

                  
                  
                  
                  Show white space
                  6 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -60,7 +60,7 @@


			




	60
	60
	
		
  ///This function checks whether the parameter is NaN or not.


			




	61
	61
	
		
  ///Is should be equivalent with std::isnan(), but it is not


			




	62
	62
	
		
  ///provided by all compilers.


			




	63
	
	
		
  inline bool isnan(double v)


			




	
	63
	
		
  inline bool isNaN(double v)


			




	64
	64
	
		
    {


			




	65
	65
	
		
      return v!=v;


			




	66
	66
	
		
    }

			




        

    

    

    

        

            

                

                    lemon/time_measure.h
                

                

                  
                  
                  
                  Show white space
                  6 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -24,11 +24,16 @@


			




	24
	24
	
		
///\brief Tools for measuring cpu usage


			




	25
	25
	
		

			




	26
	26
	
		
#ifdef WIN32


			




	
	27
	
		
#ifndef WIN32_LEAN_AND_MEAN


			




	27
	28
	
		
#define WIN32_LEAN_AND_MEAN


			




	
	29
	
		
#endif


			




	
	30
	
		
#ifndef NOMINMAX


			




	28
	31
	
		
#define NOMINMAX


			




	
	32
	
		
#endif


			




	29
	33
	
		
#include <windows.h>


			




	30
	34
	
		
#include <cmath>


			




	31
	35
	
		
#else


			




	
	36
	
		
#include <unistd.h>


			




	32
	37
	
		
#include <sys/times.h>


			




	33
	38
	
		
#include <sys/time.h>


			




	34
	39
	
		
#endif


			




        

    






    
    



    


    

     
    
0 comments (0 inline)