Skip to content

Commit

Permalink
put in some ordered lists
Browse files Browse the repository at this point in the history 
this is in response to orppst/pst-gui#84
  • Loading branch information
@pahjbo
pahjbo committed Dec 21, 2023
1 parent 31bf24a commit 4382790
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 20 deletions.
5 changes: 3 additions & 2 deletions src/main/vo-dml/proposalManagement.vo-dml.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
<name>proposalManagement</name>
<description>The data model for managing the proposal review process. Intended to work for phase 1</description>
<uri/>
<title>TBD</title>
<title></title>
<author>Paul Harrison</author>
<version>0.3</version>
<lastModified>2023-12-19T11:40:41Z</lastModified>
<lastModified>2023-12-19T15:37:41Z</lastModified>
<import>
<name>null</name><!--should not be needed in modern vo-dml -->
<url>IVOA-v1.0.vo-dml.xml</url>
Expand Down Expand Up @@ -524,6 +524,7 @@
<minOccurs>0</minOccurs>
<maxOccurs>-1</maxOccurs>
</multiplicity>
<isOrdered>true</isOrdered>
</composition>
</objectType>
<objectType>
Expand Down
29 changes: 18 additions & 11 deletions src/main/vo-dml/proposaldm.vo-dml.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
proposal to be reviewed and allocated time. It does not cover all the technical detail of instrument setup that would be needed to actually schedule the
observations, although the intention is that information about targets etc. could be automatically transferred to an observing system.</description>
<uri/>
<title>TBD</title>
<title></title>
<author>Paul Harrison</author>
<version>0.3</version>
<lastModified>2023-12-15T17:37:21Z</lastModified>
<lastModified>2023-12-19T15:33:40Z</lastModified>
<import>
<name>null</name><!--should not be needed in modern vo-dml -->
<url>IVOA-v1.0.vo-dml.xml</url>
Expand All @@ -24,9 +24,12 @@
<documentationURL>not known</documentationURL>
</import>
<primitiveType>
<vodml-id>WikiDataId</vodml-id>
<name>WikiDataId</name>
<description>a WikiData identifier</description>
<vodml-id>WikiDataId</vodml-id>
<name>WikiDataId</name>
<description>a WikiData identifier</description>
<extends>
<vodml-ref>ivoa:stringIdentifier</vodml-ref>
</extends>
</primitiveType>
<enumeration>
<vodml-id>ProposalKind</vodml-id>
Expand Down Expand Up @@ -302,6 +305,7 @@
<minOccurs>1</minOccurs>
<maxOccurs>-1</maxOccurs>
</multiplicity>
<isOrdered>true</isOrdered>
</composition>
</objectType>
<objectType>
Expand Down Expand Up @@ -859,7 +863,7 @@
</multiplicity>
</attribute>
</objectType>
<objectType abstract='true'>
<objectType abstract="true">
<vodml-id>Target</vodml-id>
<name>Target</name>
<description>A target source</description>
Expand Down Expand Up @@ -964,7 +968,7 @@
<vodml-ref>proposal:Target</vodml-ref>
</extends>
</objectType>
<objectType abstract='true'>
<objectType abstract="true">
<vodml-id>Field</vodml-id>
<name>Field</name>
<description>Definition of an observing field pointing</description>
Expand Down Expand Up @@ -1073,12 +1077,12 @@
</multiplicity>
</attribute>
</objectType>
<objectType abstract='true'>
<objectType abstract="true">
<vodml-id>ObservingConstraint</vodml-id>
<name>ObservingConstraint</name>
<description>a form of constraint on the observation</description>
</objectType>
<objectType abstract='true'>
<objectType abstract="true">
<vodml-id>TimingConstraint</vodml-id>
<name>TimingConstraint</name>
<description>Any specific timing requirements for the observing</description>
Expand Down Expand Up @@ -1150,7 +1154,7 @@
<vodml-ref>proposal:TimingConstraint</vodml-ref>
</extends>
</objectType>
<objectType abstract='true'>
<objectType abstract="true">
<vodml-id>PointingConstaint</vodml-id>
<name>PointingConstaint</name>
<description>A constraint that limits the telescope pointing</description>
Expand Down Expand Up @@ -1185,6 +1189,7 @@
<minOccurs>0</minOccurs>
<maxOccurs>-1</maxOccurs>
</multiplicity>
<isOrdered>true</isOrdered>
</composition>
</objectType>
<objectType>
Expand Down Expand Up @@ -1370,7 +1375,7 @@
</multiplicity>
</attribute>
</objectType>
<objectType abstract='true'>
<objectType abstract="true">
<vodml-id>Observation</vodml-id>
<name>Observation</name>
<description></description>
Expand All @@ -1385,6 +1390,7 @@
<minOccurs>0</minOccurs>
<maxOccurs>-1</maxOccurs>
</multiplicity>
<isOrdered>true</isOrdered>
</composition>
<reference>
<vodml-id>Observation.target</vodml-id>
Expand Down Expand Up @@ -1478,6 +1484,7 @@
<minOccurs>1</minOccurs>
<maxOccurs>-1</maxOccurs>
</multiplicity>
<isOrdered>true</isOrdered>
</composition>
</objectType>
</vo-dml:model>
2 changes: 1 addition & 1 deletion src/main/vodsl/proposalManagement.vodsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ otype ProposalCycle "Defines collection of resources and proposals for a particu
}

