From: bdemsky <bdemsky@uci.edu>
Date: Wed, 14 Jun 2017 21:53:07 +0000 (-0700)
Subject: fix tabbing
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=satune.git;a=commitdiff_plain;h=50bc134b69455d4b1b178e99db38d83e7285bed5

fix tabbing
---

diff --git a/src/constraint.cc b/src/constraint.cc
index 7d210d1..c8a622a 100644
--- a/src/constraint.cc
+++ b/src/constraint.cc
@@ -220,7 +220,8 @@ Constraint * generateLTConstraint(uint numvars, Constraint ** vars, uint value)
 		}
 		andarray[andi++]=new Constraint(OR, ori, orarray);
 
-		value=value+(1<<(__builtin_ctz(value)));																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																														//flip the last one
+		value=value+(1<<(__builtin_ctz(value)));
+		//flip the last one
 	}
 }
 
diff --git a/src/csolver.h b/src/csolver.h
index 9d260e0..1d398ce 100644
--- a/src/csolver.h
+++ b/src/csolver.h
@@ -4,6 +4,9 @@
 #include "ops.h"
 
 class CSolver {
+public:
+	CSolver();
+
 	Set * createSet(Type type, uint64_t ** elements);
 	Set * createSet(Type type, uint64_t lowrange, uint64_t highrange);
 	MutableSet * createMutableSet(Type type);
@@ -15,7 +18,7 @@ class CSolver {
 	Constraint * getBooleanVar();
 
 	Function * createFunctionOperator(enum ArithOp op, Set ** domain, Set * range, enum OverFlowBehavior overflowbehavior, Constraint * overflowstatus);
-	Function * createFunctionOperator(enum ArithOp op);														//Does Not Overflow
+	Function * createFunctionOperator(enum ArithOp op);																																																										//Does Not Overflow
 	Predicate * createPredicateOperator(enum CompOp op, Set ** domain);
 
 	Table * createTable(Set **domains, Set * range);
@@ -30,5 +33,7 @@ class CSolver {
 
 	Order * createOrder(enum OrderType type, Set * set);
 	Constraint * orderedConstraint(Order * order, uint64_t first, uint64_t second);
+private:
+
 };
 #endif
diff --git a/src/element.h b/src/element.h
index bf2772c..2c0d1f6 100644
--- a/src/element.h
+++ b/src/element.h
@@ -4,10 +4,10 @@
 #include "mymemory.h"
 
 class Element {
- public:
+public:
 	Element(Set *s);
 	MEMALLOC;
- private:
+private:
 	Set *set;
 };
 #endif
diff --git a/src/function.h b/src/function.h
index 7b2b7dc..69abc54 100644
--- a/src/function.h
+++ b/src/function.h
@@ -3,9 +3,9 @@
 #include "classlist.h"
 #include "mymemory.h"
 class Function {
- public:
-	
+public:
+
 	MEMALLOC;
- private:
+private:
 };
 #endif
diff --git a/src/hashtable.h b/src/hashtable.h
index 1a0a41e..f007b59 100644
--- a/src/hashtable.h
+++ b/src/hashtable.h
@@ -81,7 +81,8 @@ public:
 		capacitymask = initialcapacity - 1;
 
 		threshold = (unsigned int)(initialcapacity * loadfactor);
-		size = 0;																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																														// Initial number of elements in the hash
+		// Initial number of elements in the hash
+		size = 0;
 	}
 
 	/** @brief Hash table destructor */
@@ -327,7 +328,8 @@ public:
 			exit(EXIT_FAILURE);
 		}
 
-		table = newtable;																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																														// Update the global hashtable upon resize()
+		table = newtable;
+		// Update the global hashtable upon resize()
 		capacity = newsize;
 		capacitymask = newsize - 1;
 
@@ -353,7 +355,8 @@ public:
 			search->val = bin->val;
 		}
 
-		_free(oldtable);																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																														// Free the memory of the old hash table
+		_free(oldtable);
+		// Free the memory of the old hash table
 	}
 	double getLoadFactor() {return loadfactor;}
 	unsigned int getCapacity() {return capacity;}
diff --git a/src/mymemory.h b/src/mymemory.h
index 642ea1d..d07a37d 100644
--- a/src/mymemory.h
+++ b/src/mymemory.h
@@ -34,7 +34,7 @@
 	void operator delete[](void *p, size_t size) { \
 		model_free(p); \
 	} \
-	void * operator new(size_t size, void *p) {																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																										/* placement new */ \
+	void * operator new(size_t size, void *p) {																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																										/* placement new */ \
 		return p; \
 	}
 
diff --git a/src/order.h b/src/order.h
index 32c6c2c..e40c879 100644
--- a/src/order.h
+++ b/src/order.h
@@ -4,9 +4,9 @@
 #include "mymemory.h"
 
 class Order {
- public:
+public:
 	MEMALLOC;
-	
- private:
+
+private:
 };
 #endif
diff --git a/src/predicate.h b/src/predicate.h
index 110cf4d..3a79a9e 100644
--- a/src/predicate.h
+++ b/src/predicate.h
@@ -4,9 +4,9 @@
 #include "mymemory.h"
 
 class Predicate {
- public:
+public:
 
 	MEMALLOC;
- private:
+private:
 };
 #endif
diff --git a/src/table.h b/src/table.h
index 96f719d..f726c4e 100644
--- a/src/table.h
+++ b/src/table.h
@@ -4,8 +4,8 @@
 #include "mymemory.h"
 
 class Table {
- public:
+public:
 	MEMALLOC;
- private:
+private:
 };
 #endif