id no

4 files changed, 34 insertions, 2 deletions

diff --git a/maxLoad.m b/maxLoad.m
index 2ff279c..e4a89d3 100755
--- a/maxLoad.m
+++ b/maxLoad.m
@@ -1,4 +1,5 @@
 function [ m ] = maxLoad(T, L, D, idx, weak)
+    D = D - 0.6;
     L1 = abs(L(L ~= 0));
     T1 = abs(T(idx));
     ml = D(idx);
diff --git a/memberDistances.m b/memberDistances.m
index b533850..030a37f 100755
--- a/memberDistances.m
+++ b/memberDistances.m
@@ -6,7 +6,7 @@ function [ D ] = memberDistances(C, X, Y)
         points = [X(memb == 1); Y(memb == 1)];
         D(i) = dist(points(:,1), points(:,2));
     end
-    D = D - 0.6;
+    %D = D - 0.6;
 
 end
 
diff --git a/printHeader.m b/printHeader.m
index bef5a55..8b5291b 100755
--- a/printHeader.m
+++ b/printHeader.m
@@ -2,6 +2,6 @@ function [] = printHeader()
     fprintf('%% EK301, Section A1, Group 7, Team GNU, 4/09/12\n');
     fprintf('%% Michael Abed, ID U55178419\n');
     fprintf('%% Joseph Stone, ID U44434740\n');
-    fprintf('%% Ben Havey, ID \n');
+    fprintf('%% Ben Havey, ID U46525972\n');
     
 end
\ No newline at end of file
diff --git a/sample.out b/sample.out
new file mode 100755
index 0000000..0fd81ed
--- /dev/null
+++ b/sample.out
@@ -0,0 +1,31 @@
+Input truss data-file name: truss_data_1
+% EK301, Section A1, Group 7, Team GNU, 4/09/12
+% Michael Abed, ID U55178419
+% Joseph Stone, ID U44434740
+% Ben Havey, ID 
+Load: 25.000 N
+Member forces in Newtons:
+m1: 16.667 (C)
+m2: 0.000 
+m3: 16.667 (T)
+m4: 23.570 (C)
+m5: 16.667 (T)
+m6: 16.667 (C)
+m7: 11.785 (T)
+m8: 8.333 (T)
+m9: 0.000 
+m10: 11.785 (C)
+m11: 8.333 (T)
+m12: 0.000 
+m13: 8.333 (C)
+Reaction forces in Newtons
+r1: 0.000
+r2: 16.667
+r3: 8.333
+Cost of truss: $140
+Theoretical max load is 36.5154
+Theoretical max load/cost ratio in N/$: 0.2603
+First member to  break is member 4
+The buclking force is 29.212 N
+Worst possible buckling strength is 35.366 N
+Theoretical worst load/cost ratio: 0.2521
\ No newline at end of file