Commit ae040fe1 authored by Alvarez, Gonzalo's avatar Alvarez, Gonzalo
Browse files

PredicateAwesome: added !=

parent 3125e411

src/PredicateSimple.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2,6 +2,6 @@ 


namespace PsimagLite {

PredicateSimple::VectorStringType PredicateSimple::ops_ =

{"==", "<=", ">=", ">", "<", "%"};

{"==", "!=", "<=", ">=", ">", "<", "%"};



}

src/PredicateSimple.h

+6 −0
Original line number Diff line number Diff line
@@ -46,6 +46,9 @@ public: 
			}

		}



		if (length == 0)

			err("Could not find operator in predicate " + pred + "\n");



		lhs_ = pred.substr(0, location);

		op_ = pred.substr(location, length);

		rhs_ = pred.substr(location + length, n - location - length);
@@ -66,8 +69,11 @@ private: 
	static bool compareOnOp(T lv, String op, T rv)

	{

		// {==, <, >, <=, >=, %}

		// If you add something here, add it also to PredicateSimple.cpp

		if (op == "==")

			return (lv == rv);

		if (op == "!=")

			return (lv != rv);

		if (op == "<")

			return (lv < rv);

		if (op == ">")