1 files changed, 51 insertions, 23 deletions
diff --git a/include/omegatools.hh b/include/omegatools.hh
index 2f56971..8f06ebc 100644
--- a/include/omegatools.hh
+++ b/include/omegatools.hh
@@ -8,61 +8,87 @@
 
 std::string tmp_e();
 
-void exp2formula(IR_Code *ir, 
-                 omega::Relation &r, 
+void exp2formula(IR_Code *ir,
+                 omega::Relation &r,
                  omega::F_And *f_root,
                  std::vector<omega::Free_Var_Decl *> &freevars,
-                 omega::CG_outputRepr *repr, 
-                 omega::Variable_ID lhs, 
+                 omega::CG_outputRepr *repr,
+                 omega::Variable_ID lhs,
                  char side,
-                 IR_CONDITION_TYPE rel, 
-                 bool destroy,  
-                 std::map<std::string, std::vector<omega::CG_outputRepr * > > &uninterpreted_symbols,
-                 std::map<std::string, std::vector<omega::CG_outputRepr * > > &uninterpreted_symbols_stringrepr);
+                 IR_CONDITION_TYPE rel,
+                 bool destroy,
+                 std::map<std::string, std::vector<omega::CG_outputRepr *> > &uninterpreted_symbols,
+                 std::map<std::string, std::vector<omega::CG_outputRepr *> > &uninterpreted_symbols_stringrepr);
 
-omega::Relation arrays2relation(IR_Code *ir, std::vector<omega::Free_Var_Decl*> &freevars,
+omega::Relation arrays2relation(IR_Code *ir, std::vector<omega::Free_Var_Decl *> &freevars,
                                 const IR_ArrayRef *ref_src, const omega::Relation &IS_w,
-                                const IR_ArrayRef *ref_dst, const omega::Relation &IS_r,  
-                                std::map<std::string, std::vector<omega::CG_outputRepr * > > &uninterpreted_symbols,
-                                std::map<std::string, std::vector<omega::CG_outputRepr * > > &uninterpreted_symbols_stringrepr);
+                                const IR_ArrayRef *ref_dst, const omega::Relation &IS_r,
+                                std::map<std::string, std::vector<omega::CG_outputRepr *> > &uninterpreted_symbols,
+                                std::map<std::string, std::vector<omega::CG_outputRepr *> > &uninterpreted_symbols_stringrepr);
 
 std::pair<std::vector<DependenceVector>, std::vector<DependenceVector> > relation2dependences(
-                                                                                              const IR_ArrayRef *ref_src, const IR_ArrayRef *ref_dst, const omega::Relation &r);
+    const IR_ArrayRef *ref_src, const IR_ArrayRef *ref_dst, const omega::Relation &r);
 
 void exp2constraint(IR_Code *ir, omega::Relation &r, omega::F_And *f_root,
                     std::vector<omega::Free_Var_Decl *> &freevars,
-                    omega::CG_outputRepr *repr, bool destroy,  
-                    std::map<std::string, std::vector<omega::CG_outputRepr * > > &uninterpreted_symbols,
-                    std::map<std::string, std::vector<omega::CG_outputRepr * > > &uninterpreted_symbols_stringrepr);
+                    omega::CG_outputRepr *repr, bool destroy,
+                    std::map<std::string, std::vector<omega::CG_outputRepr *> > &uninterpreted_symbols,
+                    std::map<std::string, std::vector<omega::CG_outputRepr *> > &uninterpreted_symbols_stringrepr);
 
 
 bool is_single_iteration(const omega::Relation &r, int dim);
+
 void assign_const(omega::Relation &r, int dim, int val);
+
 int get_const(const omega::Relation &r, int dim, omega::Var_Kind type);
+
 omega::Variable_ID find_index(omega::Relation &r, const std::string &s, char side);
+
 omega::Relation permute_relation(const std::vector<int> &pi);
+
 omega::Relation get_loop_bound(const omega::Relation &r, int dim);
+
 bool is_single_loop_iteration(const omega::Relation &r, int level, const omega::Relation &known);
+
 omega::Relation get_loop_bound(const omega::Relation &r, int level, const omega::Relation &known);
