Mercurial > hg > constant-q-cpp

changeset 73:be277d1367f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Ant build file
author Chris Cannam <c.cannam@qmul.ac.uk>
date Fri, 21 Mar 2014 12:04:55 +0000
parents 642df7b3346f
children c2e9c91ed3f7
files cpp-qm-dsp/ConstantQ.cpp yeti/build.xml yeti/cqt.yeti
diffstat 3 files changed, 61 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/cpp-qm-dsp/ConstantQ.cpp	Thu Mar 20 16:15:43 2014 +0000
+++ b/cpp-qm-dsp/ConstantQ.cpp	Fri Mar 21 12:04:55 2014 +0000
@@ -309,7 +309,7 @@
 
     vector<C> cqrowvec = m_kernel->process(cv);
 
-    // Reform into a column matrix
+    // Reform into a column matrix and use only the magnitude
     vector<vector<double> > cqblock;
     for (int j = 0; j < m_p.atomsPerFrame; ++j) {
         cqblock.push_back(vector<double>());
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/yeti/build.xml	Fri Mar 21 12:04:55 2014 +0000
@@ -0,0 +1,59 @@
+<project name="cqt" default="jar" basedir=".">
+
+  <property name="maydir" value="${basedir}/../../may"/>
+  <property name="yetidir" value="${basedir}/../../yeti"/>
+
+  <property name="jardir" value="${maydir}/ext/jar"/>
+
+  <property name="extjars" value="${jardir}/jvamp.jar:${jardir}/yertle.jar:${jardir}/jtransforms-2.4.jar:${jardir}/jzy3d-swt-0.9.1.jar:${jardir}/jzy3d-api-0.9.1.jar:${jardir}/jogl-all.jar:${jardir}/gluegen.jar:${jardir}/gluegen-rt.jar:${jardir}/opencsv-2.1.jar:${jardir}/org.convexhull.jar"/>
+
+  <condition property="archtag" value="linux32">
+    <os family="unix" arch="i386"/>
+  </condition>
+  <condition property="archtag" value="linux64">
+    <os family="unix" arch="amd64"/>
+  </condition>
+  <condition property="archtag" value="win32">
+    <os family="windows" arch="x86"/>
+  </condition>
+  <condition property="archtag" value="win64">
+    <os family="windows" arch="amd64"/>
+  </condition>
+  <condition property="archtag" value="osx">
+    <os family="mac"/>
+  </condition>
+
+  <target name="taskdef">
+    <taskdef name="yetic" classname="yeti.lang.compiler.YetiTask"
+	     classpath="${yetidir}/yeti.jar:${maydir}/may.jar:${extjars}" />
+  </target>
+
+  <target name="prepare">
+    <mkdir dir="${basedir}/classes"/>
+  </target>
+
+  <target name="yeticlasses" depends="taskdef">
+    <yetic srcdir="${basedir}" 
+	   destdir="${basedir}/classes"
+	   includes="**/*.yeti"
+	   preload="yeti/lang/std:yeti/lang/io"/>
+  </target>
+
+  <target name="classes" depends="prepare,yeticlasses"/>
+
+  <target name="jar" depends="classes,taskdef">
+    <jar jarfile="${basedir}/cqt.jar">
+      <fileset dir="${basedir}/classes" 
+	       includes="**/*.class" 
+	       excludes="**/test/*.class"/>
+    </jar>
+  </target>
+
+  <target name="clean">
+    <delete dir="${basedir}/classes"/>
+  </target>
+
+  <target name="rebuild" depends="clean,jar"/>
+
+</project>
+
--- a/yeti/cqt.yeti	Thu Mar 20 16:15:43 2014 +0000
+++ b/yeti/cqt.yeti	Fri Mar 21 12:04:55 2014 +0000
@@ -249,7 +249,7 @@
                 done [0..octaves-1])
         },
         octaves,
-        output type =
+        output type = //!!! this api is not good
             case type of
             ComplexCQ ():
                 Complex (processOctaveLists assembleBlock octaveLists);