Revision 22:6afcb5edd7ab Peaks.cpp

View differences:

Peaks.cpp
29 29 
        if (i < 0)
30 30 
            i = 0;
31 31 
        int stop = mid + width + 1;
32 
        if (stop > data.size())
32 
        if (stop > (int)data.size())
33 33 
            stop = data.size();
34 34 
        maxp = i;
35 35 
        for (i++; i < stop; i++)
......
40 40 
            for (j = peakCount; j > 0; j--) {
41 41 
                if (data[maxp] <= data[peaks[j-1]])
42 42 
                    break;
43 
                else if (j < peaks.size())
43 
                else if (j < (int)peaks.size())
44 44 
                    peaks[j] = peaks[j-1];
45 45 
            }
46 
            if (j != peaks.size())
46 
            if (j != (int)peaks.size())
47 47 
                peaks[j] = maxp;
48 
            if (peakCount != peaks.size())
48 
            if (peakCount != (int)peaks.size())
49 49 
                peakCount++;
50 50 
        }
51 51 
        mid++;
......
69 69 
        if (i < 0)
70 70 
            i = 0;
71 71 
        int stop = mid + width + 1;
72 
        if (stop > data.size())
72 
        if (stop > (int)data.size())
73 73 
            stop = data.size();
74 74 
        maxp = i;
75 75 
        for (i++; i < stop; i++)
......
106 106 
        if (iStart < 0)
107 107 
            iStart = 0;
108 108 
        int iStop = index + post * width;
109 
        if (iStop > data.size())
109 
        if (iStop > (int)data.size())
110 110 
            iStop = data.size();
111 111 
        double sum = 0;
112 112 
        int count = iStop - iStart;
......
120 120 
void Peaks::normalise(vector<double> &data) {
121 121 
    double sx = 0;
122 122 
    double sxx = 0;
123 
    for (int i = 0; i < data.size(); i++) {
123 
    for (int i = 0; i < (int)data.size(); i++) {
124 124 
        sx += data[i];
125 125 
        sxx += data[i] * data[i];
126 126 
    }
......
128 128 
    double sd = sqrt((sxx - sx * mean) / data.size());
129 129 
    if (sd == 0)
130 130 
        sd = 1;		// all data[i] == mean  -> 0; avoids div by 0
131 
    for (int i = 0; i < data.size(); i++) {
131 
    for (int i = 0; i < (int)data.size(); i++) {
132 132 
        data[i] = (data[i] - mean) / sd;
133 133 
    }
134 134 
} // normalise()
......
154 154 
    double delta = n * sxx - sx * sx;
155 155 
    for ( ; j < n / 2; j++)
156 156 
        slope[j] = (n * sxy - sx * sy) / delta;
157 
    for ( ; j < data.size() - (n + 1) / 2; j++, i++) {
157 
    for ( ; j < (int)data.size() - (n + 1) / 2; j++, i++) {
158 158 
        slope[j] = (n * sxy - sx * sy) / delta;
159 159 
        sy += data[i] - data[i - n];
160 160 
        sxy += hop * (n * data[i] - sy);
161 161 
    }
162 
    for ( ; j < data.size(); j++)
162 
    for ( ; j < (int)data.size(); j++)
163 163 
        slope[j] = (n * sxy - sx * sy) / delta;
164 164 
} // getSlope()
165 165 

  		




  166
  166
  
    
int Peaks::imin(const vector<double> &arr) {


  		




  167
  167
  
    
    int i = 0;


  		




  168
  
  
    
    for (int j = 1; j < arr.size(); j++)


  		




  
  168
  
    
    for (int j = 1; j < (int)arr.size(); j++)


  		




  169
  169
  
    
        if (arr[j] < arr[i])


  		




  170
  170
  
    
            i = j;


  		




  171
  171
  
    
    return i;


  		




  ......




  173
  173
  
    

  		




  174
  174
  
    
int Peaks::imax(const vector<double> &arr) {


  		




  175
  175
  
    
    int i = 0;


  		




  176
  
  
    
    for (int j = 1; j < arr.size(); j++)


  		




  
  176
  
    
    for (int j = 1; j < (int)arr.size(); j++)


  		




  177
  177
  
    
        if (arr[j] > arr[i])


  		




  178
  178
  
    
            i = j;


  		




  179
  179
  
    
    return i;


  		












Also available in:  Unified diff