Update of /cvsroot/jrobin/src/jrobin/graph
In directory sc8-pr-cvs1:/tmp/cvs-serv17241/jrobin/graph
Modified Files:
RpnCalculator.java
Log Message:
Added more appropriate exception when RrdDb tries to open non-existent RRD file. Added logical functions (AND, OR, XOR) to RpnCalculator.
Index: RpnCalculator.java
===================================================================
RCS file: /cvsroot/jrobin/src/jrobin/graph/RpnCalculator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RpnCalculator.java 4 Sep 2003 13:27:14 -0000 1.1
--- RpnCalculator.java 17 Oct 2003 12:12:20 -0000 1.2
***************
*** 169,172 ****
--- 169,185 ----
push(Math.E);
}
+ // logical operators
+ else if(token.equals("AND")) {
+ double x2 = pop(), x1 = pop();
+ push((x1 != 0 && x2 != 0)? 1: 0);
+ }
+ else if(token.equals("OR")) {
+ double x2 = pop(), x1 = pop();
+ push((x1 != 0 || x2 != 0)? 1: 0);
+ }
+ else if(token.equals("XOR")) {
+ double x2 = pop(), x1 = pop();
+ push(((x1 != 0 && x2 == 0) || (x1 == 0 && x2 != 0))? 1: 0);
+ }
else {
throw new RrdException("Unknown token enocuntered: " + token);
|
