Changeset - r560:2a136de8e3f2
« 558:06787d
« 559:9b9ffe
561:2eb5c8 »
gravatar
alpar (Alpar Juttner)
alpar@cs.elte.hu
Merge
0 5 0
merge default
0 files changed with 37 insertions and 14 deletions:
lemon/graph_to_eps.h
21
5
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
Ignore white space 4 line context
... ... 
@@ -30,6 +30,10 @@
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
... ... 
@@ -689,16 +693,28 @@
689 693 
#else
690 694 
      SYSTEMTIME time;
691 
      char buf1[11], buf2[9], buf3[5];
692 

			




	693
	695
	
		
      GetSystemTime(&time);


			




	
	696
	
		
#if defined(_MSC_VER) && (_MSC_VER < 1500)


			




	
	697
	
		
      LPWSTR buf1, buf2, buf3;


			




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


			




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


			




	
	699
	
		
                        L"ddd MMM dd", buf1, 11) &&


			




	696
	700
	
		
          GetTimeFormat(LOCALE_USER_DEFAULT, 0, &time,


			




	697
	
	
		
                        "HH':'mm':'ss", buf2, 9) &&


			




	
	701
	
		
                        L"HH':'mm':'ss", buf2, 9) &&


			




	698
	702
	
		
          GetDateFormat(LOCALE_USER_DEFAULT, 0, &time,


			




	699
	
	
		
                                "yyyy", buf3, 5)) {


			




	
	703
	
		
                        L"yyyy", buf3, 5)) {


			




	700
	704
	
		
        os << "%%CreationDate: " << buf1 << ' '


			




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


			




	702
	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
	
		
        }


			




	
	718
	
		
#endif


			




	703
	719
	
		
#endif


			




	704
	720
	
		
    }

			




        

    

    

    

        

            

                

                    lemon/lp_base.cc
                

                

                  
                  
                  
                  Ignore white space
                  4 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -23,6 +23,8 @@


			




	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
                

                

                  
                  
                  
                  Ignore white space
                  4 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -598,9 +598,9 @@


			




	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
	
		

			




	...
	...
	
		
@@ -1667,5 +1667,5 @@


			




	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;


			




	...
	...
	
		
@@ -1679,5 +1679,5 @@


			




	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;


			




	...
	...
	
		
@@ -1691,5 +1691,5 @@


			




	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;


			




	...
	...
	
		
@@ -1703,5 +1703,5 @@


			




	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;

			




        

    

    

    

        

            

                

                    lemon/math.h
                

                

                  
                  
                  
                  Ignore white space
                  4 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -61,5 +61,5 @@


			




	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;

			




        

    

    

    

        

            

                

                    lemon/time_measure.h
                

                

                  
                  
                  
                  Ignore white space
                  4 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -25,9 +25,14 @@


			




	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>


			




        

    






    
    



    


    

     
    
0 comments (0 inline)