Skip to content

Commit

Permalink
Apply isort pre-commit changes
Browse files Browse the repository at this point in the history
  pre-commit run -a isort
  • Loading branch information
dbarbier committed Sep 22, 2021
1 parent db9911b commit 6fa6c2d
Show file tree
Hide file tree
Showing 159 changed files with 1,195 additions and 1,152 deletions.
2 changes: 1 addition & 1 deletion builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"""
import fileinput
import os
from pathlib import Path
import platform
import re
import subprocess
import sys
import sysconfig
from distutils.version import LooseVersion
from pathlib import Path
from typing import Any, Dict, List

from setuptools.command.build_ext import build_ext
Expand Down
2 changes: 1 addition & 1 deletion examples/ars_solver.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import gym
import gym_jsbsim

from skdecide.hub.domain.gym import GymDomain
from skdecide.hub.solver.ars import ars
from skdecide.utils import load_registered_domain, rollout


if __name__ == "__main__":

try_domains = [
Expand Down
20 changes: 11 additions & 9 deletions examples/discrete_optimization/plot_results_do.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,23 @@
# Plot utilities outside of the main library, needs additional dependencies like seaborn.

from __future__ import annotations

import math
from typing import List

import matplotlib.cm as cm
import matplotlib.pyplot as plt
from skdecide.discrete_optimization.generic_tools.result_storage.resultcomparator import (
ResultComparator,
)
import numpy as np
import seaborn as sns # You'd need seaborn for this example.

from skdecide.discrete_optimization.generic_tools.result_storage.result_storage import (
ParetoFront,
ResultStorage,
result_storage_to_pareto_front,
ParetoFront,
)
import seaborn as sns # You'd need seaborn for this example.
import matplotlib.cm as cm

import numpy as np
import math
from skdecide.discrete_optimization.generic_tools.result_storage.resultcomparator import (
ResultComparator,
)


def plot_storage_2d(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@


from __future__ import annotations

import os

path_to_data = os.path.join(
Expand Down
15 changes: 8 additions & 7 deletions examples/full_multisolve.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,25 @@
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.

from math import sqrt
from typing import Any, Callable

import gym
import numpy as np
from stable_baselines3 import PPO
from typing import Any, Callable
from math import sqrt

from skdecide import Value
from skdecide.hub.domain.gym import (
GymDiscreteActionDomain,
GymPlanningDomain,
GymWidthDomain,
)
from skdecide.utils import (
load_registered_domain,
load_registered_solver,
match_solvers,
rollout,
)
from skdecide.hub.domain.gym import (
GymPlanningDomain,
GymWidthDomain,
GymDiscreteActionDomain,
)


class D(GymPlanningDomain, GymWidthDomain, GymDiscreteActionDomain):
Expand Down
14 changes: 7 additions & 7 deletions examples/grid_mdp_multisolve.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.

from collections import namedtuple
from enum import Enum
from typing import NamedTuple, Optional
from math import sqrt
from typing import NamedTuple, Optional

from pathos.helpers import mp
from collections import namedtuple

from skdecide import (
GoalMDPDomain,
Value,
Value,
Space,
DiscreteDistribution,
EnvironmentOutcome,
GoalMDPDomain,
Space,
TransitionOutcome,
Value,
)
from skdecide.builders.domain import Actions
from skdecide.hub.space.gym import ListSpace, EnumSpace, MultiDiscreteSpace
from skdecide.hub.space.gym import EnumSpace, ListSpace, MultiDiscreteSpace
from skdecide.utils import load_registered_solver, rollout


Expand Down
13 changes: 6 additions & 7 deletions examples/grid_multisolve.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,22 @@
# LICENSE file in the root directory of this source tree.

from enum import Enum
from typing import NamedTuple, Optional
from pathos.helpers import mp
from math import sqrt
from typing import NamedTuple, Optional

from pathos.helpers import mp
from stable_baselines3 import PPO

from skdecide import (
DeterministicPlanningDomain,
Value,
Value,
Space,
EnvironmentOutcome,
TransitionOutcome,
SingleValueDistribution,
Space,
TransitionOutcome,
Value,
)
from skdecide.builders.domain import UnrestrictedActions
from skdecide.hub.space.gym import ListSpace, EnumSpace, MultiDiscreteSpace
from skdecide.hub.space.gym import EnumSpace, ListSpace, MultiDiscreteSpace
from skdecide.utils import load_registered_solver, rollout


Expand Down
13 changes: 6 additions & 7 deletions examples/gym_jsbsim_greedy.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,20 @@
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.

from typing import Any, Callable

import folium
import gym
import gym_jsbsim
import numpy as np
import folium

from typing import Callable, Any
from gym_jsbsim.catalogs.catalog import Catalog as prp
from gym_jsbsim.envs.taxi_utils import *

from skdecide import Solver
from skdecide.hub.domain.gym import DeterministicGymDomain, GymDiscreteActionDomain
from skdecide.builders.solver import DeterministicPolicies, Utilities
from skdecide.hub.domain.gym import DeterministicGymDomain, GymDiscreteActionDomain
from skdecide.utils import rollout

from gym_jsbsim.catalogs.catalog import Catalog as prp
from gym_jsbsim.envs.taxi_utils import *

# ENV_NAME = 'GymJsbsim-HeadingControlTask-v0'
ENV_NAME = "GymJsbsim-TaxiapControlTask-v0"
HORIZON = 1000
Expand Down
25 changes: 12 additions & 13 deletions examples/gym_jsbsim_iw.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,36 +2,35 @@
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.

from typing import Any, Callable, Optional

import folium
import gym
import gym_jsbsim
import numpy as np
import folium

from typing import Callable, Any, Optional
from gym_jsbsim.catalogs.catalog import Catalog as prp
from gym_jsbsim.envs.taxi_utils import *

from skdecide import TransitionOutcome, Value, EnvironmentOutcome, Domain
from skdecide import Domain, EnvironmentOutcome, TransitionOutcome, Value
from skdecide.builders.domain import (
SingleAgent,
Sequential,
Environment,
Actions,
DeterministicInitialized,
Markovian,
Environment,
FullyObservable,
Markovian,
Rewards,
Sequential,
SingleAgent,
)
from skdecide.hub.domain.gym import (
GymPlanningDomain,
GymWidthDomain,
GymDiscreteActionDomain,
GymDomainStateProxy,
GymPlanningDomain,
GymWidthDomain,
)
from skdecide.hub.solver.iw import IW
from skdecide.utils import rollout

from gym_jsbsim.catalogs.catalog import Catalog as prp
from gym_jsbsim.envs.taxi_utils import *

# ENV_NAME = 'GymJsbsim-HeadingControlTask-v0'
ENV_NAME = "GymJsbsim-TaxiapControlTask-v0"
HORIZON = 5000
Expand Down
23 changes: 11 additions & 12 deletions examples/gym_jsbsim_riw.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,29 @@
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.

import gym
import gym_jsbsim
import numpy as np
import folium
import bisect
import math
import json
import math
from typing import Any, Callable

from typing import Callable, Any
import folium
import gym
import gym_jsbsim
import numpy as np
from gym_jsbsim.catalogs.catalog import Catalog as prp
from gym_jsbsim.envs.taxi_utils import *

from skdecide import TransitionOutcome, Value, Domain
from skdecide import Domain, TransitionOutcome, Value
from skdecide.builders.domain import DeterministicInitialized
from skdecide.hub.domain.gym import (
GymWidthDomain,
GymDiscreteActionDomain,
GymDomainStateProxy,
GymDomainHashable,
GymDomainStateProxy,
GymWidthDomain,
)
from skdecide.hub.solver.riw import RIW
from skdecide.utils import rollout

from gym_jsbsim.catalogs.catalog import Catalog as prp
from gym_jsbsim.envs.taxi_utils import *

# ENV_NAME = 'GymJsbsim-HeadingControlTask-v0'
ENV_NAME = "GymJsbsim-TaxiapControlTask-v0"
HORIZON = 1000
Expand Down
19 changes: 9 additions & 10 deletions examples/gym_jsbsim_uct.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,30 @@
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.

import gym
import gym_jsbsim
import numpy as np
import folium
import json
import sys

from math import sqrt
from typing import Any

import folium
import gym
import gym_jsbsim
import numpy as np
from gym_jsbsim.catalogs.catalog import Catalog as prp
from gym_jsbsim.envs.taxi_utils import *

from skdecide import EnvironmentOutcome
from skdecide.core import DiscreteDistribution
from skdecide.builders.domain import DeterministicInitialized
from skdecide.core import DiscreteDistribution
from skdecide.hub.domain.gym import (
GymDiscreteActionDomain,
GymDomain,
GymDomainHashable,
GymDiscreteActionDomain,
GymDomainStateProxy,
)
from skdecide.hub.solver.mcts import UCT
from skdecide.utils import rollout

from gym_jsbsim.catalogs.catalog import Catalog as prp
from gym_jsbsim.envs.taxi_utils import *

# ENV_NAME = 'GymJsbsim-HeadingControlTask-v0'
ENV_NAME = "GymJsbsim-TaxiapControlTask-v0"
HORIZON = 5000
Expand Down
8 changes: 4 additions & 4 deletions examples/gym_line_control.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.

from math import exp, fabs, sqrt
from typing import Any, Callable

import gym
import numpy as np

from typing import Callable, Any
from math import sqrt, exp, fabs
from gym.envs.classic_control import rendering

from skdecide import TransitionOutcome, Value
from skdecide.builders.domain import Renderable
from skdecide.hub.domain.gym import (
DeterministicInitializedGymDomain,
GymWidthDomain,
GymDiscreteActionDomain,
GymWidthDomain,
)
from skdecide.hub.solver.iw import IW
from skdecide.hub.solver.riw import RIW
Expand Down
4 changes: 2 additions & 2 deletions examples/maxent_irl_solver.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import gym

from skdecide.hub.domain.gym import GymDomain
from skdecide.hub.solver.maxent_irl import (
from skdecide.hub.solver.maxent_irl import ( # maximum entropy inverse reinforcement learning
MaxentIRL,
) # maximum entropy inverse reinforcement learning
)
from skdecide.utils import rollout

ENV_NAME = "MountainCar-v0"
Expand Down
Loading

0 comments on commit 6fa6c2d

Please sign in to comment.