Code

Tijl/ /rc calendar#431

Code

Merged

tijlleenders merged 160 commits intomaintijlleenders/ZinZen-scheduler:mainfrom tijl/-/rc-calendartijlleenders/ZinZen-scheduler:tijl/-/rc-calendarCopy head branch name to clipboardJan 22, 2024

+4,370-2,425

Commits

Commits on Dec 31, 2023

• remove Flexibility concept

  

  Tijl Leenders

  committed
  c3b2bad

  Copy full SHA for c3b2bad

• remove Day DayFilter and Date

  

  Tijl Leenders

  committed
  8c61589

  Copy full SHA for 8c61589

• delete legacy folder

  

  Tijl Leenders

  committed
  c362f62

  Copy full SHA for c362f62

• remove unused script

  

  Tijl Leenders

  committed
  b25a060

  Copy full SHA for b25a060

• update doc example

  

  Tijl Leenders

  committed
  4ae1a30

  Copy full SHA for 4ae1a30

Commits on Jan 1, 2024

• keep todos in the code or in issues

  

  Tijl Leenders

  committed
  8d22bf1

  Copy full SHA for 8d22bf1

• starting to import json correctly

  

  Tijl Leenders

  committed
  5aa830f

  Copy full SHA for 5aa830f

• add goals back

  

  Tijl Leenders

  committed
  88fe24e

  Copy full SHA for 88fe24e

• add services

  

  Tijl Leenders

  committed
  b2402d5

  Copy full SHA for b2402d5

Commits on Jan 2, 2024

• remove unused utilities

  

  Tijl Leenders

  committed
  d04e8bd

  Copy full SHA for d04e8bd

• move input to separate area

  

  Tijl Leenders

  committed
  2b85803

  Copy full SHA for 2b85803

• add Budget and activity_placer

  

  Tijl Leenders

  committed
  3a84335

  Copy full SHA for 3a84335

• remove unused crate soft

  

  Tijl Leenders

  committed
  b22866a

  Copy full SHA for b22866a

• remove unused imports

  

  Tijl Leenders

  committed
  b5ef84f

  Copy full SHA for b5ef84f

• moved technical non-domain concerns away

  

  Tijl Leenders

  committed
  3b21970

  Copy full SHA for 3b21970

• generate activites from goals

  

  Tijl Leenders

  committed
  7c76e6c

  Copy full SHA for 7c76e6c

• add status to Activity

  

  Tijl Leenders

  committed
  c8046eb

  Copy full SHA for c8046eb

• added Activity.flex() and custom Debug

  

  Tijl Leenders

  committed
  0df8c64

  Copy full SHA for 0df8c64

• scheduling algorithm-challenge

  

  Tijl Leenders

  committed
  9dab4bd

  Copy full SHA for 9dab4bd

• hide print statements for readability

  

  Tijl Leenders

  committed
  b6ff2cc

  Copy full SHA for b6ff2cc

• attempt to generate tests correctly

  

  Tijl Leenders

  committed
  60cf39a

  Copy full SHA for 60cf39a

• budget only needs a max - which is also the min.

  Show description for 43f6bc6
  

  Tijl Leenders

  committed
  43f6bc6

  Copy full SHA for 43f6bc6

Commits on Jan 3, 2024

• add FinalTasks struct

  

  Tijl Leenders

  committed
  0c8990a

  Copy full SHA for 0c8990a

• release claims when Activity is scheduled

  

  Tijl Leenders

  committed
  fb015a9

  Copy full SHA for fb015a9

• trying to generate FinalTasks

  

  Tijl Leenders

  committed
  f7c4748

  Copy full SHA for f7c4748

• rename Occupied activity_index

  

  Tijl Leenders

  committed
  4eeb0e5

  Copy full SHA for 4eeb0e5

• output FinalTasks

  

  Tijl Leenders

  committed
  ec4b98b

  Copy full SHA for ec4b98b

• format expected in same way as output for easy file compare

  

  Tijl Leenders

  committed
  6be17a6

  Copy full SHA for 6be17a6

• Passing algo challenge with cargo t

  

  Tijl Leenders

  committed
  e7e4853

  Copy full SHA for e7e4853

Commits on Jan 4, 2024

