-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
9d88646
commit 443c135
Showing
53 changed files
with
1,054 additions
and
65 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
Empty file.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions
4
docs/scheduling/introduction.mdx → ...s/declarative/scheduling/introduction.mdx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
# Scheduling & Constraints | ||
|
||
Aerie provides related frameworks for defining constraints and scheduling new activities in the plan, and two implementations | ||
of those frameworks: one for arbitrary procedures that run on the JVM, and a legacy system based on a declarative Typescript eDSL | ||
(embedded Domain-Specific Language). Both frameworks are documented here, but new users are encouraged to focus on | ||
creating JVM procedures. The declarative eDSL is significantly less capable, and the difference in capabilities is only expected to | ||
grow. | ||
|
||
## Constraints | ||
|
||
Constraints represent what is nominal for a plan or mission model, and when executed, the UI will display "violations" | ||
whenever the plan or model is off-nominal. They don't alter the behavior of the simulation engine or scheduler; they | ||
just serve as a warning, indicating that some requirement - perhaps a flight rule - was broken. | ||
|
||
## Scheduling | ||
|
||
The scheduler allows users to automate the creation of new activities, to remove some cognitive load from planners. A | ||
scheduling specification contains a list of goals and rules with a priority order; during a scheduling run, they are | ||
executed one at a time, starting from a priority of 0 and increasing from there. | ||
|
||
### Procedural Goals | ||
|
||
Procedural goals directly edit the plan, creating new activities at definite (grounded) times. They | ||
can simulate potential changes to the plan, but aren't required to. In fact, a scheduling specification composed entirely | ||
of procedures might run in its entirety without performing any simulations, potentially at the cost of optimality or even | ||
soundness. | ||
|
||
### eDSL Goals | ||
|
||
eDSL goals are more declarative, in that they don't allow you to directly create grounded activities; instead they allow | ||
you to describe a pattern of activities that should be present in the plan. If the pattern isn't found, the goal tries to | ||
create it for you. Currently eDSL goals are simpler to write than procedural goals, for patterns that they can represent. | ||
Many goals are more complex than can be represented in the eDSL, and will have to be written as a procedure. | ||
|
||
### Global Conditions | ||
|
||
Global scheduling conditions (or sometimes just "conditions") are supplemental pieces of code that define when scheduling | ||
goals can and cannot place activities. They are incorporated into the solver when attempting to resolve conflicts as | ||
a substitute for constraints. This is because it is too difficult to respect constraints during scheduling; constraints | ||
only indicate that something went wrong, not what caused it or how to fix it. So in cases when the scheduler keeps violating | ||
constraints, users can create a condition as a heuristic to help it satisfy the constraint. | ||
|
||
Conditions will be accessible to scheduling rules, but will be non-binding. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
# Management | ||
|
||
## Creating and Updating | ||
|
||
The recommended setup is to store goals/rules/conditions/constraints (hereafter called "peripheral code") | ||
in one or more repositories outside Aerie, and uploading | ||
them either through the UI or the unofficial [Aerie CLI](https://github.com/NASA-AMMOS/aerie-cli). | ||
|
||
For example, after creating a new goal as described in the following pages, you can upload it with the CLI using | ||
`aerie-cli goals new <path/to/MyGoal.jar>`. A new goal will be created in Aerie with a default name of `MyGoal`. | ||
See `aerie-cli goals new --help` for more details, such as automatically | ||
associating it with a model or plan. To update a goal afterward, you can run `aerie-cli goals update <path/to/MyGoal.jar>`, | ||
assuming that the default name was not changed. The same works for Typescript eDSL declarations, and similar workflows | ||
will be implemented for constraints and conditions soon. | ||
|
||
## Model and Plan Association | ||
|
||
In Aerie, peripherals live independently of plans and models, and can be associated with | ||
any number of plans and models, or none at all. Each model and plan has a scheduling specification and a constraints | ||
specification, which is simply a list of peripherals to run during the scheduling or constraints actions, respectively. | ||
|
||
Model specifications are never run directly, and instead populate the default spec for any plans created from that model. | ||
So if a particular constraint is widely applicable to all plans made from a particular model, you can associate it with | ||
the model by navigating to `Models -> <select your model> -> Edit details ... -> Constraints -> Library`. Click the checkbox | ||
on your constraint and select `Save`. Now any new plans made with this model will include your constraint in its specification. | ||
|
||
Peripherals that don't apply to all plans for a model can be associated with individual plans too. In the main plan view, | ||
navigate to the `Scheduling Goals` or `Constraints` pane, then click `Manage`. Click the checkbox for your peripheral and | ||
select `Save`. | ||
|
||
Additionally, the Aerie CLI provides options when creating a new goal to associate it with a given model ID or plan ID. | ||
|
||
## Version Locking | ||
|
||
Peripheral associations can be locked to a specific revision, on either the model or plan specification. In the specification, | ||
you can change `Always use latest` to a revision number of your choice. | ||
|
||
## Deleting | ||
|
||
Peripherals can be deleted in the UI by navigating to the `Scheduling` or `Constraints` view in the top left, and deleting | ||
them there. This action can't be done if the peripheral is being used by a plan or model. |
170 changes: 170 additions & 0 deletions
170
docs/scheduling-and-constraints/procedural/constraints.mdx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,170 @@ | ||
import Tabs from '@theme/Tabs'; | ||
import TabItem from '@theme/TabItem'; | ||
|
||
# Constraints | ||
|
||
:::tip | ||
|
||
Procedural constraints aren't supported yet, although the interfaces are fully implemented. You should be able to run | ||
a constraint locally using the procedural-remote package, but they can't yet be integrated with Aerie. | ||
|
||
::: | ||
|
||
It's finally time to write a useful piece of code! Constraints are simple. They take a `Plan` and `SimulationResults`, | ||
and return a `Violations` timeline. Violations are a new type of timeline specific to constraints, that store `Violation` | ||
objects. You won't usually need to perform additional operations after creating a `Violations` timeline; usually you'll | ||
just return it. They can be created with some provided static constructor functions. For example: | ||
|
||
<Tabs groupId="lang"> | ||
<TabItem value="kt" label="Kotlin"> | ||
|
||
```kotlin | ||
@ConstraintProcedure | ||
class BatteryAboveZero: Constraint { | ||
override fun run(plan: Plan, simResults: SimulationResults) = Violations.inside( | ||
plan.resource("/battery_soc", Real.deserialize()).lessThan(0).highlightTrue() | ||
) | ||
} | ||
``` | ||
|
||
</TabItem> | ||
<TabItem value="java" label="Java"> | ||
|
||
```java | ||
@ConstraintProcedure | ||
public class BatterAboveZero implements Constraint { | ||
@NotNull | ||
@Override | ||
public Violations run(@NotNull Plan plan, @NotNull SimulationResults simResults) { | ||
return Violations.inside( | ||
plan.resource("/battery_soc", Real.deserialize()).lessThan(0).highlightTrue() | ||
); | ||
} | ||
} | ||
``` | ||
|
||
</TabItem> | ||
</Tabs> | ||
|
||
## Generator Constraints | ||
|
||
For more complex constraints, it may be tedious to try to represent all the violations in a single `Violations` timeline, | ||
and easier to create violations more iteratively. In this case, you could simply add to a list of violations, then | ||
create a timeline at the end with `new Violations(violationsList)`, or you could use some helper functions provided by | ||
the `GeneratorConstraint` abstract class instead. | ||
|
||
:::tip | ||
|
||
Because of Kotlin's [extension function concept](https://kotlinlang.org/docs/extensions.html), | ||
the `GeneratorConstraint` class's ergonomics are much more helpful in Kotlin, and only provides a marginal benefit in Java. | ||
|
||
::: | ||
|
||
For example, to violate whenever `MyActivity` occurs when `/my/resource < 0`, you could do the following: | ||
|
||
<Tabs groupId="lang"> | ||
<TabItem value="kt" label="Kotlin"> | ||
|
||
```kotlin | ||
@ConstraintProcedure | ||
class MyConstraint: GeneratorConstraint() { | ||
override fun generate(plan: Plan, simResults: SimulationResults) { | ||
val myResource = simResults.resource("/my/resource", Real.deserialize()).cache() | ||
for (activity in plan.directives("MyActivity")) { | ||
if (myResource.sample(activity.startTime) < 0) | ||
violate(Violation(activity.interval)) | ||
} | ||
} | ||
} | ||
``` | ||
|
||
</TabItem> | ||
<TabItem value="java" label="Java"> | ||
|
||
```java | ||
@ConstraintProcedure | ||
public class MyConstraint extends GeneratorConstraint { | ||
@Override | ||
public void generate(@NotNull Plan plan, @NotNull SimulationResults simResults) { | ||
final var myResource = simResults.resource("/my/resource", Real.deserialize()).cache(); | ||
for (final var activity: plan.directives("MyActivity")) { | ||
if (myResource.sample(activity.startTime) < 0) | ||
violate(Violation(activity.interval)); | ||
} | ||
} | ||
} | ||
``` | ||
|
||
</TabItem> | ||
</Tabs> | ||
|
||
Additionally, the `GeneratorConstraint` class provides some nice extension functions (all beginning with `violate...`) | ||
that you can apply to your timelines, which convert them into violations and automatically submit them. This only works | ||
as shown in Kotlin. You can call these functions in Java, but the syntax isn't any more ergonomic than just calling `violate(...)` | ||
normally. | ||
|
||
```kotlin | ||
@ConstraintProcedure | ||
class BatteryAboveZero: GeneratorConstraint() { | ||
override fun generate(plan: Plan, simResults: SimulationResults) { | ||
simResults.resource("/battery_soc", Real.deserialize()) | ||
.greaterThan(0) | ||
|
||
// Only works in a generator constraint! | ||
// Only works in Kotlin! | ||
.violateOn(false) | ||
} | ||
} | ||
``` | ||
|
||
## Violation Messages | ||
|
||
The `Violation` class contains a `message` field, which will display to the user in the UI. It is `null` by default, | ||
but you have two ways to change it. | ||
|
||
If you want to set different messages for each violation, you can create the `Violation` objects yourself and then pass | ||
each one individually to `violate(...)` in a generator constraint. Or, if you want to set the same message for all | ||
violations, you can override the `message()` function in the `Constraint` interface. To repeat a previous example: | ||
|
||
<Tabs groupId="lang"> | ||
<TabItem value="kt" label="Kotlin"> | ||
|
||
```kotlin | ||
@ConstraintProcedure | ||
class MyConstraint: GeneratorConstraint() { | ||
override fun message() = "MyActivity cannot start when /my/resource < 0" | ||
|
||
override fun generate(plan: Plan, simResults: SimulationResults) { | ||
val myResource = simResults.resource("/my/resource", Real.deserialize()).cache() | ||
for (activity in plan.directives("MyActivity")) { | ||
if (myResource.sample(activity.startTime) < 0) | ||
violate(Violation(activity.interval)) | ||
} | ||
} | ||
} | ||
``` | ||
|
||
</TabItem> | ||
<TabItem value="java" label="Java"> | ||
|
||
```java | ||
@ConstraintProcedure | ||
public class MyConstraint extends GeneratorConstraint { | ||
@Override | ||
public String message() { | ||
return "MyActivity cannot start when /my/resource < 0"; | ||
} | ||
|
||
@Override | ||
public void generate(@NotNull Plan plan, @NotNull SimulationResults simResults) { | ||
final var myResource = simResults.resource("/my/resource", Real.deserialize()).cache(); | ||
for (final var activity: plan.directives("MyActivity")) { | ||
if (myResource.sample(activity.startTime) < 0) | ||
violate(Violation(activity.interval)); | ||
} | ||
} | ||
} | ||
``` | ||
|
||
</TabItem> | ||
</Tabs> |
27 changes: 27 additions & 0 deletions
27
docs/scheduling-and-constraints/procedural/getting-started.mdx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
# Getting Started | ||
|
||
Currently only scheduling procedures are supported, not constraint procedures. | ||
|
||
## Create a project from the template | ||
|
||
We have created a template repository for your mission model and scheduling procedures [here](https://github.com/NASA-AMMOS/aerie-mission-model-template). | ||
If you don't already have a mission model project, you can just copy that template and follow the instructions. | ||
If you do, you can follow these steps to add a place for your procedures: | ||
|
||
1. Move your mission model code into a gradle subproject if it isn't already. | ||
2. Create a `scheduling` subproject. | ||
3. Copy the `build.gradle` from the `scheduling` subproject of the [mission model template repo](https://github.com/NASA-AMMOS/aerie-mission-model-template). | ||
4. You can now create procedures in a java package in the `scheduling` subproject, as long as the package path ends in `procedures`. | ||
(i.e. `src/main/java/myorg/mymission/procedures`) | ||
|
||
## Compiling | ||
|
||
It is a two-part process to build your scheduling jars. | ||
1. Run `./gradlew :scheduling:compileJava` (or any command that delegates to it, such as `:scheduling:build` or a top-level `build`). | ||
2. Run `./gradlew :scheduling:buildAllSchedulingProcedureJars`. This produces the jar artifacts for each procedure. | ||
|
||
There should now be one jar for each scheduling procedure, at `scheduling/build/libs/<OriginalSourceCodeFileName>.jar`. | ||
|
||
## Creating a Goal | ||
|
||
See the examples in the mission model template repo, or see [the scheduling page](../scheduling) in this section. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
# Procedural Scheduling & Constraints | ||
|
||
Aerie allows users to write custom JVM procedures to check constraints or schedule new activities with complete freedom. | ||
Most users will choose to use Java, but since the libraries are written in Kotlin, they | ||
provide some quality-of-life improvements and syntactic sugar for those using Kotlin. Additionally, Kotlin's more intelligent | ||
type inference, null-safety, and currying syntax make writing peripheral procedures a more seamless experience, although | ||
the API is intended to work well with Java too. |
3 changes: 3 additions & 0 deletions
3
docs/scheduling-and-constraints/procedural/parameterization.mdx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
# Parameterization | ||
|
||
TODO @mattdailis |
Oops, something went wrong.