From 2a00d65e9f6aaba9be534b7165c6e1c308984f85 Mon Sep 17 00:00:00 2001
From: Sravan Balaji <balajsra@umich.edu>
Date: Mon, 15 Apr 2019 20:01:06 -0400
Subject: [PATCH] Rename main.py to file_data.py and add new main.py

* Rename old main.py to file_data.py
* Add main.py that calls read_file function in file_data.py
---
 src/file_data.py | 80 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/main.py      | 78 +++++-----------------------------------------
 2 files changed, 87 insertions(+), 71 deletions(-)
 create mode 100644 src/file_data.py

diff --git a/src/file_data.py b/src/file_data.py
new file mode 100644
index 0000000..5fb3bbf
--- /dev/null
+++ b/src/file_data.py
@@ -0,0 +1,80 @@
+#############################################################
+#             EECS 442: Computer Vision - W19               #
+#############################################################
+# Authors: Sravan Balaji & Kevin Monpara                    #
+# Filename: file_data.py                                    #
+# Description:                                              #
+#   Read data file to get specimen dimensions.              #
+#   Read in load and displacement data for each frame.      #
+#   Calculate stress from load and cross-sectional area.    #
+#############################################################
+
+
+class FrameData:
+    load = 0    # Load in N
+    disp = 0    # Displacement in mm
+    stress = 0  # Stress in MPa
+
+    def __init__(self, load, disp, stress):
+        self.load = load
+        self.disp = disp
+        self.stress = stress
+
+
+class SpecimenDimensions:
+    w = 0   # Specimen Width in mm
+    t = 0   # Specimen Thickness in mm
+    gl = 0  # Specimen Gauge Length in mm
+    ol = 0  # Specimen Overall Length in mm
+
+
+def read_file(filepath):
+    file = open(filepath, "r")
+
+    specimen = SpecimenDimensions()
+    load_disp_data = dict()
+
+    data_start = -1
+    in_frame_data = False
+
+    for line in file:
+        if "Width" in line:
+            index = line.find("\t")
+            specimen.w = float(line[index + 1:])
+
+        if "Thickness" in line:
+            index = line.find("\t")
+            specimen.t = float(line[index + 1:])
+
+        if "Gauge Length" in line:
+            index = line.find("\t")
+            specimen.gl = float(line[index + 1:])
+
+        if "Overall Length" in line:
+            index = line.find("\t")
+            specimen.ol = float(line[index + 1:])
+
+        if "Frame #" in line:
+            data_start = 2
+
+        if data_start != -1:
+            data_start -= 1
+
+        if data_start == 0:
+            in_frame_data = True
+
+        if in_frame_data:
+            if line != '\t\t\n':
+                frame_num_str, load_str, disp_str = line.split("\t")
+
+                frame_num = int(frame_num_str)
+
+                load = float(load_str)
+                disp = float(disp_str)
+                stress = load / (specimen.w * specimen.t)
+
+                load_disp_data[frame_num] = FrameData(load, disp, stress)
+
+    file.close()
+
+    return specimen, load_disp_data
diff --git a/src/main.py b/src/main.py
index 4a306fc..d0034f2 100644
--- a/src/main.py
+++ b/src/main.py
@@ -1,84 +1,20 @@
 #############################################################
-#       EECS 442: Computer Vision - W19                     #
+#             EECS 442: Computer Vision - W19               #
 #############################################################
 # Authors: Sravan Balaji & Kevin Monpara                    #
 # Filename: main.py                                         #
 # Description:                                              #
-#   Read data file to get specimen dimensions.              #
-#   Read in load and displacement data for each frame.      #
-#   Calculate stress from load and cross-sectional area.    #
+#                                                           #
 #############################################################
 
-
-class FrameData:
-    load = 0    # Load in N
-    disp = 0    # Displacement in mm
-    stress = 0  # Stress in MPa
-
-    def __init__(self, load, disp, stress):
-        self.load = load
-        self.disp = disp
-        self.stress = stress
+import file_data
 
 
-class SpecimenDimensions:
-    w = 0   # Specimen Width in mm
-    t = 0   # Specimen Thickness in mm
-    gl = 0  # Specimen Gauge Length in mm
-    ol = 0  # Specimen Overall Length in mm
+def main():
+    specimen, load_disp_data = file_data.read_file("../Section001_Data.txt")
 
-
-def read_file(filepath):
-    file = open(filepath, "r")
-
-    specimen = SpecimenDimensions()
-    load_disp_data = dict()
-
-    data_start = -1
-    in_frame_data = False
-
-    for line in file:
-        if "Width" in line:
-            index = line.find("\t")
-            specimen.w = float(line[index + 1:])
-
-        if "Thickness" in line:
-            index = line.find("\t")
-            specimen.t = float(line[index + 1:])
-
-        if "Gauge Length" in line:
-            index = line.find("\t")
-            specimen.gl = float(line[index + 1:])
-
-        if "Overall Length" in line:
-            index = line.find("\t")
-            specimen.ol = float(line[index + 1:])
-
-        if "Frame #" in line:
-            data_start = 2
-
-        if data_start != -1:
-            data_start -= 1
-
-        if data_start == 0:
-            in_frame_data = True
-
-        if in_frame_data:
-            if line != '\t\t\n':
-                frame_num_str, load_str, disp_str = line.split("\t")
-
-                frame_num = int(frame_num_str)
-
-                load = float(load_str)
-                disp = float(disp_str)
-                stress = load / (specimen.w * specimen.t)
-
-                load_disp_data[frame_num] = FrameData(load, disp, stress)
-
-    file.close()
-
-    return specimen, load_disp_data
+    print("Done")
 
 
 if __name__ == "__main__":
-    specimen, load_disp_data = read_file("../Section001_Data.txt")
+    main()