diff options
| -rw-r--r-- | __init__.py | 0 | ||||
| -rw-r--r-- | creator/__init__.py | 9 | ||||
| -rw-r--r-- | creator/base.py | 10 | ||||
| -rw-r--r-- | creator/wing.py | 8 | ||||
| -rw-r--r-- | evaluator.py (renamed from evaluator/evaluator.py) | 0 | ||||
| -rw-r--r-- | evaluator/__init__.py | 0 | ||||
| -rw-r--r-- | example_airfoil.py | 15 | ||||
| -rw-r--r-- | generator/generator.py (renamed from generator.py) | 0 |
8 files changed, 21 insertions, 21 deletions
diff --git a/__init__.py b/__init__.py deleted file mode 100644 index e69de29..0000000 --- a/__init__.py +++ /dev/null diff --git a/creator/__init__.py b/creator/__init__.py index 6fc3a2c..7662f94 100644 --- a/creator/__init__.py +++ b/creator/__init__.py @@ -1 +1,8 @@ -__all__ = ['base', 'fuselage', 'propulsion', 'wing'] +from . import base +from . import fuselage +from . import propulsion +from . import wing +# import creator.base +# import creator.fuselage +# import creator.propulsion +# import creator.wing diff --git a/creator/base.py b/creator/base.py index 91d4c70..2566a6b 100644 --- a/creator/base.py +++ b/creator/base.py @@ -9,6 +9,11 @@ logging.basicConfig(filename='log.txt', format='%(asctime)s - %(levelname)s - %(message)s') +class Aircraft: + """This class tracks all sub-components and is fed to the evaluator.""" + pass + + class Component: """Basic component providing coordinates and tools.""" @@ -52,8 +57,3 @@ class Component: print(f'Unable to write {file_name} to specified directory.\n', 'Was the full path passed to the function?') return None - - -class Aircraft: - """This class tracks all sub-components and is fed to the evaluator.""" - pass diff --git a/creator/wing.py b/creator/wing.py index be8e18a..8178366 100644 --- a/creator/wing.py +++ b/creator/wing.py @@ -316,11 +316,3 @@ def plot_geom(airfoil, spars, stringers): bbox_transform=plt.gcf().transFigure) plt.show() return fig, ax - - -def main(): - return None - - -if __name__ == '__main__': - main() diff --git a/evaluator/evaluator.py b/evaluator.py index afbde9c..afbde9c 100644 --- a/evaluator/evaluator.py +++ b/evaluator.py diff --git a/evaluator/__init__.py b/evaluator/__init__.py deleted file mode 100644 index e69de29..0000000 --- a/evaluator/__init__.py +++ /dev/null diff --git a/example_airfoil.py b/example_airfoil.py index a5e1cce..14cf916 100644 --- a/example_airfoil.py +++ b/example_airfoil.py @@ -9,9 +9,10 @@ Evaluate an airfoil; Generate a population of airfoils & optimize. """ -from resources import materials as mt -from creator import * -from evaluator import evaluator +import resources.materials as mt +import creator +import evaluator +import generator # from generator import import time @@ -42,16 +43,16 @@ NOSE_BOTTOM_STRINGERS = 5 SAVE_PATH = '/home/blendux/Projects/Aircraft_Studio/save' # Create aircraft instance -aircraft = base.Aircraft +aircraft = creator.base.Aircraft # Create airfoil instance -af = wing.Airfoil(20, 150, mt.aluminium) +af = creator.wing.Airfoil(68, 150, mt.aluminium) af.add_naca(NACA_NUM) af.info_print(2) # af.info_save(SAVE_PATH, 'foo_name') # Create spar instances -af.spar1 = wing.Spar(af, 0.23, mt.aluminium) -af.spar2 = wing.Spar(af, 0.57, mt.aluminium) +af.spar1 = creator.wing.Spar(af, 0.23, mt.aluminium) +af.spar2 = creator.wing.Spar(af, 0.57, mt.aluminium) # af.spar1.info_print(2) # af.spar2.info_print(2) # af.spar1.info_save(SAVE_PATH, 'spar1') diff --git a/generator.py b/generator/generator.py index 0213828..0213828 100644 --- a/generator.py +++ b/generator/generator.py |