fix some bugs

MANIFEST

@@ -6,13 +6,17 @@ jieba_fast/__main__.py
 jieba_fast/_compat.py
 jieba_fast/_compat.pyc
 jieba_fast/dict.txt
+jieba_fast/jieba_fast_functions_py2.py
+jieba_fast/jieba_fast_functions_py3.py
 jieba_fast/analyse/__init__.py
 jieba_fast/analyse/analyzer.py
 jieba_fast/analyse/idf.txt
 jieba_fast/analyse/textrank.py
 jieba_fast/analyse/tfidf.py
 jieba_fast/finalseg/__init__.py
 jieba_fast/finalseg/__init__.pyc
+jieba_fast/finalseg/jieba_fast_functions_py2.py
+jieba_fast/finalseg/jieba_fast_functions_py3.py
 jieba_fast/finalseg/prob_emit.p
 jieba_fast/finalseg/prob_emit.py
 jieba_fast/finalseg/prob_emit.pyc
@@ -32,10 +36,12 @@ jieba_fast/posseg/prob_start.py
 jieba_fast/posseg/prob_trans.p
 jieba_fast/posseg/prob_trans.py
 jieba_fast/posseg/viterbi.py
-source/jieba_fast_functions_wrap_py2.c
-source/jieba_fast_functions_wrap_py2.i
-source/jieba_fast_functions_wrap_py3.c
-source/jieba_fast_functions_wrap_py3.i
+jieba_fast/source/jieba_fast_functions_py2.py
+jieba_fast/source/jieba_fast_functions_py3.py
+jieba_fast/source/jieba_fast_functions_wrap_py2.i
+jieba_fast/source/jieba_fast_functions_wrap_py2_wrap.c
+jieba_fast/source/jieba_fast_functions_wrap_py3.i
+jieba_fast/source/jieba_fast_functions_wrap_py3_wrap.c
 test/test.py
 test/test_bug.py
 test/test_change_dictpath.py

jieba_fast/source/jieba_fast_functions_py2.py

@@ -0,0 +1,116 @@
+# This file was automatically generated by SWIG (http://www.swig.org).
+# Version 3.0.12
+#
+# Do not make changes to this file unless you know what you are doing--modify
+# the SWIG interface file instead.
+
+from sys import version_info as _swig_python_version_info
+if _swig_python_version_info >= (2, 7, 0):
+    def swig_import_helper():
+        import importlib
+        pkg = __name__.rpartition('.')[0]
+        mname = '.'.join((pkg, '_jieba_fast_functions_py2')).lstrip('.')
+        try:
+            return importlib.import_module(mname)
+        except ImportError:
+            return importlib.import_module('_jieba_fast_functions_py2')
+    _jieba_fast_functions_py2 = swig_import_helper()
+    del swig_import_helper
+elif _swig_python_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('_jieba_fast_functions_py2', [dirname(__file__)])
+        except ImportError:
+            import _jieba_fast_functions_py2
+            return _jieba_fast_functions_py2
+        try:
+            _mod = imp.load_module('_jieba_fast_functions_py2', fp, pathname, description)
+        finally:
+            if fp is not None:
+                fp.close()
+        return _mod
+    _jieba_fast_functions_py2 = swig_import_helper()
+    del swig_import_helper
+else:
+    import _jieba_fast_functions_py2
+del _swig_python_version_info
+
+try:
+    _swig_property = property
+except NameError:
+    pass  # Python < 2.2 doesn't have 'property'.
+
+try:
+    import builtins as __builtin__
+except ImportError:
+    import __builtin__
+
+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):
+        if _newclass:
+            object.__setattr__(self, name, value)
+        else:
+            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("'%s' object has no attribute '%s'" % (class_type.__name__, name))
+
+
+def _swig_repr(self):
+    try:
+        strthis = "proxy of " + self.this.__repr__()
+    except __builtin__.Exception:
+        strthis = ""
+    return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
+
+try:
+    _object = object
+    _newclass = 1
+except __builtin__.Exception:
+    class _object:
+        pass
+    _newclass = 0
+
+
+def _calc(FREQ, sentence, DAG, route, total):
+    return _jieba_fast_functions_py2._calc(FREQ, sentence, DAG, route, total)
+_calc = _jieba_fast_functions_py2._calc
+
+def _get_DAG(DAG, FREQ, sentence):
+    return _jieba_fast_functions_py2._get_DAG(DAG, FREQ, sentence)
+_get_DAG = _jieba_fast_functions_py2._get_DAG
+
+def _get_DAG_and_calc(FREQ, sentence, route, total):
+    return _jieba_fast_functions_py2._get_DAG_and_calc(FREQ, sentence, route, total)
+_get_DAG_and_calc = _jieba_fast_functions_py2._get_DAG_and_calc
+
+def _viterbi(obs, _states, start_p, trans_p, emip_p):
+    return _jieba_fast_functions_py2._viterbi(obs, _states, start_p, trans_p, emip_p)
+_viterbi = _jieba_fast_functions_py2._viterbi
+# This file is compatible with both classic and new-style classes.
+
+

