From 16b0c98f82a5fc6de4b7b4462873e93c1f579645 Mon Sep 17 00:00:00 2001
From: Blinningjr <nicke.l@telia.com>
Date: Sun, 3 Jan 2021 11:42:17 +0100
Subject: [PATCH] Moved the creatino of task to a function
---
srp_analysis/src/main.rs | 29 +++++++++++++++++------------
1 file changed, 17 insertions(+), 12 deletions(-)
diff --git a/srp_analysis/src/main.rs b/srp_analysis/src/main.rs
index eadd7bd..fd2ddac 100644
--- a/srp_analysis/src/main.rs
+++ b/srp_analysis/src/main.rs
@@ -6,6 +6,21 @@ use srp_analyser::*;
fn main() {
+ let tasks: Tasks = create_tasks();
+
+ println!("tasks {:?}", &tasks);
+ println!("tot_util {}", total_load_factor(&tasks));
+
+ let (ip, tr) = pre_analysis(&tasks);
+ println!("ip: {:?}", ip);
+ println!("tr: {:?}", tr);
+
+ let analysis = analyse(&tasks, &ip, &tr, true);
+ println!("Analysis {:#?}", analysis);
+}
+
+
+fn create_tasks() -> Tasks {
let t1 = Task {
id: "T1".to_string(),
prio: 1,
@@ -67,19 +82,9 @@ fn main() {
}],
},
};
-
+
// builds a vector of tasks t1, t2, t3
let tasks: Tasks = vec![t1, t2, t3];
-
- println!("tasks {:?}", &tasks);
- println!("tot_util {}", total_load_factor(&tasks));
-
- let (ip, tr) = pre_analysis(&tasks);
- println!("ip: {:?}", ip);
- println!("tr: {:?}", tr);
-
- let analysis = analyse(&tasks, &ip, &tr, true);
- println!("Analysis {:#?}", analysis);
+ return tasks;
}
-
--
GitLab