Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Speed up chunking #197

Merged
merged 2 commits into from
Sep 16, 2022
Merged

Speed up chunking #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35c0017
Initial optimizations
AlexHalbesleben Sep 16, 2022
ce9dbef
Fix sorting
AlexHalbesleben Sep 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/components/ChunkModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@ export default class ChunkModal extends Vue {
if (!this.chunk) {
return;
}
const { duration } = this.chunk;

if (this.completed) {
if (!vxm.store.tasks.includes(this.chunk.task)) {
Expand Down
20 changes: 20 additions & 0 deletions src/components/Task/TaskModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,8 @@ export default class TaskModal extends Vue {
},
...this.task,
});

editedIndex = vxm.store.tasks.length - 1;
} else {
vxm.store.tasks[editedIndex] = {
get totalEffort(): number {
Expand All @@ -156,6 +158,24 @@ export default class TaskModal extends Vue {
...this.task,
};
}

for (let i = 0; i < vxm.store.tasks.length; i++) {
if (i === editedIndex) continue;

let t = vxm.store.tasks[i];
if (t.due.getTime() > this.task.due.getTime()) {
console.log(
`Condition passed on ${i}: swapping indices ${i} and ${editedIndex}`
);
let editedTask = vxm.store.tasks[editedIndex];
Vue.delete(vxm.store.tasks, editedIndex);
vxm.store.tasks.splice(i, 0, editedTask);
break;
}
}

console.log(vxm.store.tasks.map((task) => task.due));

vxm.store.updateChunks();
vxm.store.uploadTasks();
}
Expand Down
115 changes: 68 additions & 47 deletions src/store/index.vuex.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ export class Store extends VuexModule {
* Splits the tasks into chunks
*/
@mutation updateChunks() {
const startTime = performance.now();

// Each day is referenced by a number (the number of days after the current day) and has a list of chunks
const chunksByDay: Record<number, Chunk[]> = {};

Expand All @@ -81,22 +83,64 @@ export class Store extends VuexModule {
}
}

this.tasks.sort((a, b) => a.due.getTime() - b.due.getTime());
const intermediateTime1 = performance.now();
console.log(
`After dealing with locked chunks: ${intermediateTime1 - startTime}`
);

if (this.tasks.length > 0) {
const lastTask = this.tasks[this.tasks.length - 1];
const intermediateTime2 = performance.now();
console.log(`After sorting tasks: ${intermediateTime2 - startTime}ms`);

for (
let i = 0;
i <= DateUtils.daysBetween(DateUtils.currentDate, lastTask.due);
i++
) {
const lastTask = this.tasks[this.tasks.length - 1];
const totalDays = DateUtils.daysBetween(
DateUtils.currentDate,
lastTask.due
);

if (this.tasks.length > 0) {
for (let i = 0; i <= totalDays; i++) {
chunksByDay[i] = chunksByDay[i] ?? [];
}
}

const intermediateTime3 = performance.now();
console.log(
`After creating empty days: ${intermediateTime3 - startTime}ms`
);

const eventTimes: Record<number, number> = {};
for (let i = 0; i <= totalDays; i++) {
eventTimes[i] = 0;
}
for (const event of this.events) {
if (event.date.getTime() > DateUtils.currentDate.getTime()) {
const convertedDay = DateUtils.daysBetween(
DateUtils.currentDate,
event.date
);
eventTimes[convertedDay] += event.duration;
}
}

const completedTimes: Record<number, number> = {};
const completedEfforts: Record<number, number> = {};
for (let i = 0; i <= totalDays; i++) {
completedTimes[i] = 0;
completedEfforts[i] = 0;
}
for (const chunk of this.completedChunks) {
const convertedDay = DateUtils.daysBetween(
DateUtils.currentDate,
chunk.date
);
completedTimes[convertedDay] += chunk.duration;
completedEfforts[convertedDay] += chunk.effort;
}

// For each task, with tasks due earlier scheduled first
let i = 0;
for (const task of this.tasks) {
i++;
let { chunks } = task;
chunks -= task.lockedChunks.length;
chunks -= this.completedChunks.filter(
Expand All @@ -110,49 +154,15 @@ export class Store extends VuexModule {

// For each chunk
for (let i = 0; i < chunks; i++) {
const eventTimeOnDay = (d: number) => {
const trueDate = DateUtils.applyDayOffset(d, DateUtils.currentDate);
const events = this.events.filter(
(event: UserEvent) =>
DateUtils.daysBetween(trueDate, event.date) === 0 &&
DateUtils.daysBetween(event.date, trueDate) === 0
);
return events.reduce((prev, curr) => prev + curr.duration, 0);
};

const completedTimeOnDay = (d: number) => {
const trueDate = DateUtils.applyDayOffset(d, DateUtils.currentDate);
const chunks = this.completedChunks.filter(
(chunk: Chunk) =>
DateUtils.daysBetween(trueDate, chunk.date) === 0 &&
DateUtils.daysBetween(chunk.date, trueDate) === 0
);
if (!this.settings.considerCompletedChunksOnAllDays && d !== 0)
return 0;
return chunks.reduce((prev, curr) => prev + curr.duration, 0);
};

const completedEffortOnDay = (d: number) => {
const trueDate = DateUtils.applyDayOffset(d, DateUtils.currentDate);
const chunks = this.completedChunks.filter(
(chunk: Chunk) =>
DateUtils.daysBetween(trueDate, chunk.date) === 0 &&
DateUtils.daysBetween(chunk.date, trueDate) === 0
);
if (!this.settings.considerCompletedChunksOnAllDays && d !== 0)
return 0;
return chunks.reduce((prev, curr) => prev + curr.effort, 0);
};

const combinedDayData: Record<number, number> = {};

for (let i = 0; i <= daysUntilDue; i++) {
combinedDayData[i] =
getTotalTime(chunksByDay[i]) +
getTotalEffort(chunksByDay[i]) * this.settings.effortWeight +
completedTimeOnDay(i) +
completedEffortOnDay(i) * this.settings.effortWeight +
(this.settings.timeIncludesEvents ? eventTimeOnDay(i) : 0);
completedTimes[i] +
completedEfforts[i] * this.settings.effortWeight +
(this.settings.timeIncludesEvents ? eventTimes[i] : 0);
}

let dayToAssign = daysUntilDue;
Expand All @@ -164,7 +174,7 @@ export class Store extends VuexModule {
this.settings.timeOnDay(
DateUtils.applyDayOffset(d, DateUtils.currentDate)
) -
eventTimeOnDay(d);
eventTimes[d];

if (dayHasTime) {
dayToAssign = d;
Expand All @@ -187,7 +197,7 @@ export class Store extends VuexModule {
this.settings.timeOnDay(
DateUtils.applyDayOffset(d, DateUtils.currentDate)
) -
eventTimeOnDay(d);
eventTimes[d];

if (dayHasTime) {
anyDaysWork = true;
Expand Down Expand Up @@ -229,10 +239,21 @@ export class Store extends VuexModule {
)
);
}

const intermediateTime4 = performance.now();
console.log(
`After assigning task ${i}: ${intermediateTime4 - startTime}ms`
);
}

const intermediateTime5 = performance.now();
console.log(`After assigning chunks: ${intermediateTime5 - startTime}ms`);

// Get the values of the chunksByDay object (a nested array of Chunks) and flatten
this.chunks = (Object.values(chunksByDay) as Chunk[][]).flat(1);

const endTime = performance.now();
console.log(`Chunking took ${endTime - startTime}ms`);
}

@action async uploadTasks() {
Expand Down