Merge pull request rlpy#26 from anandtrex/master

Add support for python3

.gitignore

@@ -15,3 +15,4 @@ Config.py
 .nfs*
 dist
 *.egg-info
+*.bak

.travis.yml

@@ -1,13 +1,11 @@
 language: python
-virtualenv:
-    system_site_packages: true
 python:
-    - "2.7"
+    - "2.7.9"
+    - "3.6"
 before_install:
     - "sudo apt-get update -qq"
-    - "sudo apt-get install python-tk python-matplotlib python-sklearn python-scipy"
+    - "sudo apt-get install python-tk python3-tk"
 install: 
-    - "pip install cython"
+    - "pip install cython matplotlib scikit-learn scipy"
     - "python setup.py develop"
-    - "sed -i \"/^\\/usr\\/lib/d\" /home/travis/virtualenv/python2.7_with_system_site_packages/local/lib/python2.7/site-packages/easy-install.pth || echo Error"
 script: "xvfb-run --server-args=\"-screen 0 1024x768x24\" nosetests tests --logging-clear-handlers -v"

doc/conf.py

@@ -11,6 +11,13 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from builtins import open
+from future import standard_library
+standard_library.install_aliases()
 import sys
 import os
 

examples/bicycle/kifdd_triangle.py

@@ -1,3 +1,10 @@
+from __future__ import division
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
+from past.utils import old_div
 import rlpy
 import numpy as np
 from hyperopt import hp