jieba_fast/source/jieba_fast_functions_py3.py

@@ -0,0 +1,116 @@
+# This file was automatically generated by SWIG (http://www.swig.org).
+# Version 3.0.12
+#
+# Do not make changes to this file unless you know what you are doing--modify
+# the SWIG interface file instead.
+
+from sys import version_info as _swig_python_version_info
+if _swig_python_version_info >= (2, 7, 0):
+    def swig_import_helper():
+        import importlib
+        pkg = __name__.rpartition('.')[0]
+        mname = '.'.join((pkg, '_jieba_fast_functions_py3')).lstrip('.')
+        try:
+            return importlib.import_module(mname)
+        except ImportError:
+            return importlib.import_module('_jieba_fast_functions_py3')
+    _jieba_fast_functions_py3 = swig_import_helper()
+    del swig_import_helper
+elif _swig_python_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('_jieba_fast_functions_py3', [dirname(__file__)])
+        except ImportError:
+            import _jieba_fast_functions_py3
+            return _jieba_fast_functions_py3
+        try:
+            _mod = imp.load_module('_jieba_fast_functions_py3', fp, pathname, description)
+        finally:
+            if fp is not None:
+                fp.close()
+        return _mod
+    _jieba_fast_functions_py3 = swig_import_helper()
+    del swig_import_helper
+else:
+    import _jieba_fast_functions_py3
+del _swig_python_version_info
+
+try:
+    _swig_property = property
+except NameError:
+    pass  # Python < 2.2 doesn't have 'property'.
+
+try:
+    import builtins as __builtin__
+except ImportError:
+    import __builtin__
+
+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):
+        if _newclass:
+            object.__setattr__(self, name, value)
+        else:
+            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("'%s' object has no attribute '%s'" % (class_type.__name__, name))
+
+
+def _swig_repr(self):
+    try:
+        strthis = "proxy of " + self.this.__repr__()
+    except __builtin__.Exception:
+        strthis = ""
+    return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
+
+try:
+    _object = object
+    _newclass = 1
+except __builtin__.Exception:
+    class _object:
+        pass
+    _newclass = 0
+
+
+def _calc(FREQ, sentence, DAG, route, total):
+    return _jieba_fast_functions_py3._calc(FREQ, sentence, DAG, route, total)
+_calc = _jieba_fast_functions_py3._calc
+
+def _get_DAG(DAG, FREQ, sentence):
+    return _jieba_fast_functions_py3._get_DAG(DAG, FREQ, sentence)
+_get_DAG = _jieba_fast_functions_py3._get_DAG
+
+def _get_DAG_and_calc(FREQ, sentence, route, total):
+    return _jieba_fast_functions_py3._get_DAG_and_calc(FREQ, sentence, route, total)
+_get_DAG_and_calc = _jieba_fast_functions_py3._get_DAG_and_calc
+
+def _viterbi(obs, _states, start_p, trans_p, emip_p):
+    return _jieba_fast_functions_py3._viterbi(obs, _states, start_p, trans_p, emip_p)
+_viterbi = _jieba_fast_functions_py3._viterbi
+# This file is compatible with both classic and new-style classes.
+
+