Introduce macros for reliability #10

aeolus-project · Jul 4, 2012 · decda62 · decda62
1 parent 0e89da5
commit decda62
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git a/src/abstract_criteria.h b/src/abstract_criteria.h
@@ -10,6 +10,10 @@
 #ifndef _ABSTRACT_CRITERIA_H_
 #define _ABSTRACT_CRITERIA_H_
 
+#define  RELIABLE_OR_NOT -1
+#define NON_RELIABLE 0
+#define RELIABLE 1
+
 #include <abstract_solver.h>
 
 // Abstract criteria class

diff --git a/src/conn_criteria.h b/src/conn_criteria.h
@@ -41,8 +41,8 @@ private :
 
 	inline bool isRLSelected(pair<FacilityNode*, FacilityNode*> const &path) {
 		if(length_range.contains(path.second->getType()->getLevel() - path.first->getType()->getLevel())) {
-			return reliable == 0 ? ! isReliablePath(path.first, path.second) :
-					reliable > 0 ? isReliablePath(path.first, path.second) : true;
+			return reliable == RELIABLE ? isReliablePath(path.first, path.second) :
+					reliable == NON_RELIABLE ? isReliablePath(path.first, path.second) : true;
 		}
 		return false;
 

diff --git a/src/cudf.c b/src/cudf.c
@@ -324,26 +324,26 @@ CriteriaList *process_criteria(char *crit_descr, unsigned int &pos, bool first_l
 			// handle criteria
 			if (strncmp(crit_descr+crit_name, "pserv", crit_name_length) == 0) {
 				param_range r1("type"), r2("level");
-				int rel = -1;
+				int rel = RELIABLE_OR_NOT;
 				CUDFcoefficient lambda = 1;
 				get_criteria_properties(crit_descr, pos, r1, r2, rel, lambda, crit_descr[sign]
 				);
 				criteria->push_back(new pserv_criteria(lambda, rel, r1, r2));
 			} else if (strncmp(crit_descr+crit_name, "local", crit_name_length) == 0) {
 				param_range r1("stage"), r2("level");
-				int rel = -1;
+				int rel = RELIABLE_OR_NOT;
 				CUDFcoefficient lambda = 1;
 				get_criteria_properties(crit_descr, pos, r1, r2, rel, lambda, crit_descr[sign]);
 				criteria->push_back(new local_criteria(lambda, rel, r1, r2));
 			} else if (strncmp(crit_descr+crit_name, "conn", crit_name_length) == 0) {
 				param_range r1("stage"), r2("length",1);
-				int rel = -1;
+				int rel = RELIABLE_OR_NOT;
 				CUDFcoefficient lambda = 1;
 				get_criteria_properties(crit_descr, pos, r1, r2, rel, lambda, crit_descr[sign]);
 				criteria->push_back(new conn_criteria(lambda, rel, r1, r2));
 			} else if (strncmp(crit_descr+crit_name, "bandw", crit_name_length) == 0) {
 				param_range r1("stage"), r2("length",1);
-				int rel = -1;
+				int rel = RELIABLE_OR_NOT;
 				CUDFcoefficient lambda = 1;
 				get_criteria_properties(crit_descr, pos, r1, r2, rel, lambda, crit_descr[sign]);
 				criteria->push_back(new bandw_criteria(lambda, rel, r1, r2));
@@ -404,7 +404,6 @@ int main(int argc, char *argv[]) {
 	// parameter handling
 	if (argc > 1) {
 		for (int i = 1; i < argc; i++) {
-			cerr << argv[i] << endl;
 			if (strcmp(argv[i], "-i") == 0) {
 				i++;
 				if (i < argc) {

diff --git a/src/local_criteria.h b/src/local_criteria.h
@@ -38,8 +38,8 @@ private :
 
 	inline bool isRLSelected(FacilityNode* node) {
 		if(level_range.contains(node->getType()->getLevel())) {
-			return reliable == 0 ? !isReliablePath(problem->getRoot(), node) :
-					reliable > 0 ? isReliablePath(problem->getRoot(), node) : true;
+			return reliable == RELIABLE ? isReliablePath(problem->getRoot(), node) :
+					reliable == NON_RELIABLE ? !isReliablePath(problem->getRoot(), node) : true;
 		}
 		return false;
 	}

diff --git a/src/pserv_criteria.h b/src/pserv_criteria.h
@@ -41,8 +41,8 @@ private :
 
 	inline bool isRLSelected(FacilityNode* node) {
 		if(level_range.contains(node->getType()->getLevel())) {
-			return reliable == 0 ? !isReliablePath(problem->getRoot(), node) :
-					reliable > 0 ? isReliablePath(problem->getRoot(), node) : true;
+			return reliable == RELIABLE ? isReliablePath(problem->getRoot(), node) :
+					reliable == NON_RELIABLE ? !isReliablePath(problem->getRoot(), node) : true;
 		}
 		return false;
 	}