done: choose budget limit according to activity_type

src/lib.rs

@@ -101,7 +101,6 @@ pub fn run_scheduler(
     activity_placer::place(&mut calendar, simple_goal_activities);
 
     //generate and place budget goal activities
-    //TODO: now only limiting when reaching max/week - it should limit when it reaches min/week
     let budget_goal_activities: Vec<Activity> =
         activity_generator::generate_budget_goal_activities(&calendar, &goals);
     dbg!(&calendar);

src/models/activity.rs

@@ -278,13 +278,13 @@ impl Activity {
             return ();
         }
         for budget in budgets {
+            //check if activity goal id is in the budget - else don't bother
             if budget.participating_goals.contains(&self.goal_id) {
                 // great, process it
             } else {
                 // budget not relevant to this activity
                 continue;
             }
-            //check if activity goal id is in the budget - else don't bother
             //check my overlay for valid placing options, with a loop like get_best_scheduling_index
             for hour_index in 0..self.calendar_overlay.len() {
                 match &self.calendar_overlay[hour_index] {
@@ -308,8 +308,11 @@ impl Activity {
                                     //if last position check if best so far - or so little we can break
                                     if offset == self.min_block_size - 1 {
                                         //check if not allowed by budgets
-                                        let is_allowed =
-                                            budget.is_within_budget(hour_index, offset);
+                                        let is_allowed = budget.is_within_budget(
+                                            hour_index,
+                                            offset,
+                                            self.activity_type.clone(),
+                                        );
                                         if is_allowed {
                                             // Cool!
                                         } else {

src/models/budget.rs

@@ -2,7 +2,7 @@ use std::fmt::{Debug, Formatter};
 
 use serde::Deserialize;
 
-use super::{calendar::Calendar, goal::Goal};
+use super::{activity::ActivityType, calendar::Calendar, goal::Goal};
 
 #[derive(Debug, Clone, Deserialize)]
 pub struct Budget {
@@ -25,9 +25,23 @@ impl Budget {
         }
     }
 
-    pub(crate) fn is_within_budget(&self, hour_index: usize, offset: usize) -> bool {
+    pub(crate) fn is_within_budget(
+        &self,
+        hour_index: usize,
+        offset: usize,
+        activity_type: ActivityType,
+    ) -> bool {
+        let mut budget_cut_off_number = 0;
         let mut is_allowed = true;
         for time_budget in &self.time_budgets {
+            match activity_type {
+                ActivityType::SimpleGoal => {
+                    budget_cut_off_number = time_budget.min_scheduled;
+                }
+                ActivityType::Budget => {
+                    budget_cut_off_number = time_budget.min_scheduled;
+                }
+            }
             //figure out how many of the hours in hour_index till hour_index + offset are in the time_budget window
             let mut hours_in_time_budget_window = 0;
             for local_offset in 0..offset {
@@ -39,7 +53,7 @@ impl Budget {
             }
             if (hour_index + offset) >= time_budget.calendar_start_index
                 && (hour_index + offset) < time_budget.calendar_end_index
-                && time_budget.scheduled + hours_in_time_budget_window >= time_budget.max_scheduled
+                && time_budget.scheduled + hours_in_time_budget_window >= budget_cut_off_number
             {
                 is_allowed = false;
             }