Skip to content

Ingredient ordering #805 #814

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Ingredient ordering #805 #814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4ec3611
Get the number of times an ingrient occurred in the last 90 days. Sti…
Shininess8816 May 3, 2025
f2d4b27
Bug fix - Unexpected twice unique filtering. Used padding method inst…
Shininess8816 May 4, 2025
e9f7438
Bring unique method #805
Shininess8816 May 8, 2025
33166d5
flutter pub run build_runner build && dart format --line-length=100 .
Shininess8816 May 8, 2025
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
25 changes: 18 additions & 7 deletions lib/models/nutrition/nutritional_plan.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

import 'dart:collection';
import 'package:collection/collection.dart';
import 'package:flutter/widgets.dart';
import 'package:json_annotation/json_annotation.dart';
Expand Down Expand Up @@ -226,15 +227,25 @@ class NutritionalPlan {
/// returns diary entries
/// deduped by the combination of amount and ingredient ID
List<Log> get dedupDiaryEntries {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this function should be renamed to describe its actual usage.
like maybe "ingredientSuggestions" or something

final out = <Log>[];
//Get unique and sort by frequency
const Duration recentWindow = Duration(days: -90);
var uniqueLogs = <String, Log>{};
for (final log in diaryEntries) {
final found = out.firstWhereOrNull(
(e) => e.amount == log.amount && e.ingredientId == log.ingredientId,
);
if (found == null) {
out.add(log);
}
final int howMany = diaryEntries
.where((diaryEntries) =>
diaryEntries.ingredientId == log.ingredientId &&
diaryEntries.amount == log.amount &&
diaryEntries.datetime.isAfter(DateTime.now().add(recentWindow)))
.length;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm we do (diaryEntries.length)^2 iterations here. could be a performance issue. i have a lot of diary entries.
perhaps we could iterate once and update a map of ingredientId->count records.

not sure what's the best way to compare the performance though, does dart come with benchmark tools?

//Padding allows for sorting string as if number
final String howManyPadded = howMany.toString().padLeft(10, '0');
final uniqueAndCountString = '${howManyPadded}_${log.ingredientId}_${log.amount}';
uniqueLogs[uniqueAndCountString] = log;
}

final sortedByFrequency = SplayTreeMap<String, Log>.from(uniqueLogs, (b, a) => a.compareTo(b));
final out = sortedByFrequency.values.toList();

return out;
}

Expand Down
8 changes: 6 additions & 2 deletions lib/widgets/nutrition/forms.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ Widget MealItemForm(

Widget IngredientLogForm(NutritionalPlan plan) {
return IngredientForm(
allDiaryEntries: plan.diaryEntries,
recent: plan.dedupDiaryEntries,
onSave: (BuildContext context, MealItem mealItem, DateTime? dt) {
Provider.of<NutritionPlansProvider>(context, listen: false)
Expand All @@ -166,13 +167,15 @@ class IngredientForm extends StatefulWidget {
final bool withDate;
final String barcode;
final bool test;
final List<Log>? allDiaryEntries;

const IngredientForm({
required this.recent,
required this.onSave,
required this.withDate,
this.barcode = '',
this.test = false,
this.allDiaryEntries,
});

@override
Expand Down Expand Up @@ -331,7 +334,6 @@ class IngredientFormState extends State<IngredientForm> {
onTap: () async {
// Stop keyboard from appearing
FocusScope.of(context).requestFocus(FocusNode());

// Open time picker
final pickedTime = await showTimePicker(
context: context,
Expand Down Expand Up @@ -439,11 +441,13 @@ class IngredientFormState extends State<IngredientForm> {
);
}

const Duration recentWindow = Duration(days: -90);
return Card(
child: ListTile(
onTap: select,
title: Text(
'${suggestions[index].ingredient.name} (${suggestions[index].amount.toStringAsFixed(0)}$unit)',
'${widget.allDiaryEntries?.where((diaryEntries) => diaryEntries.ingredientId == suggestions[index].ingredientId && diaryEntries.amount == suggestions[index].amount && diaryEntries.datetime.isAfter(DateTime.now().add(recentWindow))).length} x '
'${suggestions[index].ingredient.name} (${suggestions[index].amount.toStringAsFixed(0)}$unit) ',
),
subtitle: Text(getShortNutritionValues(
suggestions[index].ingredient.nutritionalValues,
Expand Down