Correct randomization of aircraft and save of component tree and eval results

1 files changed, 14 insertions, 31 deletions

diff --git a/example_airfoil.py b/example_airfoil.py
index c50949d..82ee254 100644
--- a/example_airfoil.py
+++ b/example_airfoil.py
@@ -9,11 +9,12 @@ Evaluate an airfoil;
 Generate a population of airfoils & optimize.
 """
 
-import resources.materials as mt
+import matplotlib.pyplot as plt
+
 import creator
-import evaluator.evaluator as evaluator
+import evaluator
 import generator
-import matplotlib.pyplot as plt
+import resources.materials as mt
 
 import time
 start_time = time.time()
@@ -47,8 +48,7 @@ af.add_naca(2412)
 spar1 = creator.wing.Spar(af, 'spar1')
 spar2 = creator.wing.Spar(af, 'spar2', 0.57)
 # spar2 = creator.wing.Spar(af, 'spar2', 0.7)
-stringer = creator.wing.Stringer(af, 'stringer')
-stringer.add_coord(af, 5, 6, 5, 4)
+stringer = creator.wing.Stringer(af, 'stringer', 5, 6, 5, 4)
 stringer.info_save(SAVE_PATH)
 
 ac2 = creator.base.Aircraft(eval, "ac2")
@@ -58,36 +58,19 @@ af2.info_save()
 spar3 = creator.wing.Spar(af2, 'spar3', 0.23)
 spar4 = creator.wing.Spar(af2, 'spar4', 0.67)
 stringer2 = creator.wing.Stringer(af2, 'stringer2')
-stringer2.add_coord(af)
 stringer2.info_save(SAVE_PATH)
 
-# print(eval.analysis())
+
+for _ in range(5):
+    aircraft = generator.default_aircraft(eval)
+    aircraft2 = generator.default_aircraft(eval)
+    eval.tree_print(aircraft, aircraft2)
+    eval.tree_save(aircraft)
+
+print(eval.analysis())
 
 # creator.wing.plot_geom(af)
-eval.tree_print()
-
-# for aircraft in eval.aircrafts:
-#     print(aircraft)
-#     print(aircraft.wing.material)
-#     for spar in aircraft.wing.spars:
-#         print(spar, f"is made out of: {spar.material['name']}")
-
-# Plot components with matplotlib
-# creator.wing.plot_geom(af, [af.spar1, af.spar2], None)
-
-# Evaluator object contains airfoil analysis results.
-# The analysis is performed in the evaluator.py module.
-# eval.analysis(1, 1)
-# eval.info_print(2)
-# eval.info_save(SAVE_PATH, 'foo_name')
-# evaluator.plot_geom(eval)
-# evaluator.plot_lift(eval)
-
-# import resources.NACA_2412
-# cl = resources.NACA_2412.cl
-# alpha = resources.NACA_2412.alpha
-# plt.plot(alpha, cl)
-# plt.show()
+# eval.tree_print()
 
 # Final execution time
 final_time = time.time() - start_time