Merge branch 'master' of git.autistici.org:djrandom

server/djrandom/mood/Makefile

+
+all: marsyas_c_utils.py
+
+marsyas_c_utils_wrap.cc marsyas_c_utils.py: marsyas_c_utils.i
+	swig -o marsyas_c_utils_wrap.cc -c++ -python marsyas_c_utils.i

server/djrandom/mood/marsyas_c_utils.cc

+
+#include <marsyas/NumericLib.h>
+#include "marsyas_c_utils.h"
+
+using namespace Marsyas;
+
+double euclidean_distance(const realvec& a, const realvec& b)
+{
+  realvec cov;
+  return NumericLib::euclideanDistance(a, b, cov);
+}
+

server/djrandom/mood/marsyas_c_utils.h

+// -*- c++ -*-
+
+#ifndef __djrandom_mood_H
+#define __djrandom_mood_H 1
+
+#include <marsyas/realvec.h>
+
+double euclidean_distance(const Marsyas::realvec& a,
+                          const Marsyas::realvec& b);
+
+#endif

server/djrandom/mood/marsyas_c_utils.i

+%module marsyas_c_utils
+
+%{
+#define SWIG_FILE_WITH_INIT
+#include "marsyas_c_utils.h"
+%}
+
+%include "marsyas_c_utils.h"
+

server/djrandom/mood/marsyas_c_utils.py

+# This file was automatically generated by SWIG (http://www.swig.org).
+# Version 1.3.40
+#
+# Do not make changes to this file unless you know what you are doing--modify
+# the SWIG interface file instead.
+# This file is compatible with both classic and new-style classes.
+
+from sys import version_info
+if version_info >= (2,6,0):
+    def swig_import_helper():
+        from os.path import dirname
+        import imp
+        fp = None
+        try:
+            fp, pathname, description = imp.find_module('_marsyas_c_utils', [dirname(__file__)])
+        except ImportError:
+            import _marsyas_c_utils
+            return _marsyas_c_utils
+        if fp is not None:
+            try:
+                _mod = imp.load_module('_marsyas_c_utils', fp, pathname, description)
+            finally:
+                fp.close()
+            return _mod
+    _marsyas_c_utils = swig_import_helper()
+    del swig_import_helper
+else:
+    import _marsyas_c_utils
+del version_info
+try:
+    _swig_property = property
+except NameError:
+    pass # Python < 2.2 doesn't have 'property'.
+def _swig_setattr_nondynamic(self,class_type,name,value,static=1):
+    if (name == "thisown"): return self.this.own(value)
+    if (name == "this"):
+        if type(value).__name__ == 'SwigPyObject':
+            self.__dict__[name] = value
+            return
+    method = class_type.__swig_setmethods__.get(name,None)
+    if method: return method(self,value)
+    if (not static) or hasattr(self,name):
+        self.__dict__[name] = value
+    else:
+        raise AttributeError("You cannot add attributes to %s" % self)
+
+def _swig_setattr(self,class_type,name,value):
+    return _swig_setattr_nondynamic(self,class_type,name,value,0)
+
+def _swig_getattr(self,class_type,name):
+    if (name == "thisown"): return self.this.own()
+    method = class_type.__swig_getmethods__.get(name,None)
+    if method: return method(self)
+    raise AttributeError(name)
+
+def _swig_repr(self):
+    try: strthis = "proxy of " + self.this.__repr__()
+    except: strthis = ""
+    return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
+
+try:
+    _object = object
+    _newclass = 1
+except AttributeError:
+    class _object : pass
+    _newclass = 0
+
+
+__djrandom_mood_H = _marsyas_c_utils.__djrandom_mood_H
+
+def euclidean_distance(*args):
+  return _marsyas_c_utils.euclidean_distance(*args)
+euclidean_distance = _marsyas_c_utils.euclidean_distance
+
+

server/setup.py

@@ -3,9 +3,9 @@
 from setuptools import setup, find_packages, Extension
 
 mood_module = Extension(
-    'djrandom.mood._mood',
-    sources=['djrandom/mood/mood_wrap.cc',
-             'djrandom/mood/mood.cc'],
+    'djrandom.mood._marsyas_c_utils',
+    sources=['djrandom/mood/marsyas_c_utils_wrap.cc',
+             'djrandom/mood/marsyas_c_utils.cc'],
     libraries=['marsyas'],
     )