• input uses list of goals now

  

  Tijl Leenders

  committed
  9bcdce2

  Copy full SHA for 9bcdce2

• format expected

  

  Tijl Leenders

  committed
  8dc66ef

  Copy full SHA for 8dc66ef

• Escape invalid doctest

  

  Tijl Leenders

  committed
  d637acf

  Copy full SHA for d637acf

• fix init of goalid for free

  

  Tijl Leenders

  committed
  fe59e23

  Copy full SHA for fe59e23

• basic_1 passing

  

  Tijl Leenders

  committed
  6b90458

  Copy full SHA for 6b90458

• Add todo

  

  Tijl Leenders

  committed
  194c543

  Copy full SHA for 194c543

• convert alg-challenge input to new format => red test

  

  Tijl Leenders

  committed
  f21b9c8

  Copy full SHA for f21b9c8

• update input to new format

  

  Tijl Leenders

  committed
  69bdb77

  Copy full SHA for 69bdb77

• fix for new input format

  

  Tijl Leenders

  committed
  9b54837

  Copy full SHA for 9b54837

• add sleep-1 budget test => red

  

  Tijl Leenders

  committed
  467f65a

  Copy full SHA for 467f65a

• fix missing start/deadline

  

  Tijl Leenders

  committed
  0cd12d1

  Copy full SHA for 0cd12d1

• JS input should be camelCased

  

  Tijl Leenders

  committed
  a0a8aff

  Copy full SHA for a0a8aff

• format expected

  

  Tijl Leenders

  committed
  79b8fcd

  Copy full SHA for 79b8fcd

• JS input is camelCase

  

  Tijl Leenders

  committed
  6e8fed7

  Copy full SHA for 6e8fed7

• budget goals loading

  

  Tijl Leenders

  committed
  08d8550

  Copy full SHA for 08d8550

• remove todo that is done

  

  Tijl Leenders

  committed
  53f1e65

  Copy full SHA for 53f1e65

• fix compatible hours filter for budget goal

  

  Tijl Leenders

  committed
  149cefd

  Copy full SHA for 149cefd

Commits on Jan 5, 2024

• scheduling algo-challenge on wrong day

  

  Tijl Leenders

  committed
  67c71fe

  Copy full SHA for 67c71fe

• algo/basic green again - sleep inverted and not multi-day yet...

  

  Tijl Leenders

  committed
  1422a3c

  Copy full SHA for 1422a3c

• correct error in input start

  

  Tijl Leenders

  committed
  b113b78

  Copy full SHA for b113b78

• rename hour_index

  

  Tijl Leenders

  committed
  0762235

  Copy full SHA for 0762235

• filter for hour_of_day

  

  Tijl Leenders

  committed
  24324dd

  Copy full SHA for 24324dd

• remove unnecessary var

  

  Tijl Leenders

  committed
  b3822ee

  Copy full SHA for b3822ee

• adjust start/deadline for budget activities

  

  Tijl Leenders

  committed
  9123d50

  Copy full SHA for 9123d50

• fix Task counter

  

  Tijl Leenders

  committed
  4928b59

  Copy full SHA for 4928b59

• adjust Task.deadline dynamically

  

  Tijl Leenders

  committed
  e3ba48c

  Copy full SHA for e3ba48c

• add explain comment

  

  Tijl Leenders

  committed
  bdefc48

  Copy full SHA for bdefc48

• splitting calendar output on day boundary

  

  Tijl Leenders

  committed
  ab6abd4

  Copy full SHA for ab6abd4

• make gen_activities return a Vec<Act>

  

  Tijl Leenders

  committed
  2a2b69f

  Copy full SHA for 2a2b69f

• remove TODO that was done

  

  Tijl Leenders

  committed
  fb01ec5

  Copy full SHA for fb01ec5

• extract function for readability

  

  Tijl Leenders

  committed
  c3d5076

  Copy full SHA for c3d5076

• make loop for generating activities

  

  Tijl Leenders

  committed
  01b40f2

  Copy full SHA for 01b40f2

• improve calendar output loop

  

  Tijl Leenders

  committed
  3c0bba1

  Copy full SHA for 3c0bba1

