Changeset 7199 for branches/stable_5.0

Timestamp:

24/02/11 21:39:48 (15 months ago)

Author:

westram

Message:

• backport of [7198]

Location:

branches/stable_5.0/PROBE

Files:

• PT_new_design.cxx (modified) (3 diffs)
• probe.h (modified) (2 diffs)

branches/stable_5.0/PROBE/PT_new_design.cxx

@@ -198 +198 @@
     int operator()(int name, int apos, int rpos) {
         char *probe = psg.probe;
-        if (apos>psg.apos) psg.apos = apos;
+        psg.abs_pos.announce(apos);
         if (psg.data[name].is_group) return 0;              /* dont count group or neverminds */
         if (probe) {
@@ -225 +225 @@
         name = PT_read_name(psg.ptmain,pt);
         int apos = PT_read_apos(psg.ptmain,pt);
-        if (apos>psg.apos) psg.apos = apos;
+        psg.abs_pos.announce(apos);
         if (!psg.data[name].is_group)   return 1;
         return 0;
@@ -406 +406 @@
                 tprobe = tprobe_next ) {
         tprobe_next = tprobe->next;
-        psg.apos = 0;
+        psg.abs_pos.clear();
         tprobe->mishit = ptnd_count_mishits(tprobe->sequence,psg.pt,0);
-        tprobe->apos = psg.apos;
+        tprobe->apos = psg.abs_pos.get_most_used();
         if (tprobe->mishit > pdc->mishit) {
             destroy_PT_tprobes(tprobe);
         }
     }
+    psg.abs_pos.clear();
 }
 /***********************************************************************

branches/stable_5.0/PROBE/probe.h

@@ -172 +172 @@
 class BI_ecoli_ref;
 
+class MostUsedPos {
+    int pos;
+    int used;
+
+    MostUsedPos *next;
+
+    void swapWith(MostUsedPos *other) {
+        std::swap(pos, other->pos);
+        std::swap(used, other->used);
+    }
+
+public:
+    MostUsedPos() : pos(0), used(0), next(NULL) { }
+    MostUsedPos(int p) : pos(p), used(1), next(NULL) { }
+    ~MostUsedPos() { delete next; }
+
+    void clear() {
+        pos  = 0;
+        used = 0;
+        delete next;
+        next = NULL;
+    }
+
+    void announce(int p) {
+        if (p == pos) used++;
+        else {
+            if (next) next->announce(p);
+            else next = new MostUsedPos(p);
+            if (next->used>used) swapWith(next);
+        }
+    }
+
+
+    int get_most_used() const { return pos; }
+};
+
 extern struct probe_struct_global   {
     GBDATA  *gb_main;           /* ARBDB interface */
@@ -201 +237 @@
     int height;
     int length;
-    int apos;
+    
+    MostUsedPos abs_pos;
 
     int sort_by;