Change param_range ctor (#10)

aeolus-project · Jun 18, 2012 · 8dd07a0 · 8dd07a0
1 parent 6eecf2a
commit 8dd07a0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/abstract_criteria.h b/src/abstract_criteria.h
@@ -116,6 +116,8 @@ class param_range {
 		assert(_min <= _max);
 	}
 	param_range(string param, int min) : param_name(param), _min(min), _max(numeric_limits<int>::max()) {}
+	param_range(string param) : param_name(param), _min(0), _max(numeric_limits<int>::max()) {}
+
 	virtual ~param_range() {}
 
 	bool contains(int val) {

diff --git a/src/cudf.c b/src/cudf.c
@@ -336,26 +336,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",0), r2("level",0);
+				param_range r1("type"), r2("level");
 				int rel = -1;
 				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",0), r2("level",0);
+				param_range r1("stage"), r2("level");
 				int rel = -1;
 				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",0), r2("length",1);
+				param_range r1("stage"), r2("length",1);
 				int rel = -1;
 				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",0), r2("length",1);
+				param_range r1("stage"), r2("length",1);
 				int rel = -1;
 				CUDFcoefficient lambda = 1;
 				get_criteria_properties(crit_descr, pos, r1, r2, rel, lambda, crit_descr[sign]);