• correct input

  

  Tijl Leenders

  committed
  806a449

  Copy full SHA for 806a449

• add right number of activities for budget

  

  Tijl Leenders

  committed
  4bb0377

  Copy full SHA for 4bb0377

• passing sleep-1 too

  

  Tijl Leenders

  committed
  d750b93

  Copy full SHA for d750b93

• remove sleep-1 from validated

  

  Tijl Leenders

  committed
  7538b54

  Copy full SHA for 7538b54

Commits on Jan 6, 2024

• add test default-budgets => red

  

  Tijl Leenders

  committed
  4ffe5e0

  Copy full SHA for 4ffe5e0

• remove empty fields

  

  Tijl Leenders

  committed
  b1b6b03

  Copy full SHA for b1b6b03

• add default for missing start/deadline

  

  Tijl Leenders

  committed
  1c5e7cd

  Copy full SHA for 1c5e7cd

• JS should be camelCase

  

  Tijl Leenders

  committed
  363a355

  Copy full SHA for 363a355

• improve calendar debug print

  

  Tijl Leenders

  committed
  99c2c63

  Copy full SHA for 99c2c63

• adjust goal start/deadline if default

  

  Tijl Leenders

  committed
  a1c8b93

  Copy full SHA for a1c8b93

• add children and skip if some

  

  Tijl Leenders

  committed
  a3fac57

  Copy full SHA for a3fac57

• remove unused imports

  

  Tijl Leenders

  committed
  8fccd36

  Copy full SHA for 8fccd36

Commits on Jan 7, 2024

• separate activity generation per goal type

  

  Tijl Leenders

  committed
  dfc691b

  Copy full SHA for dfc691b

• simplify simple goal handling

  

  Tijl Leenders

  committed
  73f1b71

  Copy full SHA for 73f1b71

• remove unnecessary ifs

  

  Tijl Leenders

  committed
  99f2681

  Copy full SHA for 99f2681

• typo

  

  Tijl Leenders

  committed
  2d54aaa

  Copy full SHA for 2d54aaa

• simplify generating activities from budget goal

  

  Tijl Leenders

  committed
  7eedc10

  Copy full SHA for 7eedc10

• default_goals producing output

  

  Tijl Leenders

  committed
  a08c403

  Copy full SHA for a08c403

• add Todo's for next session

  

  Tijl Leenders

  committed
  f5bb172

  Copy full SHA for f5bb172

• remove unused file

  

  Tijl Leenders

  committed
  dfb184f

  Copy full SHA for dfb184f

• make wasm run again

  

  Tijl Leenders

  committed
  1524ac1

  Copy full SHA for 1524ac1

• add on_days to input

  

  Tijl Leenders

  committed
  7127fe4

  Copy full SHA for 7127fe4

Commits on Jan 8, 2024

• update input with recent version from dev

  

  Tijl Leenders

  committed
  ea1a09c

  Copy full SHA for ea1a09c

• add day filter

  

  Tijl Leenders

  committed
  3b30ff8

  Copy full SHA for 3b30ff8

• build wasm

  

  Tijl Leenders

  committed
  3e09450

  Copy full SHA for 3e09450

• mark activity impossible if no best_hour_index

  

  Tijl Leenders

  committed
  492102f

  Copy full SHA for 492102f

• update observed for new input file

  

  Tijl Leenders

  committed
  9724c4d

  Copy full SHA for 9724c4d

• Introduce ImpossibleActivity

  

  Tijl Leenders

  committed
  63e492b

  Copy full SHA for 63e492b

• test case simple goal without start/deadline

  

  Tijl Leenders

  committed
  cb916e2

  Copy full SHA for cb916e2

• adjust expectation

  

  Tijl Leenders

  committed
  29828b3

  Copy full SHA for 29828b3

• fix erroneous default star/deadline for simple goal

  

  Tijl Leenders

  committed
  287ffb3

  Copy full SHA for 287ffb3

• correct error message

  

  Tijl Leenders

  committed
  94632a8

  Copy full SHA for 94632a8

• remove debug prints

  

  Tijl Leenders

  committed
  d6083c7

  Copy full SHA for d6083c7

• improve calendar panic print

  

  Tijl Leenders

  committed
  e6e0280

  Copy full SHA for e6e0280

