Changeset 2986

Timestamp:

Dec 1, 2006, 11:30:33 AM (16 years ago)

Author:

Johan Enell

Message:

Added jep function for spot position

Location:

branches/2.1/src/core/net/sf/basedb/util

Files:

• BioAssaySetUtil.java (modified) (3 diffs)
• jep/PositionFunction.java (added)

branches/2.1/src/core/net/sf/basedb/util/BioAssaySetUtil.java

@@ -43 +43 @@
 import net.sf.basedb.util.jep.Jep;
 import net.sf.basedb.util.jep.NotInReporterListFunction;
+import net.sf.basedb.util.jep.PositionFunction;
 import net.sf.basedb.util.jep.RawFunction;
 import net.sf.basedb.util.jep.ReporterFunction;
@@ -162 +163 @@
     <li>raw(property): The value of the specified raw data property
     <li>rep(property): The value of the specified reporter property
+    <li>pos: The position of a spot. Note that this is not the same as raw(position)
     <li>ch(n): The intensity in channel n
     <li>score(list): The score of the {@link Reporter} in the specified {@link ReporterList}
@@ -177 +179 @@
     RawFunction raw = new RawFunction();
     ChannelFunction ch = new ChannelFunction();
+    PositionFunction pos = new PositionFunction();
     ReporterFunction reporter = new ReporterFunction();
     ScoreFunction score = new ScoreFunction(dc);
     ExtraValueFunction xtra = new ExtraValueFunction(dc, bioAssaySet);
-    return Jep.formulaToExpression(formula, raw, ch, reporter, score, xtra);
+    return Jep.formulaToExpression(formula, raw, ch, pos, reporter, score, xtra);
   }