otype AvailableResources "The list of resources that are available" {
resources : Resource @* as composition ""; // TODO need to ensure that each resource type can occur only once.
resources : Resource @* as ordered composition ""; // TODO need to ensure that each resource type can occur only once.
}


Expand Down
12 changes: 6 additions & 6 deletions src/main/vodsl/proposaldm.vodsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ observations, although the intention is that information about targets etc. coul
investigators: Investigator @+ as composition "the person(s) making the proposal";
kind : ProposalKind "the type of proposal";
relatedProposals: RelatedProposal @* as composition "";
supportingDocuments: SupportingDocument @* as composition "any additional documents";
supportingDocuments: SupportingDocument @* as ordered composition "any additional documents";
targets: Target @+ as composition "the targets of the proposal";
fields: Field @+ as composition "the fields observed in the proposal";
technicalGoals: TechnicalGoal @+ as composition "the technical goals of the proposal";
observations : Observation @+ as composition "the proposed observations";
technicalGoals: TechnicalGoal @+ as ordered composition "the technical goals of the proposal";
observations : Observation @+ as ordered composition "the proposed observations";
submitted: ivoa:boolean @? "whether the proposal is submitted"; //note that submitted proposals are not expected to be editable.. made optional to allow for not setting for not submitted proposals
}

Expand Down Expand Up @@ -231,7 +231,7 @@ observations, although the intention is that information about targets etc. coul
otype ScienceSpectralWindow "A spectral window for science use."
{
spectralWindowSetup: SpectralWindowSetup @? as composition "" ;
expectedSpectralLine: ExpectedSpectralLine @* as composition "" ;
expectedSpectralLine: ExpectedSpectralLine @* as ordered composition "" ;
}

otype SpectralWindowSetup "Science oriented definition of a spectral window."
Expand Down Expand Up @@ -266,7 +266,7 @@ observations, although the intention is that information about targets etc. coul
target references Target "The actual target of the observation";
field references Field "The Field for the observation";
technicalGoal references TechnicalGoal "The technical goals of the observation";
constraints: ObservingConstraint @* as composition "any constraints on the observation";
constraints: ObservingConstraint @* as ordered composition "any constraints on the observation";
}

otype TargetObservation -> Observation "an observation of the scientific target "{
Expand All @@ -291,7 +291,7 @@ Delay ""
//REQ define technical aspects in science terms
otype TechnicalGoal "collects together the technical goals of the proposal" {
performance : PerformanceParameters as composition "";
spectrum: ScienceSpectralWindow @+ as composition "";
spectrum: ScienceSpectralWindow @+ as ordered composition "";

}

0 comments on commit 4382790

Please sign in to comment.