• fix off by one

  

  Tijl Leenders

  committed
  507cebc

  Copy full SHA for 507cebc

• fix first day of calendar empty

  

  Tijl Leenders

  committed
  f04e1ab

  Copy full SHA for f04e1ab

Commits on Jan 9, 2024

• gitignore private goals

  

  Tijl Leenders

  committed
  129fcf6

  Copy full SHA for 129fcf6

• only create activities for on_days

  

  Tijl Leenders

  committed
  11b5e62

  Copy full SHA for 11b5e62

Commits on Jan 13, 2024

• use goals as ref

  

  Tijl Leenders

  committed
  63018e6

  Copy full SHA for 63018e6

• use calendar as mut ref

  

  Tijl Leenders

  committed
  55a4740

  Copy full SHA for 55a4740

• split scheduling in two phases

  

  Tijl Leenders

  committed
  fd5fe58

  Copy full SHA for fd5fe58

• separate calendar printing from activity placing

  

  Tijl Leenders

  committed
  bcdf24e

  Copy full SHA for bcdf24e

• start setting up budgets

  

  Tijl Leenders

  committed
  6d24519

  Copy full SHA for 6d24519

• factor out adjusting goal start/deadline

  

  Tijl Leenders

  committed
  4fbe254

  Copy full SHA for 4fbe254

• give Activity Vec<Budget>

  

  Tijl Leenders

  committed
  03bf952

  Copy full SHA for 03bf952

• better name fn

  

  Tijl Leenders

  committed
  cedf663

  Copy full SHA for cedf663

• get all descendants for each budget

  

  Tijl Leenders

  committed
  c637f7d

  Copy full SHA for c637f7d

Commits on Jan 14, 2024

• add time_budgets to budget

  

  Tijl Leenders

  committed
  55ee708

  Copy full SHA for 55ee708

• handling reducing budgets for creating optional

  

  Tijl Leenders

  committed
  fdc966a

  Copy full SHA for fdc966a

• use time_budget in activity scope - not budget

  

  Tijl Leenders

  committed
  5e4ba3c

  Copy full SHA for 5e4ba3c

• remove done todo

  

  Tijl Leenders

  committed
  b2a4235

  Copy full SHA for b2a4235

• let calendar handle updating budgets

  

  Tijl Leenders

  committed
  bf94d49

  Copy full SHA for bf94d49

• budgets on cal don't need to be a map

  

  Tijl Leenders

  committed
  819a12c

  Copy full SHA for 819a12c

• debug print for Budgets

  

  Tijl Leenders

  committed
  f58ae58

  Copy full SHA for f58ae58

• budgets being updated

  

  Tijl Leenders

  committed
  bfd5cb7

  Copy full SHA for bfd5cb7

• placeholder for optional budget activities

  

  Tijl Leenders

  committed
  ccc0d2e

  Copy full SHA for ccc0d2e

• document respect max budget approach

  

  Tijl Leenders

  committed
  61c750f

  Copy full SHA for 61c750f

• measure week budget from official start of calendar

  

  Tijl Leenders

  committed
  4e40b1f

  Copy full SHA for 4e40b1f

• measure day budgets from official start of calendar

  

  Tijl Leenders

  committed
  f199822

  Copy full SHA for f199822

• further refine respect max budgets approach

  

  Tijl Leenders

  committed
  f6a3a1a

  Copy full SHA for f6a3a1a

• remove unused function

  

  Tijl Leenders

  committed
  3215649

  Copy full SHA for 3215649

• limiting scheduling on max_per_day/week

  Show description for 49439f7
  

  Tijl Leenders

  committed
  49439f7

  Copy full SHA for 49439f7

• fix one time_budget at max wiping all activity overlays

  

  Tijl Leenders

  committed
  d60693d

  Copy full SHA for d60693d

• cleanup comments

  

  Tijl Leenders

  committed
  738c8f0

  Copy full SHA for 738c8f0

• remove done todo

  

  Tijl Leenders

  committed
  3f05a40

  Copy full SHA for 3f05a40

• elaborate todo about unnecessary impossible

  

  Tijl Leenders

  committed
  4b88455

  Copy full SHA for 4b88455

