Fix travis.

nrontsis · Jan 15, 2019 · 392ddb6 · 392ddb6
1 parent e0dc994
commit 392ddb6
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 4 deletions.
diff --git a/...matlab/matlab-envinroment/draw_pendulum.m → ...matlab/matlab-environment/draw_pendulum.m b/...matlab/matlab-envinroment/draw_pendulum.m → ...matlab/matlab-environment/draw_pendulum.m
diff --git a/...atlab-envinroment/draw_rollout_pendulum.m → ...atlab-environment/draw_rollout_pendulum.m b/...atlab-envinroment/draw_rollout_pendulum.m → ...atlab-environment/draw_rollout_pendulum.m
diff --git a/...ab/matlab-envinroment/dynamics_pendulum.m → ...ab/matlab-environment/dynamics_pendulum.m b/...ab/matlab-envinroment/dynamics_pendulum.m → ...ab/matlab-environment/dynamics_pendulum.m
diff --git a/...matlab/matlab-envinroment/loss_pendulum.m → ...matlab/matlab-environment/loss_pendulum.m b/...matlab/matlab-envinroment/loss_pendulum.m → ...matlab/matlab-environment/loss_pendulum.m
diff --git a/...atlab/matlab-envinroment/pendulum_learn.m → ...atlab/matlab-environment/pendulum_learn.m b/...atlab/matlab-envinroment/pendulum_learn.m → ...atlab/matlab-environment/pendulum_learn.m
diff --git a/...ab/matlab-envinroment/settings_pendulum.m → ...ab/matlab-environment/settings_pendulum.m b/...ab/matlab-envinroment/settings_pendulum.m → ...ab/matlab-environment/settings_pendulum.m
diff --git a/pilco/models/pilco.py b/pilco/models/pilco.py
@@ -42,10 +42,6 @@ def __init__(self, X, Y, num_induced_points=None, horizon=30, controller=None,
         else:
             self.m_init = m_init
             self.S_init = S_init
-<<<<<<< HEAD
-=======
-
->>>>>>> #13 Added restart methods for model and controller. #9 Consistent good performance on the pendulum-v0 environment
         self.optimizer = None
 
     @gpflow.name_scope('likelihood')