From 9b0fa2854f1c95f63493b7a32f6326fabc064169 Mon Sep 17 00:00:00 2001
From: Peter Thedens <pthedens@iastate.edu>
Date: Sun, 28 Jan 2018 16:24:36 -0600
Subject: [PATCH] revert to correct files
---
.../src/computation_graph/computation_graph.c | 12 +++++-----
.../test/test_computation_graph.c | 24 +++++++++----------
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/quad/src/computation_graph/computation_graph.c b/quad/src/computation_graph/computation_graph.c
index f0b602a61..634823ed0 100644
--- a/quad/src/computation_graph/computation_graph.c
+++ b/quad/src/computation_graph/computation_graph.c
@@ -188,10 +188,10 @@ double graph_get_output(const struct computation_graph *graph, int node_id, int
* a valid node ID is passed in to the first call of this function
*/
void graph_compute_node_rec(struct computation_graph *graph, int node_id, int depth) {
- // if (depth >= GRAPH_MAX_DEPTH) {
- // assert(1 == 0);
- // return;
- // }
+ if (depth >= GRAPH_MAX_DEPTH) {
+ assert(1 == 0);
+ return;
+ }
// if (!graph_node_exists(graph, node_id)) {
// return;
// }
@@ -199,7 +199,7 @@ void graph_compute_node_rec(struct computation_graph *graph, int node_id, int de
if (node->processed_state != UNPROCESSED) {
return;
}
-// node->processed_state = DISCOVERED;
+ node->processed_state = DISCOVERED;
int input_id;
for (input_id = 0; input_id < node->type->n_inputs; input_id++) {
int src_cntl_id = node->input_srcs[input_id].controller_id;
@@ -225,7 +225,7 @@ void graph_compute_node_rec(struct computation_graph *graph, int node_id, int de
(*node->type->execute)(node->state, node->param_values, exec_input_vals, node->output_values);
}
}
- // node->processed_state = PROCESSED;
+ node->processed_state = PROCESSED;
}
void graph_compute_nodes(struct computation_graph *graph, int* node_ids, int n_nodes) {
diff --git a/quad/src/computation_graph/test/test_computation_graph.c b/quad/src/computation_graph/test/test_computation_graph.c
index e6a18cd97..d5b64e669 100644
--- a/quad/src/computation_graph/test/test_computation_graph.c
+++ b/quad/src/computation_graph/test/test_computation_graph.c
@@ -241,18 +241,18 @@ void test_that_new_nodes_can_be_created_by_ID() {
int main() {
UNITY_BEGIN();
- // RUN_TEST(test_adding_2_numbers);
+ RUN_TEST(test_adding_2_numbers);
RUN_TEST(test_computing_cycles);
- // RUN_TEST(test_resetting_cycles);
- // RUN_TEST(test_accumulator_state);
- // RUN_TEST(test_that_blocks_only_get_executed_once);
- // RUN_TEST(tests_that_already_connected_blocks_dont_get_reset);
- // RUN_TEST(test_that_a_self_loop_computation_terminates);
- // RUN_TEST(test_that_nodes_only_update_when_their_inputs_change);
- // RUN_TEST(test_that_updates_propagate_only_to_their_children);
- // RUN_TEST(test_that_nodes_get_executed_when_updated_even_if_disconnected);
- // RUN_TEST(test_that_the_get_source_call_works_normally);
- // RUN_TEST(test_that_the_get_source_call_returns_ID_neg_1_when_invalid_ID_is_passed);
- // RUN_TEST(test_that_new_nodes_can_be_created_by_ID);
+ RUN_TEST(test_resetting_cycles);
+ RUN_TEST(test_accumulator_state);
+ RUN_TEST(test_that_blocks_only_get_executed_once);
+ RUN_TEST(tests_that_already_connected_blocks_dont_get_reset);
+ RUN_TEST(test_that_a_self_loop_computation_terminates);
+ RUN_TEST(test_that_nodes_only_update_when_their_inputs_change);
+ RUN_TEST(test_that_updates_propagate_only_to_their_children);
+ RUN_TEST(test_that_nodes_get_executed_when_updated_even_if_disconnected);
+ RUN_TEST(test_that_the_get_source_call_works_normally);
+ RUN_TEST(test_that_the_get_source_call_returns_ID_neg_1_when_invalid_ID_is_passed);
+ RUN_TEST(test_that_new_nodes_can_be_created_by_ID);
return UNITY_END();
}
--
GitLab