comparison data/model/test/MockWaveModel.cpp @ 1141:99acfd2d9f5d

Merge
author Chris Cannam
date Tue, 03 Nov 2015 12:41:15 +0000
parents 6d550a16f7d6
children 1309b66eff53
comparison
equal deleted inserted replaced
1140:c7f1300dbf64 1141:99acfd2d9f5d
12 License, or (at your option) any later version. See the file 12 License, or (at your option) any later version. See the file
13 COPYING included with this distribution for more information. 13 COPYING included with this distribution for more information.
14 */ 14 */
15 15
16 #include "MockWaveModel.h" 16 #include "MockWaveModel.h"
17
18 #include <cmath>
17 19
18 using namespace std; 20 using namespace std;
19 21
20 MockWaveModel::MockWaveModel(vector<Sort> sorts, int length, int pad) 22 MockWaveModel::MockWaveModel(vector<Sort> sorts, int length, int pad)
21 { 23 {