Changeset - r1043:4e36fdf856b7
« 1041:f112c1
« 1039:7f37e5
1051:cc9bb4 »
gravatar
alpar (Alpar Juttner)
alpar@cs.elte.hu
Merge bugfix in #417 to branch 1.2
0 1 0
merge 1.2
0 files changed with 2 insertions and 2 deletions:
lemon/cost_scaling.h
2
2
↑ Collapse diff ↑
lemon/cost_scaling.h
Ignore white space 8 line context
... ... 
@@ -906,9 +906,9 @@
906 906 
        case PUSH:
907 907 
          startPush();
908 908 
          break;
909 909 
        case AUGMENT:
910 
          startAugment();
910 
          startAugment(_res_node_num - 1);
911 911 
          break;
912 912 
        case PARTIAL_AUGMENT:
913 913 
          startAugment(MAX_PATH_LENGTH);
914 914 
          break;
... ... 
@@ -1083,9 +1083,9 @@
1083 1083 
      }
1084 1084 
    }
1085 1085 

			




	1086
	1086
	
		
    /// Execute the algorithm performing augment and relabel operations


			




	1087
	
	
		
    void startAugment(int max_length = std::numeric_limits<int>::max()) {


			




	
	1087
	
		
    void startAugment(int max_length) {


			




	1088
	1088
	
		
      // Paramters for heuristics


			




	1089
	1089
	
		
      const int EARLY_TERM_EPSILON_LIMIT = 1000;


			




	1090
	1090
	
		
      const double GLOBAL_UPDATE_FACTOR = 3.0;


			




	1091
	1091
	
		

			




        

    






    
    



    


    

     
    
0 comments (0 inline)