merged with upstream

README.md

@@ -2,29 +2,40 @@
 
 This repository contains the software library IPAACA developed by the Social Cognitive Systems Group at Bielefeld University. IPAACA stands for 'Incremental Processing Architecture for Artificial Conversational Agents.' The library is available in three languages: Python (Python3 compatible), C++, and Java, and for three operating systems: Linux, OS X, and Windows.
 
-## Installation
+## Build dependencies 
 
 ### Linux
 Dependencies: Protocol Buffer (libprotobuf), Transport Protocol (**libmosquittopp**, ros, librsb)
 
 sudo apt-get install libprotobuf-dev
+
 sudo apt-get install libprotoc-dev
+
 sudo apt-get install protobuf-compiler
+
 sudo apt-get install mosquitto libmosquittopp-dev
 
-git clone git@gitlab.ub.uni-bielefeld.de:scs/ipaaca.git
+## Build/Install instructions 
 
+### Linux
 **Compiling C++ Version** 
 
 cd ipaaca/ipaacalib/cpp
+
 mkdir build
+
 cd build
+
 cmake ..
+
 make
 
+sudo make install
+
 **Installing Python Version**
 
 cd ipaaca/ipaacalib/python
+
 python3 setup.py install --user
 
 ### OS X
@@ -41,11 +52,14 @@ python3 setup.py install --user
 
 
 ## Credits
+Hendrik Buschmeier <hbuschme@techfak.uni-bielefeld.de> 
 
-TODO: Write credits
+Ramin Yaghoubzadeh <ryaghoub@techfak.uni-bielefeld.de>
 
 ## License
+GNU LESSER GENERAL PUBLIC LICENSE (See LICENSE.txt in the repository)
 
 ## Further Reading
 [1] IPAACA: https://scs.techfak.uni-bielefeld.de/wiki/public/ipaaca/start
+
 [2] Schlangen et al. "Middleware for Incremental Processing in Conversational Agents," SIGDIAL 2010. https://www.aclweb.org/anthology/W10-4308

ipaacalib/python/setup.py

@@ -105,7 +105,7 @@ setup(name="ipaaca",
       license='LGPLv3+',
       url='https://opensource.cit-ec.de/projects/ipaaca',
       install_requires=["paho-mqtt", "six", "protobuf"],
-      packages=["ipaaca"],
+      packages=["ipaaca", "ipaaca.util"],
       package_dir={"ipaaca":"src/ipaaca"},  
 
 # TODO Do we want to add ipaaca_pb2.py to the egg or as separate package?

ipaacalib/python/src/ipaaca/util/logger.py

@@ -5,7 +5,7 @@
 #  "Incremental Processing Architecture
 #   for Artificial Conversational Agents".
 #
-# Copyright (c) 2009-2015 Social Cognitive Systems Group
+# Copyright (c) 2009-2019 Social Cognitive Systems Group
 #                         CITEC, Bielefeld University
 #
 # http://opensource.cit-ec.de/projects/ipaaca/
@@ -43,6 +43,7 @@ import uuid
 
 import ipaaca
 import ipaaca.misc
+import six
 
 
 __all__ = [
@@ -124,7 +125,7 @@ def logger_set_log_level(level=LogLevel.DEBUG):
 	with LOGGER_LOCK:
 		if level in LogLevel._values:
 			CURRENT_LOG_LEVEL = level
-		elif isinstance(level, basestring) and level.upper() in LOG_LEVEL_FROM_STRING_DICT:
+		elif isinstance(level, six.string_types) and level.upper() in LOG_LEVEL_FROM_STRING_DICT:
 			CURRENT_LOG_LEVEL = LOG_LEVEL_FROM_STRING_DICT[level.upper()]
 		else:
 			pass # leave previous setting untouched
@@ -153,7 +154,7 @@ def LOG_IPAACA(lvl, text, now=0.0, fn='???', thread='???'):
 
 
 def LOG_CONSOLE(lvlstr, msg, fn_markup='', msg_markup='', now=0.0, fn='???', thread='???'):
-	if isinstance(msg, basestring):
+	if isinstance(msg, six.string_types):
 		lines = msg.split('\n')
 	else:
 		lines = [msg]