diff --git a/Homework6_Daniel_Joel.zip b/Homework6_Daniel_Joel.zip
new file mode 100644
index 0000000..58aed55
Binary files /dev/null and b/Homework6_Daniel_Joel.zip differ
diff --git a/Radec/Radec/Radec.vcxproj b/Radec/Radec/Radec.vcxproj
index 1148403..e906b31 100644
--- a/Radec/Radec/Radec.vcxproj
+++ b/Radec/Radec/Radec.vcxproj
@@ -175,6 +175,14 @@
+
+
+
+
+
+
+
+
diff --git a/Radec/Radec/Radec.vcxproj.filters b/Radec/Radec/Radec.vcxproj.filters
index 9d1cfcc..c2eb5f0 100644
--- a/Radec/Radec/Radec.vcxproj.filters
+++ b/Radec/Radec/Radec.vcxproj.filters
@@ -98,4 +98,24 @@
Resource Files
+
+
+ Resource Files
+
+
+ Resource Files
+
+
+ Resource Files
+
+
+ Resource Files
+
+
+ Resource Files
+
+
+ Resource Files
+
+
\ No newline at end of file
diff --git a/Screenshots/circuit0.JPG b/Screenshots/circuit0.JPG
new file mode 100644
index 0000000..dbb9a2e
Binary files /dev/null and b/Screenshots/circuit0.JPG differ
diff --git a/Screenshots/circuit1.JPG b/Screenshots/circuit1.JPG
new file mode 100644
index 0000000..8d41992
Binary files /dev/null and b/Screenshots/circuit1.JPG differ
diff --git a/Screenshots/circuit2.JPG b/Screenshots/circuit2.JPG
new file mode 100644
index 0000000..af4d1cb
Binary files /dev/null and b/Screenshots/circuit2.JPG differ
diff --git a/Screenshots/circuit3.JPG b/Screenshots/circuit3.JPG
new file mode 100644
index 0000000..0cb898f
Binary files /dev/null and b/Screenshots/circuit3.JPG differ
diff --git a/Screenshots/circuit4.JPG b/Screenshots/circuit4.JPG
new file mode 100644
index 0000000..0b8fb05
Binary files /dev/null and b/Screenshots/circuit4.JPG differ
diff --git a/Screenshots/circuit5.JPG b/Screenshots/circuit5.JPG
new file mode 100644
index 0000000..22dbf54
Binary files /dev/null and b/Screenshots/circuit5.JPG differ
diff --git a/src/Event.cpp b/src/Event.cpp
index bd4b445..cc51169 100644
--- a/src/Event.cpp
+++ b/src/Event.cpp
@@ -37,4 +37,3 @@ bool operator<(const Event &e1, const Event &e2) {
}
return e1.evTime > e2.evTime;
}
-
diff --git a/src/radec.cpp b/src/radec.cpp
index ae5ad60..89158b9 100644
--- a/src/radec.cpp
+++ b/src/radec.cpp
@@ -18,14 +18,7 @@ int main() {
cout << "Please enter filename: ";
getline(cin, fileName);
- cout << "What time do you want to simulate to (default 60ns)? ";
- if (cin.peek() == '\n') {
- len = 60;
- }
- else if (!(cin >> len)) {
- cout << "Invalid input; using 60.\n";
- len = 60;
- }
+
canOpen = e.parseCircuit(fileName);
// 2. Parse the vector file to initialize the simulation Queue with initial
@@ -38,10 +31,19 @@ int main() {
// third, create and queue any future Wire state changes as new Events
// fourth, apply e's effects
if(canOpen) {
+ cout << "What time do you want to simulate to (default 60ns)? ";
+ if (cin.peek() == '\n') {
+ len = 60;
+ }
+ else if (!(cin >> len)) {
+ cout << "Invalid input; using 60.\n";
+ len = 60;
+ }
e.simulate(len);
// 4. Print the results of the simulation
e.print(len);
- system("pause");
}
+ system("pause");
+ return 0;
}
diff --git a/src/termproject.pdf b/src/termproject.pdf
new file mode 100644
index 0000000..9b61be5
Binary files /dev/null and b/src/termproject.pdf differ