• remove marking budget activities as impossible prematurely

  

  Tijl Leenders

  committed
  0b81996

  Copy full SHA for 0b81996

• mark todo done

  

  Tijl Leenders

  committed
  6119483

  Copy full SHA for 6119483

• add todo : respect min / week as max in first round

  

  Tijl Leenders

  committed
  0556244

  Copy full SHA for 0556244

• done: choose budget limit according to activity_type

  

  Tijl Leenders

  committed
  5d21b14

  Copy full SHA for 5d21b14

• added todo's in lib an budget

  

  Tijl Leenders

  committed
  60eed52

  Copy full SHA for 60eed52

Commits on Jan 16, 2024

• fix todo log_impossible_min_day_budgets

  

  Tijl Leenders

  committed
  4a54800

  Copy full SHA for 4a54800

• add one activity/day to get to min week

  

  Tijl Leenders

  committed
  9b76428

  Copy full SHA for 9b76428

• factor out generate activity fn

  

  Tijl Leenders

  committed
  5eedf83

  Copy full SHA for 5eedf83

• add multiple get_to_min_week activities

  

  Tijl Leenders

  committed
  a5edb58

  Copy full SHA for a5edb58

• test log impossible min_per_week works

  

  Tijl Leenders

  committed
  3e6fb1e

  Copy full SHA for 3e6fb1e

• restore test without failin min_per_week

  

  Tijl Leenders

  committed
  b38e248

  Copy full SHA for b38e248

• remove done todo

  

  Tijl Leenders

  committed
  5c899c9

  Copy full SHA for 5c899c9

• top up week budgets

  

  Tijl Leenders

  committed
  006d99e

  Copy full SHA for 006d99e

• update expected to cluster tasks with after>before

  

  Tijl Leenders

  committed
  939682d

  Copy full SHA for 939682d

• add TODO test cases

  

  Tijl Leenders

  committed
  5e02035

  Copy full SHA for 5e02035

Commits on Jan 19, 2024

• fixed all but one clippy warning

  

  Tijl Leenders

  committed
  f43b83d

  Copy full SHA for f43b83d

• fixed last clippy

  

  Tijl Leenders

  committed
  3e57e32

  Copy full SHA for 3e57e32

• set day budget min/max to 0 if not in on_days

  

  Tijl Leenders

  committed
  718f92b

  Copy full SHA for 718f92b

• mark todo done

  

  Tijl Leenders

  committed
  78bcbef

  Copy full SHA for 78bcbef

• add TODOs for budget correctness check

  

  Tijl Leenders

  committed
  a9a211d

  Copy full SHA for a9a211d

Commits on Jan 20, 2024

• add panic for inconsistent budget config

  

  Tijl Leenders

  committed
  7ccb011

  Copy full SHA for 7ccb011

• mark todo done inconsistent min/week

  

  Tijl Leenders

  committed
  75a224d

  Copy full SHA for 75a224d

• fix input to be realistic - and fix error in panic

  

  Tijl Leenders

  committed
  93504d9

  Copy full SHA for 93504d9

• add second check on budget quality

  

  Tijl Leenders

  committed
  07c5cdb

  Copy full SHA for 07c5cdb

• Update expected.json based on new input

  

  Tijl Leenders

  committed
  49431c1

  Copy full SHA for 49431c1

Commits on Jan 21, 2024

• optimize debug output

  

  Tijl Leenders

  committed
  3395668

  Copy full SHA for 3395668

• adjust goal placing start/end indexes when after > before

  

  Tijl Leenders

  committed
  50678e6

  Copy full SHA for 50678e6

• fix nasty off-by-one bug

  

  Tijl Leenders

  committed
  a3c74a6

  Copy full SHA for a3c74a6

• update tests to log impossible min/week

  

  Tijl Leenders

  committed
  6a9d0bf

  Copy full SHA for 6a9d0bf

• allow multiple and larger blocks from single activity

  

  Tijl Leenders

  committed
  3d83acd

  Copy full SHA for 3d83acd

• update expectation and observed default_goals

  

  Tijl Leenders

  committed
  060266e

  Copy full SHA for 060266e

• fix clippy

  

  Tijl Leenders

  committed
  49920f9

  Copy full SHA for 49920f9