Commit 5956838a authored by Masahiko Sakai's avatar Masahiko Sakai
Browse files

version1.02b

parent b15c685e

ADTs/Global.h

+5 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ Contains types, macros, and inline functions generally useful in a C++ program. 
#include <climits>

#include <cfloat>

#include <new>

#include <string>



#include <map>
@@ -214,6 +215,10 @@ inline bool operator < (const Pair<Fst, Snd>& x, const Pair<Fst, Snd>& y) { 
    return x.fst < y.fst ||

           (!(y.fst < x.fst) && x.snd < y.snd); }



//template <class Fst, class Snd>

//inline bool less_fst (const Pair<Fst, Snd>& x, const Pair<Fst, Snd>& y) {

//    return x.fst < y.fst; }



template <class Fst, class Snd>

inline Pair<Fst, Snd> Pair_new(const Fst& x, const Snd& y) {

    return Pair<Fst, Snd>(x, y); }

Debug.C

+6 −0
Original line number Diff line number Diff line
@@ -53,6 +53,12 @@ void dump(Formula f) { 
}





void dump(const vec<int>& base)

{

  for (int i = 0; i < base.size(); i++)

    reportf("%d ", base[i]);

}



void dump(const vec<Lit>& ps, const vec<Int>& Cs)

{

    assert(ps.size() == Cs.size());

Debug.h

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ extern vec<cchar*>* debug_names; 
void dump(Int num);

void dump(Lit p);

void dump(Formula f);

void dump(const vec<int>& base);

void dump(const vec<Lit>& ps, const vec<Int>& Cs);

void dump(const vec<Lit>& ps, const vec<Int>& Cs, const vec<int>& assigns);

void dump(const vec<Formula>& ps, const vec<Int>& Cs);

Examples/bug.opb

0 → 100755
+14 −0
Original line number Diff line number Diff line 
* #variable= 701  #constraint= 351 

* 

* Euclidean Cycle (EC) formula as constructed by    

* Markstrom and described in the paper available at 

* http://jsat.ewi.tudelft.nl/content/volume2/JSAT2_11_Markstrom.pdf . 

* Generated by running graph2ec on grid5x70split.graph.                    

* 

* VERTEX 1 : x_{1, 6} + x_{1, 2} + x_{1, 346} + x_{1, 5} = 2 

* 

+1 x1 +1 x2 +1 x3 +1 x4 = 2; 

* 

* VERTEX 1 : x_{1, 6} + x_{1, 2} + x_{1, 346} + x_{1, 5} = 2 

+1 x5 +1 x6 +1 x7 +1 x2 = 2; 

*

Examples/error.pb

0 → 100644
+2 −0
Original line number Diff line number Diff line 
1  x1 -1  x2 1  x3 -1  x4  >= -1 ;

1  x1 -1  x2 1  x3 -1  x4  >= ~2 ;