fix tabbing

diff --git a/src/ASTTransform/varorderingopt.cc b/src/ASTTransform/varorderingopt.cc
index 41f3edbc4e7b75c41a8e937f907c0df6948f08e6..52beda98720241feeb1d894a7bfdfb4ef725e004 100644 (file)
--- a/src/ASTTransform/varorderingopt.cc
+++ b/src/ASTTransform/varorderingopt.cc
@@ -4,10 +4,10 @@
  * and open the template in the editor.
  */
 
  * and open the template in the editor.
  */
 

-/* 
+/*

  * File:   VarOrderingOpt.cpp
  * Author: hamed
  * File:   VarOrderingOpt.cpp
  * Author: hamed

- * 
+ *

  * Created on October 11, 2018, 5:31 PM
  */
 
  * Created on October 11, 2018, 5:31 PM
  */
 


@@ -18,21 +18,21 @@
 #include "elementencoding.h"
 #include "element.h"
 
 #include "elementencoding.h"
 #include "element.h"
 

-VarOrderingOpt::VarOrderingOpt(CSolver *_solver, SATEncoder *_satencoder): Transform(_solver){
+VarOrderingOpt::VarOrderingOpt(CSolver *_solver, SATEncoder *_satencoder) : Transform(_solver) {

        satencoder = _satencoder;
 }
 
 VarOrderingOpt::~VarOrderingOpt() {
 }
 
        satencoder = _satencoder;
 }
 
 VarOrderingOpt::~VarOrderingOpt() {
 }
 