+
 omega::Relation get_max_loop_bound(const std::vector<omega::Relation> &r, int dim);
+
 omega::Relation get_min_loop_bound(const std::vector<omega::Relation> &r, int dim);
+
 void add_loop_stride(omega::Relation &r, const omega::Relation &bound, int dim, int stride);
+
 bool is_inner_loop_depend_on_level(const omega::Relation &r, int level, const omega::Relation &known);
+
 // void adjust_loop_bound(omega::Relation &r, int dim, int adjustment, std::vector<omega::Free_Var_Decl *> globals = std::vector<omega::Free_Var_Decl *>());
 omega::Relation adjust_loop_bound(const omega::Relation &r, int level, int adjustment);
+
 bool lowerBoundIsZero(const omega::Relation &bound, int dim);
+
 omega::Relation and_with_relation_and_replace_var(const omega::Relation &R, omega::Variable_ID v1,
                                                   omega::Relation &g);
+
 omega::Relation replicate_IS_and_add_at_pos(const omega::Relation &R, int level, omega::Relation &bound);
-omega::Relation replicate_IS_and_add_bound(const omega::Relation &R, int level, omega::Relation &bound) ;
 
-omega::CG_outputRepr * construct_int_floor(omega::CG_outputBuilder * ocg, const omega::Relation &R, const omega::GEQ_Handle &h, omega::Variable_ID v,const std::vector<std::pair<omega::CG_outputRepr *, int> > &assigned_on_the_fly,
-                                           std::map<std::string, std::vector<omega::CG_outputRepr *> > unin);
+omega::Relation replicate_IS_and_add_bound(const omega::Relation &R, int level, omega::Relation &bound);
+
+omega::CG_outputRepr *
+construct_int_floor(omega::CG_outputBuilder *ocg, const omega::Relation &R, const omega::GEQ_Handle &h,
+                    omega::Variable_ID v,
+                    const std::vector<std::pair<omega::CG_outputRepr *, int> > &assigned_on_the_fly,
+                    std::map<std::string, std::vector<omega::CG_outputRepr *> > unin);
+
 //omega::CG_outputRepr * modified_output_subs_repr(omega::CG_outputBuilder * ocg, const omega::Relation &R, const omega::EQ_Handle &h, omega::Variable_ID v,const std::vector<std::pair<omega::CG_outputRepr *, int> > &assigned_on_the_fly,
 //    std::map<std::string, std::vector<omega::CG_outputRepr *> > unin);
-std::pair<omega::Relation, bool> replace_set_var_as_existential(const omega::Relation &R,int pos, std::vector<omega::Relation> &bound);
-omega::Relation replace_set_var_as_Global(const omega::Relation &R,int pos,std::vector<omega::Relation> &bound);
-omega::Relation replace_set_var_as_another_set_var(const omega::Relation &old_relation, const omega::Relation &new_relation, int old_pos, int new_pos);
+std::pair<omega::Relation, bool>
+replace_set_var_as_existential(const omega::Relation &R, int pos, std::vector<omega::Relation> &bound);
+
+omega::Relation replace_set_var_as_Global(const omega::Relation &R, int pos, std::vector<omega::Relation> &bound);
+
+omega::Relation
+replace_set_var_as_another_set_var(const omega::Relation &old_relation, const omega::Relation &new_relation,
+                                   int old_pos, int new_pos);
+
 omega::Relation extract_upper_bound(const omega::Relation &R, omega::Variable_ID v1);
 
 // void adjust_loop_bound(Relation &r, int dim, int adjustment);
@@ -72,7 +98,9 @@ omega::Relation extract_upper_bound(const omega::Relation &R, omega::Variable_ID
 // coef_t mod(const Relation &r, Variable_ID v, int dividend);
 
 
-enum LexicalOrderType {LEX_MATCH, LEX_BEFORE, LEX_AFTER, LEX_UNKNOWN};
+enum LexicalOrderType {
+  LEX_MATCH, LEX_BEFORE, LEX_AFTER, LEX_UNKNOWN
+};
 
 // template <typename T>
 // LexicalOrderType lexical_order(const std::vector<T> &a, const std::vector<T> &b) {