Changeset 3656

Timestamp:

Aug 13, 2007, 8:03:01 AM (16 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #719: Add support for JEP if() function

Location:

trunk

Files:

• src/core/net/sf/basedb/util/jep/convert/ConverterFactory.java (modified) (2 diffs)
• src/core/net/sf/basedb/util/jep/convert/IfConverter.java (added)
• src/test/TestJep.java (modified) (1 diff)
• www/common/expression_builder.jsp (modified) (10 diffs)

trunk/src/core/net/sf/basedb/util/jep/convert/ConverterFactory.java

@@ -39 +39 @@
 import org.nfunk.jep.function.Divide;
 import org.nfunk.jep.function.Exp;
+import org.nfunk.jep.function.If;
 import org.nfunk.jep.function.Logarithm;
 import org.nfunk.jep.function.Multiply;
@@ -95 +96 @@
     converters.put(Abs.class, new AbsConverter());
     converters.put(Exp.class, new ExpConverter());
+    converters.put(If.class, new IfConverter());
     
     // Constant values

trunk/src/test/TestJep.java

@@ -46 +46 @@
     String expression1 = "raw(ch1FgMean) - raw(ch1BgMean)";
     String expression2 = "ln((raw(ch1FgMean) - raw(ch1BgMean)) / (raw(ch2FgMean) - raw(ch2BgMean)))";
-    String bigExpression = "1+sqrt(2)-exp(3)*abs(-4)/log(5)+ln(5.99)+x";
+    String bigExpression = "1+sqrt(2)-exp(3)*abs(-4)/log(5)+ln(5.99)+x+if(a<b, 11, -11)";
     String restriction1 = expression1 + " > 0";
     String restriction2 = expression2 + " > 2";

trunk/www/common/expression_builder.jsp

@@ -193 +193 @@
       if (frm.expression.value != '')
       {
+        var expression = frm.expression.value.replace('if(', 'jepIf(');
         try
         {
-          var result = eval(frm.expression.value);
+          var result = eval(expression);
           alert('The expressions seems to be ok.\nNote! This feature is experimental and may not be 100% correct.');
         }
@@ -286 +287 @@
       return Math.random() * 100;
     }
+    function jepIf(condition, ifTrue, ifFalse)
+    {
+      if (condition == undefined || ifTrue == undefined || ifFalse == undefined)
+      {
+        throw 'if() needs 3 arguments';
+      }
+      return condition ? ifTrue : ifFalse;
+    }
     </script>
   </base:head>
@@ -303 +312 @@
             tooltip="BOOLEAN AND: expr1 &amp;&amp; expr2"
             onclick="encloseSelection(' &amp;&amp; ', '')"
-            visible="<%=restrictions%>"
           />
           <tbl:button 
@@ -309 +317 @@
             tooltip="BOOLEAN OR: expr1 || expr2"
             onclick="encloseSelection(' || ', '')"
-            visible="<%=restrictions%>"
           />
           <tbl:button 
@@ -315 +322 @@
             tooltip="BOOLEAN NOT: !expr1"
             onclick="encloseSelection('!', '')"
-            visible="<%=restrictions%>"
           />
           <tbl:button 
@@ -321 +327 @@
             tooltip="EQUAL: expr1 == expr2"
             onclick="encloseSelection(' == ', '')"
-            visible="<%=restrictions%>"
           />
           <tbl:button 
@@ -327 +332 @@
             tooltip="INEQUAL: expr1 != expr2"
             onclick="encloseSelection(' != ', '')"
-            visible="<%=restrictions%>"
           />
           <tbl:button 
@@ -333 +337 @@
             tooltip="LESS: expr1 &lt; expr2"
             onclick="encloseSelection(' &lt; ', '')"
-            visible="<%=restrictions%>"
           />
           <tbl:button 
@@ -339 +342 @@
             tooltip="LESS OR EQUAL: expr1 &lt;= expr2"
             onclick="encloseSelection(' &lt;= ', '')"
-            visible="<%=restrictions%>"
           />
           <tbl:button 
@@ -351 +353 @@
             tooltip="MORE: expr1 &gt; expr2"
             onclick="encloseSelection(' &gt; ', '')"
-            visible="<%=restrictions%>"
           />
           <tbl:button