Merge pull request #30 from alexiusacademia/section

Rename with to base in calculator
alexiusacademia · Sep 25, 2018 · bddd7b9 · bddd7b9
2 parents fc3bfe4 + 6b31c58
commit bddd7b9
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/src/com/structuralengineering/rcbeam/BeamSectionTester.java b/src/com/structuralengineering/rcbeam/BeamSectionTester.java
@@ -2,20 +2,27 @@
 
 import com.structuralengineering.rcbeam.properties.BeamSection;
 import com.structuralengineering.rcbeam.properties.BeamSectionNode;
+import com.structuralengineering.rcbeam.utils.Calculators;
 
 public class BeamSectionTester {
     public static void main(String[] args) {
         BeamSection bs = new BeamSection();
-        bs.addNode(new BeamSectionNode(0, 0));
-        bs.addNode(new BeamSectionNode(0, 400));
-        bs.addNode(new BeamSectionNode(-150, 400));
-        bs.addNode(new BeamSectionNode(-150, 520));
-        bs.addNode(new BeamSectionNode(350, 520));
-        bs.addNode(new BeamSectionNode(350, 400));
-        bs.addNode(new BeamSectionNode(200, 400));
-        bs.addNode(new BeamSectionNode(200, 0));
 
+        bs.addNode(new BeamSectionNode(0,0));
+        bs.addNode(new BeamSectionNode(0,10));
+        bs.addNode(new BeamSectionNode(10,10));
+        bs.addNode(new BeamSectionNode(10,0));
+        bs.addNode(new BeamSectionNode(0,0));
+        bs.addNode(new BeamSectionNode(2,2));
+        bs.addNode(new BeamSectionNode(8,2));
+        bs.addNode(new BeamSectionNode(8,8));
+        bs.addNode(new BeamSectionNode(2,8));
+        bs.addNode(new BeamSectionNode(2,2));
 
+        double area = Calculators.calculateArea(bs.getSection());
+
+        printString("Area = " + area);
+        printString("kd = " + Calculators.calculateCentroidY(bs.getSection()));
     }
 
     private static void printString(String str) {

diff --git a/src/com/structuralengineering/rcbeam/utils/Calculators.java b/src/com/structuralengineering/rcbeam/utils/Calculators.java
@@ -224,12 +224,12 @@ public static double getBaseAtY(double yElev, List<BeamSectionNode> nodes) {
             }
         }
 
-        double width = 0;
+        double base = 0;
         if (newNodes.size() == 2) {
-            width = Math.abs(newNodes.get(0).getX() - newNodes.get(1).getX());
+            base = Math.abs(newNodes.get(0).getX() - newNodes.get(1).getX());
         }
 
-        return width;
+        return base;
     }
 
     private static double interpolate(double x1, double x3, double y1,