Astyle formatting (with manual cleanup)

1 files changed, 44 insertions, 16 deletions

diff --git a/src/openvic-simulation/testing/TestScript.cpp b/src/openvic-simulation/testing/TestScript.cpp
index 0a9ce6f..d08f34c 100644
--- a/src/openvic-simulation/testing/TestScript.cpp
+++ b/src/openvic-simulation/testing/TestScript.cpp
@@ -3,49 +3,77 @@
 using namespace OpenVic;
 
 // Getters
-std::vector<Requirement*> TestScript::get_requirements() { return requirements; }
-Requirement* TestScript::get_requirement_at_index(int index) { return requirements[index]; }
+std::vector<Requirement*> TestScript::get_requirements() {
+	return requirements;
+}
+Requirement* TestScript::get_requirement_at_index(int index) {
+	return requirements[index];
+}
 Requirement* TestScript::get_requirement_by_id(std::string id) {
 	for (auto req : requirements) {
-		if (req->get_id() == id) return req;
+		if (req->get_id() == id) {
+			return req;
+		}
 	}
 	return new Requirement("NULL", "NULL", "NULL");	// edge case of failing to find
 }
 std::vector<Requirement*> TestScript::get_passed_requirements() {
 	std::vector<Requirement*> passed_requirements = std::vector<Requirement*>();
 	for (auto req : requirements) {
-		if (req->get_pass()) passed_requirements.push_back(req);
+		if (req->get_pass()) {
+			passed_requirements.push_back(req);
+		}
 	}
 	return passed_requirements;
 }
 std::vector<Requirement*> TestScript::get_failed_requirements() {
 	std::vector<Requirement*> failed_requirements = std::vector<Requirement*>();
 	for (auto req : requirements) {
-		if (!req->get_pass() && req->get_tested()) failed_requirements.push_back(req);
+		if (!req->get_pass() && req->get_tested()) {
+			failed_requirements.push_back(req);
+		}
 	}
 	return failed_requirements;
 }
 std::vector<Requirement*> TestScript::get_untested_requirements() {
 	std::vector<Requirement*> untested_requirements = std::vector<Requirement*>();
-	for (auto req : requirements)  {
-		if (!req->get_tested()) untested_requirements.push_back(req);
+	for (auto req : requirements) {
+		if (!req->get_tested()) {
+			untested_requirements.push_back(req);
+		}
 	}
 	return untested_requirements;
 }
-GameManager* TestScript::get_game_manager() { return game_manager; }
-std::string TestScript::get_script_name() { return script_name; }
+GameManager* TestScript::get_game_manager() {
+	return game_manager;
+}
+std::string TestScript::get_script_name() {
+	return script_name;
+}
 
 // Setters
-void TestScript::set_requirements(std::vector<Requirement*> in_requirements) { requirements = in_requirements; }
-void TestScript::add_requirement(Requirement* req) {	requirements.push_back(req); }
-void TestScript::set_game_manager(GameManager* in_game_manager) { game_manager = in_game_manager; }
-void TestScript::set_script_name(std::string in_script_name) { script_name = in_script_name; }
+void TestScript::set_requirements(std::vector<Requirement*> in_requirements) {
+	requirements = in_requirements;
+}
+void TestScript::add_requirement(Requirement* req) {
+	requirements.push_back(req);
+}
+void TestScript::set_game_manager(GameManager* in_game_manager) {
+	game_manager = in_game_manager;
+}
+void TestScript::set_script_name(std::string in_script_name) {
+	script_name = in_script_name;
+}
 
 // Methods
-void TestScript::pass_or_fail_req_with_actual_and_target_values(std::string req_name, std::string target_value, std::string actual_value) {
+void TestScript::pass_or_fail_req_with_actual_and_target_values(std::string req_name, std::string target_value,
+	std::string actual_value) {
 	Requirement* req = get_requirement_by_id(req_name);
 	req->set_target_value(target_value);
 	req->set_actual_value(actual_value);
-	if (target_value == actual_value) req->set_pass(true);
-	else req->set_pass(false);
+	if (target_value == actual_value) {
+		req->set_pass(true);
+	} else {
+		req->set_pass(false);
+	}
 }