comparison src/EM.cpp @ 94:891cbcf1e4d2 bqvec

Vectorise some calculations

     double **newSources = allocate_channels<double>(m_sourceCount, m_noteCount);
     for (int i = 0; i < m_sourceCount; ++i) {
         v_set(newSources[i], epsilon, m_noteCount);
     }
 
+    double *contributions = allocate<double>(m_binCount);
+
     for (int n = 0; n < m_noteCount; ++n) {
 
         const double pitch = m_pitches[n];
 
         for (int f = 0; f < m_shiftCount; ++f) {

 
                 const double source = m_sources[i][n];
                 const double factor = pitch * source * shift;
                 const double *w = templateFor(i, n, f);
 
+                v_copy(contributions, w, m_binCount);
+                v_add(contributions, m_q, m_binCount);
+                v_scale(contributions, factor, m_binCount);
+
+                double total = v_sum(contributions, m_binCount);
+
                 if (n >= m_lowestPitch && n <= m_highestPitch) {
 
-                    for (int j = 0; j < m_binCount; ++j) {
-                        newPitches[n] += w[j] * m_q[j] * factor;
-                    }
+                    newPitches[n] += total;
 
                     if (inRange(i, n)) {
-                        for (int j = 0; j < m_binCount; ++j) {
-                            newSources[i][n] += w[j] * m_q[j] * factor;
-                        }
+                        newSources[i][n] += total;
                     }
                 }
 
-                for (int j = 0; j < m_binCount; ++j) {
-                    newShifts[f][n] += w[j] * m_q[j] * factor;
-                }
+                newShifts[f][n] += total;
             }
         }
     }
 
     for (int n = 0; n < m_noteCount; ++n) {