diff --git a/README.md b/README.md
index 3ab1877..e5ef9bb 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ The model is described in more detail [here](https://ivoa.github.io/ProposalDM/)
-The IVOA standard in development is a Working Draft at version 0.3 and a
+The IVOA standard in development is a Working Draft at version 0.4 and a
[](../../releases/download/auto-pdf-preview/ProposalDM-draft.pdf)
is automatically produced from this repository when changes are made.
diff --git a/build.gradle.kts b/build.gradle.kts
index 9d6999b..59ee856 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
}
group = "org.javastro.ivoa.dm"
-version = "0.4.1-SNAPSHOT"
+version = "0.4.2-SNAPSHOT"
vodml {
diff --git a/src/main/vo-dml/proposalManagement.vo-dml.xml b/src/main/vo-dml/proposalManagement.vo-dml.xml
index a86ea52..eb9ef7a 100644
--- a/src/main/vo-dml/proposalManagement.vo-dml.xml
+++ b/src/main/vo-dml/proposalManagement.vo-dml.xml
@@ -9,7 +9,7 @@
Paul Harrison
0.4
- 2024-04-26T17:38:33Z
+ 2024-05-24T14:21:25Z
null
IVOA-v1.0.vo-dml.xml
@@ -174,18 +174,6 @@
-1
-
- ProposalCycle.reviewedProposals
- reviewedProposals
- the proposals that have been reviewed in this cycle
-
- proposalManagement:ReviewedProposal
-
-
- 0
- -1
-
-
ProposalCycle.allocatedProposals
allocatedProposals
@@ -290,25 +278,8 @@
1
-
- SubmittedProposal.proposal
- proposal
- the proposal that was submitted
-
- proposal:ObservingProposal
-
-
- 1
- 1
-
-
-
-
- ReviewedProposal
- ReviewedProposal
- an instance of a proposal that is in review
- ReviewedProposal.successful
+ SubmittedProposal.successful
successful
the proposal can go on to allocation
@@ -320,7 +291,7 @@
- ReviewedProposal.reviewsCompleteDate
+ SubmittedProposal.reviewsCompleteDate
reviewsCompleteDate
the date when all the proposals are due
@@ -331,24 +302,12 @@
1
-
- ReviewedProposal.reviews
- reviews
- the reviews
-
- proposalManagement:ProposalReview
-
-
- 1
- -1
-
-
- ReviewedProposal.submitted
- submitted
-
+ SubmittedProposal.proposal
+ proposal
+ the proposal that was submitted
- proposalManagement:SubmittedProposal
+ proposal:ObservingProposal
1
@@ -438,6 +397,18 @@
1
+
+ ProposalReview.proposal
+ proposal
+ the submitted proposal
+
+ proposalManagement:SubmittedProposal
+
+
+ 1
+ 1
+
+
ProposalReview.reviewer
reviewer
diff --git a/src/main/vodsl/proposalManagement.vodsl b/src/main/vodsl/proposalManagement.vodsl
index fa3216b..66e405f 100644
--- a/src/main/vodsl/proposalManagement.vodsl
+++ b/src/main/vodsl/proposalManagement.vodsl
@@ -25,7 +25,6 @@ otype ProposalCycle "Defines collection of resources and proposals for a particu
possibleGrades : AllocationGrade @+ as composition "The possible grades that can be allocated for this cycle";
tac : TAC as composition "The time allocation committee";
submittedProposals : SubmittedProposal @* as composition "the proposals that have been submitted in this cycle";
- reviewedProposals : ReviewedProposal @* as composition "the proposals that have been reviewed in this cycle";
allocatedProposals : AllocatedProposal @* as composition "the proposals that have been successful and allocated time";
}
@@ -56,15 +55,10 @@ otype ProposalCycle "Defines collection of resources and proposals for a particu
otype SubmittedProposal "an instance of a proposal that has been submitted" {
proposal references proposal:ObservingProposal "the proposal that was submitted"; //note although this is a reference, the proposal is "frozen" when submitted.
submissionDate : ivoa:datetime "the date that the proposal was submitted";
- }
-
- otype ReviewedProposal "an instance of a proposal that is in review" {
-// cycle references ProposalCycle ""; //IMPL does not necessarily need this back reference as owned by the cycle - might be possible to put in automatically with tooling...
- submitted references SubmittedProposal "";
- reviews : ProposalReview @+ as composition "the reviews";
successful : ivoa:boolean "the proposal can go on to allocation";
reviewsCompleteDate : ivoa:datetime "the date when all the proposals are due";
- }
+ }
+
otype AllocatedProposal "an instance of a proposal that is allocated observing time" {
submitted references SubmittedProposal "the proposal";
@@ -72,6 +66,7 @@ otype ProposalCycle "Defines collection of resources and proposals for a particu
}
otype ProposalReview "A review of a proposal" {
+ proposal references SubmittedProposal "the submitted proposal";
reviewer references Reviewer "the reviewer making this review";
comment: ivoa:string "Description";
score : ivoa:real "the review score";
diff --git a/src/test/java/org/ivoa/dm/proposal/prop/EmerlinExample.java b/src/test/java/org/ivoa/dm/proposal/prop/EmerlinExample.java
index c44034f..0b75cac 100644
--- a/src/test/java/org/ivoa/dm/proposal/prop/EmerlinExample.java
+++ b/src/test/java/org/ivoa/dm/proposal/prop/EmerlinExample.java
@@ -173,26 +173,21 @@ public EmerlinExample () {
}
));
// "submit" proposal
- final SubmittedProposal submittedProposal = new SubmittedProposal( new GregorianCalendar(2022, 3, 14).getTime(), proposal);
+ final SubmittedProposal submittedProposal = new SubmittedProposal( new GregorianCalendar(2022, 3, 14).getTime(), false, new GregorianCalendar(2022, 4, 30).getTime(), proposal);
cycle.setSubmittedProposals(
Arrays.asList(submittedProposal));
// "review" proposal
-
- cycle.setReviewedProposals(Arrays.asList(ReviewedProposal.createReviewedProposal(r -> {
- r.submitted = submittedProposal;
- r.reviewsCompleteDate = new GregorianCalendar(2022, 4, 14).getTime();
- r.successful = true;
- r.reviews = Arrays.asList(ProposalReview.createProposalReview(pr -> {
+ ProposalReview review = ProposalReview.createProposalReview(pr -> {
pr.comment = "it is good";
pr.score = 10.0;
pr.reviewer = new Reviewer(people[4]);
pr.technicalFeasibility = true;
pr.reviewDate = new GregorianCalendar(2022, 4, 14).getTime();
- }));
- })
- ));
-
+ });
+
+ // set that the submitted proposal is ok to be allocated.
+ submittedProposal.setSuccessful(true);
// "allocate" proposal
diff --git a/std/Makefile b/std/Makefile
index 60aa296..9884d9d 100644
--- a/std/Makefile
+++ b/std/Makefile
@@ -4,7 +4,7 @@
DOCNAME = ProposalDM
# count up; you probably do not want to bother with versions <1.0
-DOCVERSION = 0.3
+DOCVERSION = 0.4
# Publication date, ISO format; update manually for "releases"
DOCDATE = ???