@@ -34,8 +41,7 @@ def make_experiment(
 
     domain = rlpy.Domains.BicycleRiding()
     opt["domain"] = domain
-    kernel_width = (domain.statespace_limits[:, 1] - domain.statespace_limits[:, 0]) \
-        / kernel_resolution
+    kernel_width = old_div((domain.statespace_limits[:, 1] - domain.statespace_limits[:, 0]), kernel_resolution)
     representation = rlpy.Representations.KernelizediFDD(domain, sparsify=sparsify,
                                kernel=rlpy.Representations.linf_triangle_kernel,
                                kernel_args=[kernel_width],

examples/blocksworld/ggq-ifdd.py

@@ -1,3 +1,9 @@
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
 from rlpy.Domains import BlocksWorld
 from rlpy.Agents import Greedy_GQ
 from rlpy.Representations import *

examples/blocksworld/ggq-ifddkappa.py

@@ -1,3 +1,9 @@
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
 from rlpy.Domains import BlocksWorld
 from rlpy.Agents import Greedy_GQ
 from rlpy.Representations import *

examples/blocksworld/ggq-indep.py

@@ -1,3 +1,9 @@
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
 from rlpy.Domains import BlocksWorld
 from rlpy.Agents import Greedy_GQ
 from rlpy.Representations import *

examples/blocksworld/ggq-tile.py

@@ -1,3 +1,8 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
 from rlpy.Domains import BlocksWorld
 from rlpy.Agents import Greedy_GQ
 from rlpy.Representations import *

examples/blocksworld/q-ifdd.py

@@ -1,3 +1,9 @@
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
 from rlpy.Domains import BlocksWorld
 from rlpy.Agents import Q_Learning
 from rlpy.Representations import *

examples/blocksworld/q-indep.py

@@ -1,3 +1,9 @@
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
 from rlpy.Domains import BlocksWorld
 from rlpy.Agents import Q_Learning
 from rlpy.Representations import *

examples/blocksworld/sarsa-ifdd.py

@@ -1,3 +1,9 @@
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
 from rlpy.Domains import BlocksWorld
 from rlpy.Agents import SARSA
 from rlpy.Representations import *

examples/blocksworld/sarsa-indep.py

@@ -1,3 +1,9 @@
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
 from rlpy.Domains import BlocksWorld
 from rlpy.Agents import SARSA
 from rlpy.Representations import *

examples/cartpole2d/ggq-ifdd.py

@@ -1,7 +1,13 @@
 """
 Cart-pole balancing with iFDD+
 """
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
 
+from future import standard_library
+standard_library.install_aliases()
 from rlpy.Domains import InfCartPoleBalance
 from rlpy.Agents import Greedy_GQ, SARSA, Q_Learning
 from rlpy.Representations import *

examples/cartpole2d/ggq-indep.py

@@ -1,7 +1,13 @@
 """
 Cart-pole balancing with iFDD+
 """
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
 
+from future import standard_library
+standard_library.install_aliases()
 import sys
 import os
 from rlpy.Domains import InfCartPoleBalance

examples/cartpole2d/ifdd.py

@@ -1,7 +1,13 @@
 """
 Cart-pole balancing with iFDD+
 """
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
 
+from future import standard_library
+standard_library.install_aliases()
 import sys
 import os
 from rlpy.Domains import InfCartPoleBalance

examples/cartpole2d/kifdd_gauss.py

@@ -1,7 +1,14 @@
 """
 Cart-pole balancing with continuous / Kernelized iFDD
 """
+from __future__ import division
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import absolute_import
 
+from future import standard_library
+standard_library.install_aliases()
+from past.utils import old_div
 from rlpy.Domains import InfCartPoleBalance
 from rlpy.Agents import SARSA, Q_LEARNING
 from rlpy.Representations import *
@@ -42,10 +49,10 @@ def make_experiment(
 
     domain = InfCartPoleBalance()
     opt["domain"] = domain
-    kernel_width = (
+    kernel_width = old_div((
         domain.statespace_limits[:,
                                  1] - domain.statespace_limits[:,
-                                                               0]) / kernel_resolution
+                                                               0]), kernel_resolution)
     representation = KernelizediFDD(domain, sparsify=sparsify,
                                kernel=gaussian_kernel,
                                kernel_args=[kernel_width],

examples/cartpole2d/kifdd_triangle.py

@@ -1,7 +1,14 @@
 """
 Cart-pole balancing with continuous / Kernelized iFDD
 """
+from __future__ import division
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import absolute_import
 
+from future import standard_library
+standard_library.install_aliases()
+from past.utils import old_div
 from rlpy.Domains import InfCartPoleBalance
 from rlpy.Agents import SARSA, Q_LEARNING
 from rlpy.Representations import *
@@ -43,10 +50,10 @@ def make_experiment(
 
     domain = InfCartPoleBalance()
     opt["domain"] = domain
-    kernel_width = (
+    kernel_width = old_div((
         domain.statespace_limits[:,
                                  1] - domain.statespace_limits[:,
-                                                               0]) / kernel_resolution
+                                                               0]), kernel_resolution)
     representation = KernelizediFDD(domain, sparsify=sparsify,
                                kernel=linf_triangle_kernel,
                                kernel_args=[kernel_width],

examples/cartpole2d/q-ifdd.py

@@ -1,7 +1,13 @@
 """
 Cart-pole balancing with iFDD+
 """
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
 
+from future import standard_library
+standard_library.install_aliases()
 import sys
 import os
 from rlpy.Domains import InfCartPoleBalance

examples/cartpole2d/q-indep.py

@@ -1,7 +1,13 @@
 """
 Cart-pole balancing with iFDD+
 """
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
 
+from future import standard_library
+standard_library.install_aliases()
 import sys
 import os
 from rlpy.Domains import InfCartPoleBalance

examples/cartpole2d/rbfs.py

@@ -1,6 +1,13 @@
 """
 Cart-pole balancing with independent discretization
 """
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from builtins import int
+from future import standard_library
+standard_library.install_aliases()
 from rlpy.Domains import InfCartPoleBalance
 from rlpy.Agents import Q_Learning
 from rlpy.Representations import *

examples/cartpole2d/sarsa-ifdd.py

@@ -1,7 +1,13 @@
 """
 Cart-pole balancing with iFDD+
 """
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
 
+from future import standard_library
+standard_library.install_aliases()
 import sys
 import os
 from rlpy.Domains import InfCartPoleBalance

examples/cartpole2d/sarsa-indep.py

@@ -1,7 +1,13 @@
 """
 Cart-pole balancing with iFDD+
 """
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
 
+from future import standard_library
+standard_library.install_aliases()
 import sys
 import os
 from rlpy.Domains import InfCartPoleBalance

examples/cartpole_modern/kifdd.py

@@ -1,6 +1,13 @@
 """
 Cart-pole balancing with continuous / Kernelized iFDD
 """
+from __future__ import division
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
+from past.utils import old_div
 from rlpy.Domains.FiniteTrackCartPole import FiniteCartPoleBalanceOriginal, FiniteCartPoleBalanceModern
 from rlpy.Agents import SARSA, Q_LEARNING
 from rlpy.Representations import *
@@ -39,8 +46,7 @@ def make_experiment(
 
     domain = FiniteCartPoleBalanceModern()
     opt["domain"] = domain
-    kernel_width = (domain.statespace_limits[:, 1] - domain.statespace_limits[:, 0]) \
-        / kernel_resolution
+    kernel_width = old_div((domain.statespace_limits[:, 1] - domain.statespace_limits[:, 0]), kernel_resolution)
 
     representation = KernelizediFDD(domain, sparsify=sparsify,
                                kernel=gaussian_kernel,

examples/cartpole_orig/ifdd.py

@@ -1,6 +1,12 @@
 """
 Cart-pole balancing with continuous / Kernelized iFDD
 """
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
 from rlpy.Domains.FiniteTrackCartPole import FiniteCartPoleBalanceOriginal, FiniteCartPoleBalanceModern
 from rlpy.Agents import SARSA, Q_LEARNING
 from rlpy.Representations import *

examples/cartpole_orig/independent.py

@@ -1,6 +1,12 @@
 """
 Cart-pole balancing with independent discretization
 """
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
 from rlpy.Domains.FiniteTrackCartPole import FiniteCartPoleBalanceOriginal, FiniteCartPoleBalanceModern
 from rlpy.Agents import SARSA, Q_LEARNING
 from rlpy.Representations import *

examples/cartpole_orig/kifdd_gauss.py

@@ -1,6 +1,13 @@
 """
 Cart-pole balancing with continuous / Kernelized iFDD
 """
+from __future__ import division
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
+from past.utils import old_div
 from rlpy.Domains.FiniteTrackCartPole import FiniteCartPoleBalanceOriginal, FiniteCartPoleBalanceModern
 from rlpy.Agents import SARSA, Q_LEARNING
 from rlpy.Representations import *
@@ -43,8 +50,7 @@ def make_experiment(
     domain = FiniteCartPoleBalanceOriginal(good_reward=0.)
     opt["domain"] = domain
     # domain = FiniteCartPoleBalanceModern()
-    kernel_width = (domain.statespace_limits[:, 1] - domain.statespace_limits[:, 0]) \
-        / kernel_resolution
+    kernel_width = old_div((domain.statespace_limits[:, 1] - domain.statespace_limits[:, 0]), kernel_resolution)
     representation = KernelizediFDD(domain, sparsify=sparsify,
                                kernel=gaussian_kernel,
                                kernel_args=[kernel_width],