start restructuring for pip

Author: vincekurtz

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022 Vince Kurtz
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

STL/__init__.py

@@ -11,9 +11,10 @@
 
 import numpy as np
 import matplotlib.pyplot as plt
-from scenarios.reach_avoid import reach_avoid_specification, plot_reach_avoid_scenario
-from systems import DoubleIntegrator
-from solvers import *
+
+from pySTL.benchmarks.reach_avoid import reach_avoid_specification, plot_reach_avoid_scenario
+from pySTL.systems import DoubleIntegrator
+from pySTL.solvers import *
 
 # Specification Parameters
 goal_bounds = (7,8,8,9)     # (xmin, xmax, ymin, ymax)

door_puzzle.py renamed to examples/door_puzzle.py

@@ -0,0 +1,2 @@
+from .formula import STLTree, STLFormula
+from .predicate import STLPredicate

either_or.py renamed to examples/either_or.py

@@ -1,5 +1,5 @@
 import numpy as np
-from STL.formula import STLFormula
+from .formula import STLFormula
 
 class STLPredicate(STLFormula):
     """

multitarget.py renamed to examples/multitarget.py

@@ -5,7 +5,7 @@
 ##
 
 import numpy as np
-from STL import STLTree, STLPredicate
+from pySTL.STL import STLTree, STLPredicate
 from matplotlib.patches import Rectangle
 
 def inside_rectangle_formula(bounds, y1_index, y2_index, d, name=None):

narrow_passage.py renamed to examples/narrow_passage.py

@@ -1,4 +1,6 @@
-from scenarios.common import *
+from .common import (inside_rectangle_formula,
+                     outside_rectangle_formula,
+                     make_rectangle_patch)
 import matplotlib.pyplot as plt
 from matplotlib.patches import Rectangle
 

reach_avoid.py renamed to examples/reach_avoid.py

@@ -1,4 +1,6 @@
-from scenarios.common import *
+from .common import (inside_rectangle_formula,
+                     outside_rectangle_formula,
+                     make_rectangle_patch)
 import matplotlib.pyplot as plt
 from matplotlib.patches import Rectangle
 

stepping_stones.py renamed to examples/stepping_stones.py

@@ -1,4 +1,6 @@
-from scenarios.common import *
+from .common import (inside_rectangle_formula,
+                     outside_rectangle_formula,
+                     make_rectangle_patch)
 import matplotlib.pyplot as plt
 from matplotlib.patches import Rectangle
 

towers_of_hanoi.py renamed to examples/towers_of_hanoi.py

@@ -1,4 +1,6 @@
-from scenarios.common import *
+from .common import (inside_rectangle_formula,
+                     outside_rectangle_formula,
+                     make_rectangle_patch)
 import numpy as np
 import matplotlib.pyplot as plt
 from matplotlib.patches import Rectangle

pySTL/STL/__init__.py

@@ -1,4 +1,6 @@
-from scenarios.common import *
+from .common import (inside_rectangle_formula,
+                     outside_rectangle_formula,
+                     make_rectangle_patch)
 import matplotlib.pyplot as plt
 from matplotlib.patches import Rectangle
 

STL/formula.py renamed to pySTL/STL/formula.py

@@ -1,4 +1,6 @@
-from scenarios.common import *
+from .common import (inside_rectangle_formula,
+                     outside_rectangle_formula,
+                     make_rectangle_patch)
 import numpy as np
 import matplotlib.pyplot as plt
 from matplotlib.patches import Rectangle

STL/predicate.py renamed to pySTL/STL/predicate.py

@@ -0,0 +1,7 @@
+from .scipy.gradient_solver import ScipyGradientSolver
+
+from .gurobi.gurobi_micp import GurobiMICPSolver
+
+from .drake.drake_micp import DrakeMICPSolver
+from .drake.drake_smooth import DrakeSmoothSolver
+from .drake.drake_sos1 import DrakeSos1Solver

pySTL/__init__.py

@@ -1,4 +1,4 @@
-from solvers.base import STLSolver
+from ..base import STLSolver
 from pydrake.all import MathematicalProgram, eq, ge, le
 
 class DrakeSTLSolver(STLSolver):

pySTL/benchmarks/__init__.py

@@ -1,5 +1,5 @@
-from solvers.drake.drake_base import DrakeSTLSolver
-from STL import STLPredicate
+from .drake_base import DrakeSTLSolver
+from ...STL import STLPredicate
 import numpy as np
 import time
 from pydrake.all import (MathematicalProgram, 

scenarios/common.py renamed to pySTL/benchmarks/common.py

@@ -1,5 +1,5 @@
-from solvers.drake.drake_base import DrakeSTLSolver
-from STL import STLPredicate
+from .drake_base import DrakeSTLSolver
+from ...STL import STLPredicate
 import numpy as np
 
 from pydrake.all import MathematicalProgram, eq, le, ge

scenarios/door_puzzle.py renamed to pySTL/benchmarks/door_puzzle.py

@@ -1,5 +1,5 @@
-from solvers.drake.drake_micp import DrakeMICPSolver
-from STL import STLPredicate
+from .drake_micp import DrakeMICPSolver
+from ...STL import STLPredicate
 import numpy as np
 from pydrake.all import (MathematicalProgram, 
                          GurobiSolver, MosekSolver, 

scenarios/either_or.py renamed to pySTL/benchmarks/either_or.py

@@ -1,5 +1,5 @@
-from solvers.base import STLSolver
-from STL import STLPredicate
+from ..base import STLSolver
+from ...STL import STLPredicate
 import numpy as np
 
 import gurobipy as gp

scenarios/narrow_passage.py renamed to pySTL/benchmarks/narrow_passage.py

@@ -1,7 +1,7 @@
 import numpy as np
 import time
 from scipy.optimize import minimize
-from solvers import STLSolver
+from ..base import STLSolver
 
 class ScipyGradientSolver(STLSolver):
     """

scenarios/random_multitarget.py renamed to pySTL/benchmarks/random_multitarget.py

@@ -0,0 +1,2 @@
+from .linear import LinearSystem, DoubleIntegrator
+from .nonlinear import NonlinearSystem

scenarios/reach_avoid.py renamed to pySTL/benchmarks/reach_avoid.py

@@ -1,4 +1,4 @@
-from systems.nonlinear import NonlinearSystem
+from .nonlinear import NonlinearSystem
 import numpy as np
 
 class LinearSystem(NonlinearSystem):

scenarios/stepping_stones.py renamed to pySTL/benchmarks/stepping_stones.py

@@ -0,0 +1,11 @@
+from setuptools import setup, find_packages
+
+setup(name='pySTL',
+      version='0.2',
+      description='A Python library for Signal Temporal Logic',
+      url='http://github.com/vincekurtz/pySTL',
+      author='Vince Kurtz',
+      author_email='vjkurtz@gmail.com',
+      license='MIT',
+      packages=find_packages(),
+      zip_safe=False)