summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorerwincoumans <erwin.coumans@gmail.com>2018-04-11 18:00:43 -0700
committererwincoumans <erwin.coumans@gmail.com>2018-04-11 18:00:43 -0700
commit2bc246b0b1c08d42c99b33e57fc10c72a7a23801 (patch)
tree4ad1c799cb3e02d77e844b85abd177f12d18a2f6
parentb18d407ca482688f82c0d492df09d03f925a60f9 (diff)
downloadbullet3-2bc246b0b1c08d42c99b33e57fc10c72a7a23801.tar.gz
fixes in relative imports
-rw-r--r--examples/pybullet/gym/pybullet_envs/minitaur/envs/env_randomizers/__init__.py1
-rw-r--r--examples/pybullet/gym/pybullet_envs/minitaur/envs/env_randomizers/minitaur_alternating_legs_env_randomizer.py6
-rw-r--r--examples/pybullet/gym/pybullet_envs/minitaur/envs/env_randomizers/minitaur_env_randomizer.py6
-rw-r--r--examples/pybullet/gym/pybullet_envs/minitaur/envs/env_randomizers/minitaur_env_randomizer_from_config.py6
-rw-r--r--examples/pybullet/gym/pybullet_envs/minitaur/envs/env_randomizers/minitaur_push_randomizer.py6
-rw-r--r--examples/pybullet/gym/pybullet_envs/minitaur/envs/env_randomizers/minitaur_terrain_randomizer.py6
-rw-r--r--examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur.py8
-rw-r--r--examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_alternating_legs_env.py7
-rw-r--r--examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_alternating_legs_env_example.py11
-rw-r--r--examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_ball_gym_env.py7
-rw-r--r--examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_derpy.py7
-rw-r--r--examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_gym_env.py19
-rw-r--r--examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_gym_env_example.py7
-rw-r--r--examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_logging.py7
-rw-r--r--examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_logging_pb2.py10
-rw-r--r--examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_rainbow_dash.py8
-rw-r--r--examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_reactive_env.py8
17 files changed, 110 insertions, 20 deletions
diff --git a/examples/pybullet/gym/pybullet_envs/minitaur/envs/env_randomizers/__init__.py b/examples/pybullet/gym/pybullet_envs/minitaur/envs/env_randomizers/__init__.py
new file mode 100644
index 000000000..39e44ec8a
--- /dev/null
+++ b/examples/pybullet/gym/pybullet_envs/minitaur/envs/env_randomizers/__init__.py
@@ -0,0 +1 @@
+import gym
diff --git a/examples/pybullet/gym/pybullet_envs/minitaur/envs/env_randomizers/minitaur_alternating_legs_env_randomizer.py b/examples/pybullet/gym/pybullet_envs/minitaur/envs/env_randomizers/minitaur_alternating_legs_env_randomizer.py
index ec1a94fc0..a2d1645f4 100644
--- a/examples/pybullet/gym/pybullet_envs/minitaur/envs/env_randomizers/minitaur_alternating_legs_env_randomizer.py
+++ b/examples/pybullet/gym/pybullet_envs/minitaur/envs/env_randomizers/minitaur_alternating_legs_env_randomizer.py
@@ -4,6 +4,12 @@ The randomization include swing_offset, extension_offset of all legs that mimics
bent legs, desired_pitch from user input, battery voltage and motor damping.
"""
+import os, inspect
+currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
+parentdir = os.path.dirname(os.path.dirname(currentdir))
+parentdir = os.path.dirname(os.path.dirname(parentdir))
+os.sys.path.insert(0,parentdir)
+
import numpy as np
import tensorflow as tf
from pybullet_envs.minitaur.envs import env_randomizer_base
diff --git a/examples/pybullet/gym/pybullet_envs/minitaur/envs/env_randomizers/minitaur_env_randomizer.py b/examples/pybullet/gym/pybullet_envs/minitaur/envs/env_randomizers/minitaur_env_randomizer.py
index c0ce35faf..befdf7ea1 100644
--- a/examples/pybullet/gym/pybullet_envs/minitaur/envs/env_randomizers/minitaur_env_randomizer.py
+++ b/examples/pybullet/gym/pybullet_envs/minitaur/envs/env_randomizers/minitaur_env_randomizer.py
@@ -1,6 +1,12 @@
"""Randomize the minitaur_gym_env when reset() is called."""
import random
+import os, inspect
+currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
+parentdir = os.path.dirname(os.path.dirname(currentdir))
+parentdir = os.path.dirname(os.path.dirname(parentdir))
+os.sys.path.insert(0,parentdir)
+
import numpy as np
from pybullet_envs.minitaur.envs import env_randomizer_base
diff --git a/examples/pybullet/gym/pybullet_envs/minitaur/envs/env_randomizers/minitaur_env_randomizer_from_config.py b/examples/pybullet/gym/pybullet_envs/minitaur/envs/env_randomizers/minitaur_env_randomizer_from_config.py
index d49cfafad..97b91609b 100644
--- a/examples/pybullet/gym/pybullet_envs/minitaur/envs/env_randomizers/minitaur_env_randomizer_from_config.py
+++ b/examples/pybullet/gym/pybullet_envs/minitaur/envs/env_randomizers/minitaur_env_randomizer_from_config.py
@@ -7,6 +7,12 @@ from __future__ import print_function
import functools
import random
+import os, inspect
+currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
+parentdir = os.path.dirname(os.path.dirname(currentdir))
+parentdir = os.path.dirname(os.path.dirname(parentdir))
+os.sys.path.insert(0,parentdir)
+
import numpy as np
import tensorflow as tf
from pybullet_envs.minitaur.envs import env_randomizer_base
diff --git a/examples/pybullet/gym/pybullet_envs/minitaur/envs/env_randomizers/minitaur_push_randomizer.py b/examples/pybullet/gym/pybullet_envs/minitaur/envs/env_randomizers/minitaur_push_randomizer.py
index 0ebe4ed0d..e030c6ae4 100644
--- a/examples/pybullet/gym/pybullet_envs/minitaur/envs/env_randomizers/minitaur_push_randomizer.py
+++ b/examples/pybullet/gym/pybullet_envs/minitaur/envs/env_randomizers/minitaur_push_randomizer.py
@@ -4,6 +4,12 @@ from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
+import os, inspect
+currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
+parentdir = os.path.dirname(os.path.dirname(currentdir))
+parentdir = os.path.dirname(os.path.dirname(parentdir))
+os.sys.path.insert(0,parentdir)
+
import math
import numpy as np
from pybullet_envs.minitaur.envs import env_randomizer_base
diff --git a/examples/pybullet/gym/pybullet_envs/minitaur/envs/env_randomizers/minitaur_terrain_randomizer.py b/examples/pybullet/gym/pybullet_envs/minitaur/envs/env_randomizers/minitaur_terrain_randomizer.py
index 91cb52302..b7e5706b8 100644
--- a/examples/pybullet/gym/pybullet_envs/minitaur/envs/env_randomizers/minitaur_terrain_randomizer.py
+++ b/examples/pybullet/gym/pybullet_envs/minitaur/envs/env_randomizers/minitaur_terrain_randomizer.py
@@ -4,6 +4,12 @@ from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
+import os, inspect
+currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
+parentdir = os.path.dirname(os.path.dirname(currentdir))
+parentdir = os.path.dirname(os.path.dirname(parentdir))
+os.sys.path.insert(0,parentdir)
+
import itertools
import math
import enum
diff --git a/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur.py b/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur.py
index cd5749d22..efe32837c 100644
--- a/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur.py
+++ b/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur.py
@@ -1,13 +1,19 @@
"""This file implements the functionalities of a minitaur using pybullet.
"""
+
+import os, inspect
+currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
+parentdir = os.path.dirname(os.path.dirname(currentdir))
+os.sys.path.insert(0,parentdir)
+
import collections
import copy
import math
import re
import numpy as np
-import motor
+from pybullet_envs.minitaur.envs import motor
INIT_POSITION = [0, 0, .2]
INIT_RACK_POSITION = [0, 0, 1]
diff --git a/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_alternating_legs_env.py b/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_alternating_legs_env.py
index 82d64b184..4a2e3dd7e 100644
--- a/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_alternating_legs_env.py
+++ b/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_alternating_legs_env.py
@@ -3,9 +3,14 @@
"""
import math
+import os, inspect
+currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
+parentdir = os.path.dirname(os.path.dirname(currentdir))
+os.sys.path.insert(0,parentdir)
+
from gym import spaces
import numpy as np
-import minitaur_gym_env
+from pybullet_envs.minitaur.envs import minitaur_gym_env
INIT_EXTENSION_POS = 2.6
INIT_SWING_POS = 0.0
diff --git a/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_alternating_legs_env_example.py b/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_alternating_legs_env_example.py
index 1ac2198d0..f1266d354 100644
--- a/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_alternating_legs_env_example.py
+++ b/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_alternating_legs_env_example.py
@@ -3,12 +3,17 @@
"""
import time
+import os, inspect
+currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
+parentdir = os.path.dirname(os.path.dirname(currentdir))
+os.sys.path.insert(0,parentdir)
+
import os
import numpy as np
import tensorflow as tf
-import minitaur_alternating_legs_env
-import minitaur_gym_env
-from env_randomizers import minitaur_alternating_legs_env_randomizer as randomizer_lib
+from pybullet_envs.minitaur.envs import minitaur_alternating_legs_env
+from pybullet_envs.minitaur.envs import minitaur_gym_env
+from pybullet_envs.minitaur.envs.env_randomizers import minitaur_alternating_legs_env_randomizer as randomizer_lib
#FLAGS = flags.FLAGS
#flags.DEFINE_string("log_path", None, "The directory to write the log file.")
diff --git a/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_ball_gym_env.py b/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_ball_gym_env.py
index 46522b076..44c1f958a 100644
--- a/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_ball_gym_env.py
+++ b/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_ball_gym_env.py
@@ -4,9 +4,14 @@
import math
import random
+import os, inspect
+currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
+parentdir = os.path.dirname(os.path.dirname(currentdir))
+os.sys.path.insert(0,parentdir)
+
from gym import spaces
import numpy as np
-import minitaur_gym_env
+from pybullet_envs.minitaur.envs import minitaur_gym_env
import pybullet_data
GOAL_DISTANCE_THRESHOLD = 0.8
diff --git a/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_derpy.py b/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_derpy.py
index f7bf10dac..2b5eb2698 100644
--- a/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_derpy.py
+++ b/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_derpy.py
@@ -6,8 +6,13 @@ It is the result of first pass system identification for the derpy robot. The
"""
import math
+import os, inspect
+currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
+parentdir = os.path.dirname(os.path.dirname(currentdir))
+os.sys.path.insert(0,parentdir)
+
import numpy as np
-import minitaur
+from pybullet_envs.minitaur.envs import minitaur
KNEE_CONSTRAINT_POINT_LONG = [0, 0.0055, 0.088]
KNEE_CONSTRAINT_POINT_SHORT = [0, 0.0055, 0.100]
diff --git a/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_gym_env.py b/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_gym_env.py
index 1a077fdd8..11ca8c137 100644
--- a/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_gym_env.py
+++ b/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_gym_env.py
@@ -4,19 +4,24 @@
import math
import time
+import os, inspect
+currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
+parentdir = os.path.dirname(os.path.dirname(currentdir))
+os.sys.path.insert(0,parentdir)
+
import gym
from gym import spaces
from gym.utils import seeding
import numpy as np
import pybullet
-import bullet_client
+from pybullet_envs.minitaur.envs import bullet_client
import pybullet_data
-import minitaur
-import minitaur_derpy
-import minitaur_logging
-import minitaur_logging_pb2
-import minitaur_rainbow_dash
-import motor
+from pybullet_envs.minitaur.envs import minitaur
+from pybullet_envs.minitaur.envs import minitaur_derpy
+from pybullet_envs.minitaur.envs import minitaur_logging
+from pybullet_envs.minitaur.envs import minitaur_logging_pb2
+from pybullet_envs.minitaur.envs import minitaur_rainbow_dash
+from pybullet_envs.minitaur.envs import motor
from pkg_resources import parse_version
NUM_MOTORS = 8
diff --git a/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_gym_env_example.py b/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_gym_env_example.py
index 36942f562..197560cfd 100644
--- a/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_gym_env_example.py
+++ b/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_gym_env_example.py
@@ -5,10 +5,15 @@
import csv
import math
+import os, inspect
+currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
+parentdir = os.path.dirname(os.path.dirname(currentdir))
+os.sys.path.insert(0,parentdir)
+
import argparse
import numpy as np
import tensorflow as tf
-import minitaur_gym_env
+from pybullet_envs.minitaur.envs import minitaur_gym_env
import time
diff --git a/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_logging.py b/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_logging.py
index 0c426ff29..b7f739e02 100644
--- a/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_logging.py
+++ b/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_logging.py
@@ -10,12 +10,17 @@ from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
+import os, inspect
+currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
+parentdir = os.path.dirname(os.path.dirname(currentdir))
+os.sys.path.insert(0,parentdir)
+
import datetime
import os
import time
import tensorflow as tf
-import minitaur_logging_pb2
+from pybullet_envs.minitaur.envs import minitaur_logging_pb2
NUM_MOTORS = 8
diff --git a/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_logging_pb2.py b/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_logging_pb2.py
index 7ea35b0f6..ff564386a 100644
--- a/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_logging_pb2.py
+++ b/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_logging_pb2.py
@@ -2,6 +2,12 @@
# source: minitaur_logging.proto
import sys
+
+import os, inspect
+currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
+parentdir = os.path.dirname(os.path.dirname(currentdir))
+os.sys.path.insert(0,parentdir)
+
_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
from google.protobuf import descriptor as _descriptor
from google.protobuf import message as _message
@@ -13,8 +19,8 @@ from google.protobuf import descriptor_pb2
_sym_db = _symbol_database.Default()
-import timestamp_pb2 as timestamp__pb2
-import vector_pb2 as vector__pb2
+from pybullet_envs.minitaur.envs import timestamp_pb2 as timestamp__pb2
+from pybullet_envs.minitaur.envs import vector_pb2 as vector__pb2
DESCRIPTOR = _descriptor.FileDescriptor(
diff --git a/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_rainbow_dash.py b/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_rainbow_dash.py
index 4eef2b663..c33b4af77 100644
--- a/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_rainbow_dash.py
+++ b/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_rainbow_dash.py
@@ -3,10 +3,16 @@
It is the result of first pass system identification for the rainbow dash robot.
"""
+
+import os, inspect
+currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
+parentdir = os.path.dirname(os.path.dirname(currentdir))
+os.sys.path.insert(0,parentdir)
+
import math
import numpy as np
-import minitaur
+from pybullet_envs.minitaur.envs import minitaur
KNEE_CONSTRAINT_POINT_LONG = [0, 0.0045, 0.088]
KNEE_CONSTRAINT_POINT_SHORT = [0, 0.0045, 0.100]
diff --git a/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_reactive_env.py b/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_reactive_env.py
index 9f6f9b847..6b2c5f884 100644
--- a/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_reactive_env.py
+++ b/examples/pybullet/gym/pybullet_envs/minitaur/envs/minitaur_reactive_env.py
@@ -1,11 +1,17 @@
"""This file implements the gym environment of minitaur alternating legs.
"""
+
+import os, inspect
+currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
+parentdir = os.path.dirname(os.path.dirname(currentdir))
+os.sys.path.insert(0,parentdir)
+
import collections
import math
from gym import spaces
import numpy as np
-import minitaur_gym_env
+from pybullet_envs.minitaur.envs import minitaur_gym_env
INIT_EXTENSION_POS = 2.0
INIT_SWING_POS = 0.0