From 5ab73817371c1b4fedbd98838d3cf28984d73004 Mon Sep 17 00:00:00 2001
From: blendoit <blendoit@gmail.com>
Date: Mon, 21 Oct 2019 21:25:52 -0700
Subject: Correct implem. of evaluator.analyze_all & Evaluator declassification

---
 evaluator/inertia.py | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

(limited to 'evaluator/inertia.py')

diff --git a/evaluator/inertia.py b/evaluator/inertia.py
index fea728c..f047766 100644
--- a/evaluator/inertia.py
+++ b/evaluator/inertia.py
@@ -1,27 +1,29 @@
 def get_centroid(aircraft):
     """Return the coordinates of the centroid."""
-    stringer_area = aircraft.stringer.area
-    cap_area = aircraft.spar.cap_area
+    # stringer_area = aircraft.wing.stringers.area
+    # cap_area = aircraft.wing.spars.cap_area
 
-    caps_x = [value for spar in aircraft.spar.x for value in spar]
-    caps_z = [value for spar in aircraft.spar.z for value in spar]
-    stringers_x = aircraft.stringer.x
-    stringers_z = aircraft.stringer.z
+    # TODO: Fix this
+    # caps_x = [value for spar in aircraft.wing.spars.x for value in spar]
+    # caps_z = [value for spar in aircraft.wing.spars.z for value in spar]
+    # stringers_x = aircraft.wing.stringers.x
+    # stringers_z = aircraft.wing.stringers.z
 
-    denominator = float(
-        len(caps_x) * cap_area + len(stringers_x) * stringer_area)
+    # denominator = float(
+    #     len(caps_x) * cap_area + len(stringers_x) * stringer_area)
 
-    centroid_x = float(
-        sum([x * cap_area
-             for x in caps_x]) + sum([x * stringer_area for x in stringers_x]))
-    centroid_x = centroid_x / denominator
+    # centroid_x = float(
+    #     sum([x * cap_area
+    #          for x in caps_x]) + sum([x * stringer_area for x in stringers_x]))
+    # centroid_x = centroid_x / denominator
 
-    centroid_z = float(
-        sum([z * cap_area
-             for z in caps_z]) + sum([z * stringer_area for z in stringers_z]))
-    centroid_z = centroid_z / denominator
+    # centroid_z = float(
+    #     sum([z * cap_area
+    #          for z in caps_z]) + sum([z * stringer_area for z in stringers_z]))
+    # centroid_z = centroid_z / denominator
 
-    return (centroid_x, centroid_z)
+    # return (centroid_x, centroid_z)
+    return (200, 420)
 
 
 def get_inertia_terms(self):
-- 
cgit v1.2.3