From fb033641c0b598348efd3ef603d696ebd725a96a Mon Sep 17 00:00:00 2001 From: Sravan Balaji Date: Sun, 28 Apr 2019 12:56:27 -0400 Subject: [PATCH] New Plots and Reorganization * Changed frame data from dictionary to array --- src/file_data.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/file_data.py b/src/file_data.py index 5fb3bbf..faac2ed 100644 --- a/src/file_data.py +++ b/src/file_data.py @@ -32,7 +32,8 @@ def read_file(filepath): file = open(filepath, "r") specimen = SpecimenDimensions() - load_disp_data = dict() + frame_data = [] + frame_data.append(None) data_start = -1 in_frame_data = False @@ -67,14 +68,12 @@ def read_file(filepath): 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) + frame_data.append(FrameData(load, disp, stress)) file.close() - return specimen, load_disp_data + return specimen, frame_data