aubiomodule.c: add unwrap2pi

Paul Brossier committed 13 years ago

Commit 6514bb61 parent 6a50b9e2 files · +24 −1Browse files

Showing the changes to python (2 of 2 files). Show all

Unified · Split

2 files

@@ -39,6 +39,23 @@ Py_alpha_norm (PyObject * self, PyObject * args) · 38 unmodified lines
39	return result;	39	return result;
40	}	40	}
41		41
		42	static char Py_unwrap2pi_doc[] = "unwrap phase value to [-pi, pi]";
		43
		44	static PyObject *
		45	Py_unwrap2pi (PyObject * self, PyObject * args)
		46	{
		47	smpl_t input;
		48	smpl_t output;
		49
		50	if (!PyArg_ParseTuple (args, "\|f", &input)) {
		51	return NULL;
		52	}
		53
		54	output = aubio_unwrap2pi (input);
		55
		56	return (PyObject *)PyFloat_FromDouble (output);
		57	}
		58
42	static char Py_bintomidi_doc[] = "convert bin to midi";	59	static char Py_bintomidi_doc[] = "convert bin to midi";
43		60
44	static PyObject *	61	static PyObject *
@@ -208,6 +225,7 @@ Py_min_removal(PyObject * self, PyObject * args) · 163 unmodified lines
208	}	225	}
209		226
210	static PyMethodDef aubio_methods[] = {	227	static PyMethodDef aubio_methods[] = {
		228	{"unwrap2pi", Py_unwrap2pi, METH_VARARGS, Py_unwrap2pi_doc},
211	{"bintomidi", Py_bintomidi, METH_VARARGS, Py_bintomidi_doc},	229	{"bintomidi", Py_bintomidi, METH_VARARGS, Py_bintomidi_doc},
212	{"miditobin", Py_miditobin, METH_VARARGS, Py_miditobin_doc},	230	{"miditobin", Py_miditobin, METH_VARARGS, Py_miditobin_doc},
213	{"bintofreq", Py_bintofreq, METH_VARARGS, Py_bintofreq_doc},	231	{"bintofreq", Py_bintofreq, METH_VARARGS, Py_bintofreq_doc},

 from numpy.testing import TestCase, run_module_suite
 from numpy.testing import assert_equal, assert_almost_equal
 from aubio import bintomidi, miditobin, freqtobin, bintofreq, freqtomidi, miditofreq
+from aubio import unwrap2pi
 class aubio_mathutils(TestCase):
+    def test_unwrap2pi(self):
+       a = [ x/100. for x in range(-600,600,100) ]
+       b = [ unwrap2pi(x) for x in a ]
+       #print b
     def test_miditobin(self):
        a = [ miditobin(a, 44100, 512) for a in range(128) ]
     def test_miditofreq(self):
        freqs = [ miditofreq(a) for a in range(128) ]
        midis = [ freqtomidi(a) for a in freqs ]
-       print midis
 if __name__ == '__main__':
     from unittest import main

Keyboard shortcuts