diff --git a/Assignments/A2/A2.pdf b/Assignments/A2/A2.pdf index 594d86aab5aabf91411b259bde340772243abd76..e658e3f1d9bb324e90ac86308a95d6363aa7d3e2 100644 Binary files a/Assignments/A2/A2.pdf and b/Assignments/A2/A2.pdf differ diff --git a/Assignments/A2/A2.tex b/Assignments/A2/A2.tex index 5f93255e9d2c133ad051da4a600409f29f8b37f1..0bad33700f317793ead505bf9ca103f5a08c6953 100644 --- a/Assignments/A2/A2.tex +++ b/Assignments/A2/A2.tex @@ -679,18 +679,19 @@ The input file will match the given specification. \item transition: read data from the file infile associated with the string s. Use this data to update the state of the Data module. The text file consists of a text file with the following format, where $z_i$ is the value for the - $i$th curve, $x_j^i$ is the $x$ value for the $j$th point of the $i$th curve, - $y_j^i$ is the $y$ value for the $j$th point of the $i$th curve, $m$ is the - number of curves and $n_i$ is the number of data points in the $i$th curve. - All data values in a row are separated by commas. Rows are separated by a new - line. Please note, there is no requirement that there is an equal number of - data points for each of the curves. If there is no data past a certain row, - the data entry should be empty, but there will still need to be a comma to - mark the empty spot. + $i$th curve, $o_i$ is the order of the $i$th curve, $x_j^i$ is the $x$ value + for the $j$th point of the $i$th curve, $y_j^i$ is the $y$ value for the $j$th + point of the $i$th curve, $m$ is the number of curves and $n_i$ is the number + of data points in the $i$th curve. All data values in a row are separated by + commas. Rows are separated by a new line. Please note, there is no + requirement that there is an equal number of data points for each of the + curves. If there is no data past a certain row, the data entry should be + empty, but there will still need to be a comma to mark the empty spot. \begin{equation} \begin{array}{ccccc} z_1, & z_2, & z_3, & ..., & z_m \\ + o_1, & o_2, & o_3, & ..., & o_m \\ x_1^1, & y_1^1, & ..., & x_1^m, & y_1^m\\ x_2^1, & y_2^1, & ..., & x_2^m, & y_2^m\\ x_3^1, & y_3^1, & ..., & x_3^m, & y_3^m\\