Skip to content

Commit 10d0f5d

Browse files
authored
Merge pull request #370 from PTG-Kitware/dev/super_last_minute
super last minute changes
2 parents e684613 + a46c54c commit 10d0f5d

File tree

3 files changed

+3
-10
lines changed

3 files changed

+3
-10
lines changed

angel_system/global_step_prediction/global_step_predictor.py

-7
Original file line numberDiff line numberDiff line change
@@ -683,9 +683,6 @@ def conditionally_reset_irrational_trackers(self, tracker, skip=False):
683683
== resetter_granular_step[recipe][0]
684684
):
685685
print("reset condition hit!!")
686-
# import ipdb; ipdb.set_trace()
687-
if tracker["recipe"] == "coffee":
688-
print(f"tea step = {self.trackers[1]['current_granular_step']}")
689686
for tracker_ind in self.find_trackers_by_recipe(
690687
resetter_granular_step[recipe][1]
691688
):
@@ -696,10 +693,6 @@ def conditionally_reset_irrational_trackers(self, tracker, skip=False):
696693
][0]
697694
):
698695
self.reset_one_tracker(tracker_ind)
699-
if tracker["recipe"] == "coffee":
700-
print(
701-
f"tea step after = {self.trackers[1]['current_granular_step']}"
702-
)
703696
else:
704697
for recipe in resetter_granular_step:
705698
granular_steps = [

config/activity_labels/all_recipe_labels.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ labels:
109109
full_str: "Pour the measured coffee beans into the coffee grinder"
110110
- id: 32
111111
label: "grind-beans"
112-
full_str: "Grind the coffee beans by pressing and holding down on the black part of the lid"
112+
full_str: "Grind the coffee beans by pressing and holding down on the black part of the lid. Grind until the coffee grounds are the consistency of coarse sand, about 20 seconds."
113113
- id: 33
114114
label: "pour-beans-filter"
115115
full_str: "Transfer the grounds to the filter cone"
@@ -180,7 +180,7 @@ labels:
180180
- id: 52
181181
label: "trim-tortilla"
182182
# TEMPORARY: Should be singular
183-
full_str: "Trim the ends of the tortilla roll leaving ½” margin from the toothpick"
183+
full_str: "Trim the ends of the tortilla roll with the butter knife, leaving ½” margin from the toothpick"
184184
repeat: 2
185185
- id: 53
186186
label: "discard-tortilla-ends"

config/tasks/recipe_coffee.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ to create a quarter-circle. Place the paper filter in the dripper and spread ope
3030
label: "coffee-beans-to-grounds"
3131
full_str: "Weigh the coffee beans and grind until the coffee grounds are the consistency of coarse sand,
3232
about 20 seconds. Transfer the grounds to the filter cone."
33-
activity_ids: [28, 29, 28, 30, 31, 32, 33]
33+
activity_ids: [29, 28, 30, 31, 32, 33]
3434
- id: 5
3535
label: "check-temp"
3636
full_str: "Check the temperature of the water."

0 commit comments

Comments
 (0)