Changeset 8175

Timestamp:

30/10/11 21:34:50 (7 months ago)

Author:

eissler

Message:

Updated boost::atomic to solve some issues
deactivated some experimental PTPan code

Location:

branches/ptpan_back

Files:

• HEADERLIBS/boost.tar.gz (modified) (previous)
• ptpan/ptpan_tree.cxx (modified) (4 diffs)

branches/ptpan_back/ptpan/ptpan_tree.cxx

@@ -946 +946 @@
         printf("Calc Probe Quality\n");
 #endif
-        if (dqh.dqh_Hits.size() < m_num_threads || m_num_threads <= 1) {
+// TODO get parallel code running        if (dqh.dqh_Hits.size() < m_num_threads || m_num_threads <= 1) {
             design_probes(dq, dqh);
-        } else {
-            std::size_t i = 0;
-            ULONG participators = m_num_threads;
-            for (; i < participators - 1; i++) {
-                boost::threadpool::schedule(
-                        *m_threadpool,
-                        boost::bind(&PtpanTree::design_probes, this,
-                                boost::ref(dq), boost::ref(dqh), i,
-                                participators));
-            }
-            design_probes(dq, dqh, i, participators); // main thread can do some work as well!
-            m_threadpool->wait();
-        }
+//        } else {
+//            std::size_t i = 0;
+//            ULONG participators = m_num_threads;
+//            for (; i < participators - 1; i++) {
+//                boost::threadpool::schedule(
+//                        *m_threadpool,
+//                        boost::bind(&PtpanTree::design_probes, this,
+//                                boost::ref(dq), boost::ref(dqh), i,
+//                                participators));
+//            }
+//            design_probes(dq, dqh, i, participators); // main thread can do some work as well!
+//            m_threadpool->wait();
+//        }
         // remove invalid design hits! due to parallelization, we cannot do this before!
         boost::ptr_vector<DesignHit>::iterator dh;
@@ -4395 +4395 @@
                         if (dqh.hitsAnyFeature(ht->ht_AbsPos, ht->ht_Entry,
                                 dq)) {
-                            dh->dh_GroupHits++;
+                            dh->dh_GroupHits++; // TODO FIXME should check for entries hit!!
                         } else {
                             // It's a non-group hit as it misses the marked features
@@ -4404 +4404 @@
                         }
                     } else {
-                        dh->dh_GroupHits++;
+                        dh->dh_GroupHits++; // TODO FIXME should check for entries hit!!
                     }
                 } else {
@@ -4483 +4483 @@
         SimilaritySearchQueryHandle& ssqh) const {
 
-    if (ssqh.ssqh_filtered_seq_len < ssq.ssq_WindowSize || m_num_threads <= 1) {
+    // TODO get parallel code running    if (ssqh.ssqh_filtered_seq_len < ssq.ssq_WindowSize || m_num_threads <= 1) {
         ss_window_search(ssq, ssqh);
-    } else {
-        std::size_t i = 0;
-        ULONG participators = m_num_threads;
-        for (; i < participators - 1; i++) {
-            boost::threadpool::schedule(
-                    *m_threadpool,
-                    boost::bind(&PtpanTree::ss_window_search, this,
-                            boost::ref(ssq), boost::ref(ssqh), i,
-                            participators));
-        }
-        ss_window_search(ssq, ssqh, i, participators); // main thread can do some work as well!
-        m_threadpool->wait();
-    }
+//    } else {
+//        std::size_t i = 0;
+//        ULONG participators = m_num_threads;
+//        for (; i < participators - 1; i++) {
+//            boost::threadpool::schedule(
+//                    *m_threadpool,
+//                    boost::bind(&PtpanTree::ss_window_search, this,
+//                            boost::ref(ssq), boost::ref(ssqh), i,
+//                            participators));
+//        }
+//        ss_window_search(ssq, ssqh, i, participators); // main thread can do some work as well!
+//        m_threadpool->wait();
+//    }
 }