linear search for simulation

Author: emptyewer

mainwindow.cpp

@@ -333,7 +333,7 @@ void MainWindow::on_simulate_clicked() {
   repeats = 1;
   QList<QString> genes = get_sorted_genes();
   for (int j = 0; j < genes.size(); ++j) {
-    prior_distribution._simulated_counts[genes[j]] = {};
+    prior_distribution._simulated_counts[genes[j]].clear();
   }
   control_threads();
 }
@@ -358,32 +358,41 @@ void MainWindow::control_threads() {
 void MainWindow::launch_mc_threaad(QList<QString> genes) {
   QThread *workerThread = new QThread;
   MCWorker *worker;
-  worker = new MCWorker(prior_distribution._filtered_counts, genes,
-                        prior_distribution.fcount, ui->reads->value(), repeats);
+  qRegisterMetaType<QMap<QString, unsigned long>>();
+
+  worker = new MCWorker(
+      prior_distribution._filtered_counts, genes, prior_distribution.fcount,
+      static_cast<unsigned long>(ui->reads->value()), repeats);
 
   worker->moveToThread(workerThread);
-  connect(workerThread, SIGNAL(started()), worker, SLOT(doWork()));
-  connect(worker, SIGNAL(finished(int)), workerThread, SLOT(quit()));
-  connect(worker, SIGNAL(finished(int)), worker, SLOT(deleteLater()));
-  connect(worker, SIGNAL(finished(int)), this, SLOT(simulation_finished(int)));
+
+  connect(worker,
+          SIGNAL(linear_search_finished(int, QMap<QString, unsigned long>)),
+          this, SLOT(ls_finished(int, QMap<QString, unsigned long>)));
+
+  connect(worker,
+          SIGNAL(linear_search_finished(int, QMap<QString, unsigned long>)),
+          workerThread, SLOT(quit()));
+  connect(worker,
+          SIGNAL(linear_search_finished(int, QMap<QString, unsigned long>)),
+          worker, SLOT(deleteLater()));
+
+  connect(workerThread, SIGNAL(started()), worker, SLOT(linearSearch()));
   connect(workerThread, SIGNAL(finished()), workerThread, SLOT(deleteLater()));
-  connect(worker, SIGNAL(update_value(int, QString)), this,
-          SLOT(partial_simulation_finished(int, QString)));
   workerThread->start();
   ui->simulate->setEnabled(false);
 }
 
-void MainWindow::partial_simulation_finished(int value, QString gene) {
-  prior_distribution._simulated_counts[gene].append(value);
-}
-
-void MainWindow::simulation_finished(int thread) {
+void MainWindow::ls_finished(int thread,
+                             QMap<QString, unsigned long> gene_picks) {
   ui->simulate->setEnabled(true);
-  if (thread == ui->runs->value()) {
+  for (QString gene : gene_picks.keys()) {
+    prior_distribution._simulated_counts[gene].append(gene_picks.value(gene));
+  }
+  if (thread >= ui->runs->value()) {
+    qDebug() << thread << ui->runs->value();
     update_counts_table();
     update_table_colors(ui->count_table);
-    //    qDebug() << prior_distribution._simulated_counts;
-    //    qDebug() << "Simulation Finished";
   } else {
     control_threads();
   }

mainwindow.h

@@ -27,17 +27,11 @@ private slots:
   void on_confidence_valueChanged(double arg1);
   void showPointToolTip(QMouseEvent *event);
   void on_cutoff_editingFinished();
-
   void on_simulate_clicked();
-  void partial_simulation_finished(int, QString);
-  void simulation_finished(int);
-
+  void ls_finished(int, QMap<QString, unsigned long>);
   void on_lower_slider_sliderReleased();
-
   void on_upper_slider_sliderReleased();
-
   void on_upper_slider_valueChanged(int value);
-
   void on_lower_slider_valueChanged(int value);
 
 private:

mainwindow.ui

@@ -286,7 +286,7 @@
         <item>
          <widget class="QLabel" name="label_3">
           <property name="text">
-           <string>MC Picks</string>
+           <string>Sim. Picks</string>
           </property>
          </widget>
         </item>
@@ -300,7 +300,7 @@
         <item>
          <widget class="QLabel" name="label_4">
           <property name="text">
-           <string>MC Runs</string>
+           <string>Sim. Runs</string>
           </property>
          </widget>
         </item>
@@ -309,8 +309,11 @@
           <property name="minimum">
            <number>1</number>
           </property>
+          <property name="maximum">
+           <number>1000</number>
+          </property>
           <property name="value">
-           <number>10</number>
+           <number>100</number>
           </property>
          </widget>
         </item>
@@ -343,7 +346,7 @@
        </size>
       </property>
       <property name="currentIndex">
-       <number>0</number>
+       <number>1</number>
       </property>
       <widget class="QWidget" name="tab">
        <attribute name="title">
@@ -377,7 +380,7 @@
       </widget>
       <widget class="QWidget" name="tab_2">
        <attribute name="title">
-        <string>Monte Carlo Counts</string>
+        <string>Simulation Counts</string>
        </attribute>
        <layout class="QVBoxLayout" name="verticalLayout_2">
         <item>

mcworker.cpp

@@ -6,7 +6,7 @@
 static std::mt19937
     rng(std::chrono::high_resolution_clock::now().time_since_epoch().count());
 
-MCWorker::MCWorker(QMap<QString, double> a, QList<QString> g, unsigned long c,
+MCWorker::MCWorker(QMap<QString, double> a, QList<QString> g, double c,
                    unsigned long t, int th) {
   map = a;
   genes = g;
@@ -16,26 +16,24 @@ MCWorker::MCWorker(QMap<QString, double> a, QList<QString> g, unsigned long c,
   counting = true;
 }
 
-void MCWorker::doWork() {
+void MCWorker::linearSearch() {
+  QMap<QString, unsigned long> gene_picks;
+  QMap<double, QString> gene_prob;
+  double cum_count = 0;
   for (int i = 0; i < genes.length(); i++) {
+    gene_picks[genes[i]] = 0;
     double p = map[genes[i]] / count;
-    int count = 0;
-    for (unsigned long j = 0; j < trials; j++) {
-      if (counting) {
-        //        double r = static_cast<double>(rand() /
-        //        static_cast<double>(RAND_MAX));
-        double r =
-            static_cast<double>(rng()) / (static_cast<double>(rng.max()));
-        if (r < p) {
-          count = count + 1;
-        }
-      } else {
-        emit finished(thread);
-      }
-    }
-    emit update_value(count, genes[i]);
+    cum_count = cum_count + p;
+    gene_prob[cum_count] = genes[i];
   }
-  emit finished(thread);
+
+  for (unsigned long j = 0; j < trials; j++) {
+    double random_number =
+        static_cast<double>(rng()) / (static_cast<double>(rng.max()));
+    QString picked_gene = gene_prob.upperBound(random_number).value();
+    gene_picks[picked_gene] = gene_picks[picked_gene] + 1;
+  }
+  emit linear_search_finished(thread, gene_picks);
 }
 
 void MCWorker::stopWork() { counting = false; }

mcworker.h

@@ -6,21 +6,20 @@
 class MCWorker : public QObject {
   Q_OBJECT
 public:
-  explicit MCWorker(QMap<QString, double>, QList<QString>, unsigned long c,
+  explicit MCWorker(QMap<QString, double>, QList<QString>, double c,
                     unsigned long t, int);
 
 public slots:
-  void doWork();
   void stopWork();
+  void linearSearch();
 
 signals:
-  void update_value(int, QString);
-  void finished(int);
+  void linear_search_finished(int, QMap<QString, unsigned long>);
 
 private:
   QMap<QString, double> map;
   QList<QString> genes;
-  unsigned long count;
+  double count;
   unsigned long trials;
   bool counting;
   int thread;

structs.h

@@ -16,7 +16,7 @@ struct prior {
   QMap<QString, double> _filtered_counts;
   QMap<QString, double> _bound_counts;
   QMap<QString, QList<double>> _simulated_counts;
-  unsigned int fcount;
+  double fcount;
 };
 
 struct greater_comp {