-void VarOrderingOpt::doTransform(){
+void VarOrderingOpt::doTransform() {

        BooleanVarOrdering direction = (BooleanVarOrdering)solver->getTuner()->getTunable(VARIABLEORDER, &boolVarOrderingDesc);
        BooleanVarOrdering direction = (BooleanVarOrdering)solver->getTuner()->getTunable(VARIABLEORDER, &boolVarOrderingDesc);

-       if ( direction == CONSTRAINTORDERING ){
+       if ( direction == CONSTRAINTORDERING ) {

                return;
        }
                return;
        }

-       
+

        uint size = solver->allElements.getSize();
        uint size = solver->allElements.getSize();

-       if(direction == CHORONOLOGICALORDERING){
+       if (direction == CHORONOLOGICALORDERING) {

                for (uint i = 0; i < size; i++) {
                        Element *el = solver->allElements.get(i);
                        ElementEncoding *encoding = el->getElementEncoding();
                for (uint i = 0; i < size; i++) {
                        Element *el = solver->allElements.get(i);
                        ElementEncoding *encoding = el->getElementEncoding();


@@ -40,8 +40,8 @@ void VarOrderingOpt::doTransform(){
                                continue;
                        satencoder->encodeElementSATEncoder(el);
                }
                                continue;
                        satencoder->encodeElementSATEncoder(el);
                }

-       }else{
-               for (int i = size-1; i>0; i--) {
+       } else {
+               for (int i = size - 1; i > 0; i--) {

                        Element *el = solver->allElements.get(i);
                        ElementEncoding *encoding = el->getElementEncoding();
                        if (encoding->getElementEncodingType() == ELEM_UNASSIGNED)
                        Element *el = solver->allElements.get(i);
                        ElementEncoding *encoding = el->getElementEncoding();
                        if (encoding->getElementEncodingType() == ELEM_UNASSIGNED)

diff --git a/src/ASTTransform/varorderingopt.h b/src/ASTTransform/varorderingopt.h
index efb01527f46f39a8a24c6fafe41287d01033618c..ed134d7114908a69c5e80d296c2ad1becff0f38c 100644 (file)
--- a/src/ASTTransform/varorderingopt.h
+++ b/src/ASTTransform/varorderingopt.h
@@ -4,7 +4,7 @@
  * and open the template in the editor.
  */
 
  * and open the template in the editor.
  */
 

-/* 
+/*

  * File:   VarOrderingOpt.h
  * Author: hamed
  *
  * File:   VarOrderingOpt.h
  * Author: hamed
  *


@@ -17,14 +17,14 @@
 #include "transform.h"
 
 
 #include "transform.h"
 
 

-class VarOrderingOpt :Transform {
+class VarOrderingOpt : Transform {

 public:
 public:

-        VarOrderingOpt(CSolver *_solver, SATEncoder *_satencoder);
-        void doTransform();
-        virtual ~VarOrderingOpt();
+       VarOrderingOpt(CSolver *_solver, SATEncoder *_satencoder);
+       void doTransform();
+       virtual ~VarOrderingOpt();

 private:
 private:

-        SATEncoder* satencoder;
+       SATEncoder *satencoder;

 };
 
 };
 

-#endif /* VARORDERINGOPT_H */
+#endif/* VARORDERINGOPT_H */

 
 

diff --git a/src/Backend/satencoder.h b/src/Backend/satencoder.h
index 827a9041b059922d78607771352bf7b615cd9a34..0bb29f5d711097f6c818c2eb2f3f061535d09255 100644 (file)
--- a/src/Backend/satencoder.h
+++ b/src/Backend/satencoder.h
@@ -69,7 +69,7 @@ private:
        CSolver *solver;
        BooleanToEdgeMap booledgeMap;
        VectorEdge *vector;
        CSolver *solver;
        BooleanToEdgeMap booledgeMap;
        VectorEdge *vector;

-        friend class VarOrderingOpt;
+       friend class VarOrderingOpt;

 };
 
 void allocElementConstraintVariables(ElementEncoding *ee, uint numVars);
 };
 
 void allocElementConstraintVariables(ElementEncoding *ee, uint numVars);

diff --git a/src/Tuner/tunable.h b/src/Tuner/tunable.h
index d8385477e84198be6fe67534210d0b319275907d..a7ab4e970ca5457ba0da265ec8963321550e141a 100644 (file)
--- a/src/Tuner/tunable.h
+++ b/src/Tuner/tunable.h
@@ -44,8 +44,8 @@ static TunableDesc NodeEncodingDesc(ELEM_UNASSIGNED, BINARYINDEX, ELEM_UNASSIGNE
 static TunableDesc NaiveEncodingDesc(ONEHOT, BINARYINDEX, ONEHOT);
 static TunableDesc boolVarOrderingDesc(CONSTRAINTORDERING, REVERSEORDERING, REVERSEORDERING);
 
 static TunableDesc NaiveEncodingDesc(ONEHOT, BINARYINDEX, ONEHOT);
 static TunableDesc boolVarOrderingDesc(CONSTRAINTORDERING, REVERSEORDERING, REVERSEORDERING);
 

-enum Tunables {DECOMPOSEORDER, MUSTREACHGLOBAL, MUSTREACHLOCAL, MUSTREACHPRUNE, OPTIMIZEORDERSTRUCTURE, ORDERINTEGERENCODING, PREPROCESS, NODEENCODING, EDGEENCODING, MUSTEDGEPRUNE, ELEMENTOPT, 
-        ENCODINGGRAPHOPT, ELEMENTOPTSETS, PROXYVARIABLE, MUSTVALUE, NAIVEENCODER, VARIABLEORDER};
+enum Tunables {DECOMPOSEORDER, MUSTREACHGLOBAL, MUSTREACHLOCAL, MUSTREACHPRUNE, OPTIMIZEORDERSTRUCTURE, ORDERINTEGERENCODING, PREPROCESS, NODEENCODING, EDGEENCODING, MUSTEDGEPRUNE, ELEMENTOPT,
+                                                        ENCODINGGRAPHOPT, ELEMENTOPTSETS, PROXYVARIABLE, MUSTVALUE, NAIVEENCODER, VARIABLEORDER};

 typedef enum Tunables Tunables;
 
 const char *tunableParameterToString(Tunables tunable);
 typedef enum Tunables Tunables;
 
 const char *tunableParameterToString(Tunables tunable);

diff --git a/src/csolver.cc b/src/csolver.cc
index a8ffc492c156064cb6fdb693b7084b76c737d478..51f094334d0086c1d99fe3e9fa7cff5b547acf6e 100644 (file)
--- a/src/csolver.cc
+++ b/src/csolver.cc
@@ -625,10 +625,10 @@ int CSolver::solve() {
 
        VarOrderingOpt bor(this, satEncoder);
        bor.doTransform();
 
        VarOrderingOpt bor(this, satEncoder);
        bor.doTransform();

-       
+

        time2 = getTimeNano();
        model_print("Encoding Graph Time: %f\n", (time2 - time1) / NANOSEC);
        time2 = getTimeNano();
        model_print("Encoding Graph Time: %f\n", (time2 - time1) / NANOSEC);

-       
+

        satEncoder->encodeAllSATEncoder(this);
        time1 = getTimeNano();
 
        satEncoder->encodeAllSATEncoder(this);
        time1 = getTimeNano();
 

diff --git a/src/csolver.h b/src/csolver.h
index 1bc24769a7edee9e78cf2025b0e855b8d3fbf423..16937ddd63827f67aaa46827dcdc371914dd0de6 100644 (file)
--- a/src/csolver.h
+++ b/src/csolver.h
@@ -222,7 +222,7 @@ private:
        long long elapsedTime;
        long satsolverTimeout;
        friend class ElementOpt;
        long long elapsedTime;
        long satsolverTimeout;
        friend class ElementOpt;

-        friend class VarOrderingOpt;
+       friend class VarOrderingOpt;

 };
 
 inline CompOp flipOp(CompOp op) {
 };
 
 inline CompOp flipOp(CompOp op) {