sravan/EECS-442-WN19-DIC-Project
1
0
Fork 0
mirror of https://github.com/balajsra/EECS-442-WN19-DIC-Project.git synced 2025-09-03 01:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

New Plots and Reorganization

Browse Source 
* Changed frame data from dictionary to array
This commit is contained in:
Sravan Balaji
2019-04-28 12:56:27 -04:00
parent 1286e20d7a
commit fb033641c0
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/file_data.py
View File

@@ -32,7 +32,8 @@ def read_file(filepath):
file = open(filepath, "r") file = open(filepath, "r")
specimen = SpecimenDimensions() specimen = SpecimenDimensions()
load_disp_data = dict() frame_data = []
frame_data.append(None)
data_start = -1 data_start = -1
in_frame_data = False in_frame_data = False
@@ -67,14 +68,12 @@ def read_file(filepath):
if line != '\t\t\n': if line != '\t\t\n':
frame_num_str, load_str, disp_str = line.split("\t") frame_num_str, load_str, disp_str = line.split("\t")
frame_num = int(frame_num_str)
load = float(load_str) load = float(load_str)
disp = float(disp_str) disp = float(disp_str)
stress = load / (specimen.w * specimen.t) stress = load / (specimen.w * specimen.t)
load_disp_data[frame_num] = FrameData(load, disp, stress) frame_data.append(FrameData(load, disp, stress))
file.close() file.close()
return specimen, load_disp_data return specimen, frame_data