Skip to content

Commit

Permalink
Fix package.xml and add conda env
Browse files Browse the repository at this point in the history
  • Loading branch information
katieb1 committed Aug 25, 2023
1 parent b255db7 commit 8b1b2a6
Show file tree
Hide file tree
Showing 2 changed files with 109 additions and 218 deletions.
Binary file added src/helloworld.yml
Binary file not shown.
327 changes: 109 additions & 218 deletions src/package.xml
Original file line number Diff line number Diff line change
@@ -1,220 +1,111 @@
<?xml version="1.0" encoding="utf-8"?>
<package name="helloworldConda" displayName="Example demonstrating how to create a package with Conda environments" version="1.0.1" url="https://apexrms.github.io/helloworldEnhanced/">
<transformers>

<!--Primary Transformer-->
<transformer
name="Primary"
isPrimary="True"
programName="Rscript"
programArguments="model.R"
condaEnv="rsyncrosim.yml"
isRunnable="True">

<!--Chart Transformer-->
<include>
<transformer name="corestime_Runtime"/>
<transformer name="firstModel"/>
<transformer name="secondModel"/>
</include>

<datafeeds>
<!--Run Control-->
<datafeed name="RunControl" displayName="Run Control" dataScope="Scenario">
<datasheets>
<datasheet name="RunControl" displayName="Run Control" isSingleRow="True">
<columns>
<column name="RunControlID" dataType="Integer" isPrimary="True"/>
<column name="ScenarioID" dataType="Integer"/>
<column
name="MinimumIteration"
displayName="Minimum Iteration"
dataType="Integer"
defaultValue="1"
validationType="WholeNumber"
validationCondition="GreaterEqual"
formula1="1"
isVisible="False"/>
<column
name="MaximumIteration"
displayName="Number of Iterations"
dataType="Integer"
defaultValue="5"
validationType="WholeNumber"
validationCondition="GreaterEqual"
formula1="1"/>
<column
name="MinimumTimestep"
displayName="Minimum Timestep"
dataType="Integer"
defaultValue="0"
validationType="WholeNumber"
validationCondition="GreaterEqual"
formula1="0"/>
<column
name="MaximumTimestep"
displayName="Maximum Timestep"
dataType="Integer"
defaultValue="10"
validationType="WholeNumber"
validationCondition="GreaterEqual"
formula1="0"/>
</columns>
</datasheet>
</datasheets>
</datafeed>


<!--First Model Inputs-->
<datafeed name="InputDatafeed" displayName="Inputs" dataScope="Scenario">
<datasheets>
<datasheet name="InputDatasheet" isSingleRow="True">
<columns>
<column name="InputDatasheetID" dataType="Integer" isPrimary="True"/>
<column name="ScenarioID" dataType="Integer"/>
<column name="mMean" dataType="Double" displayName="Slope Distribution Mean"/>
<column
name="mSD"
dataType="Double"
displayName="Slope Distribution Standard Deviation"/>
<column
name="InterceptRasterFile"
displayName="Intercept Raster File"
dataType="String"
isExternalFile="True"
isRaster="True"/>
</columns>
</datasheet>
</datasheets>
</datafeed>

<!--First Model Outputs / Second Model Inputs-->
<datafeed
name="IntermediateDatafeed"
displayName="Intermediate Outputs"
dataScope="Scenario">
<datasheets>
<datasheet name="IntermediateDatasheet">
<columns>
<column
name="IntermediateDatasheetID"
dataType="Integer"
isPrimary="True"/>
<column name="ScenarioID" dataType="Integer"/>
<column name="Iteration" dataType="Integer"/>
<column name="Timestep" dataType="Integer" displayName="Timestep"/>
<column name="y" dataType="Double" displayName="Value for y"/>
<column
name="OutputRasterFile"
displayName="Output Raster File"
dataType="String"
isExternalFile="True"
isRaster="True"
bandColumn="Band"/>
<column
name="Band"
displayName="Band"
dataType="Integer"
allowDbNull="True"
isOptional="True"/>
</columns>
</datasheet>
</datasheets>
</datafeed>

<!--Second Model Output-->
<datafeed name="OutputDatafeed" displayName="Outputs" dataScope="Scenario">
<datasheets>
<datasheet name="OutputDatasheet">
<columns>
<column name="OutputDatasheetID" dataType="Integer" isPrimary="True"/>
<column name="ScenarioID" dataType="Integer"/>
<column name="Iteration" dataType="Integer"/>
<column name="Timestep" dataType="Integer" displayName="Timestep"/>
<column name="yCum" dataType="Double" displayName="Cumulative y"/>
</columns>
</datasheet>
</datasheets>
</datafeed>
</datafeeds>
</transformer>

<!--First Transformer-->
<transformer
name="firstModel"
displayName="First Model"
isRunnable="True"
programName="Rscript"
programArguments="model.R"
configurationSheet="RunControl">
<pipeline>
<datafeed name="RunControl" type="Input"/>
<datafeed name="InputDatafeed" type="Input"/>
<datafeed name="IntermediateDatafeed" type="Output"/>
</pipeline>
</transformer>

<!--Second Transformer-->
<transformer
name="secondModel"
displayName="Second Model"
isRunnable="True"
programName="Rscript"
programArguments="model2.R"
configurationSheet="RunControl">
<pipeline>
<datafeed name="RunControl" type="Input"/>
<datafeed name="IntermediateDatafeed" type="Input"/>
<datafeed name="OutputDatafeed" type="Output"/>
</pipeline>
</transformer>

</transformers>
<layouts>

<!--Results Transformer Layout-->
<layout name="coreforms_ResultTransformers">
<item name="corestime_ChartTransformer"/>
<item name="corestime_MapTransformer"/>
</layout>

<!--Library Datafeeds Layout-->
<layout name="coreforms_LibraryDatafeeds">
<group name="Options">
<item name="core_Rconfig"/>
<item name="core_Options" displayName="General"/>
</group>
</layout>

<!--Scenario Datafeeds Layout-->
<layout name="coreforms_ScenarioDatafeeds">
<group name="RunControl" displayName="Run Control">
<item name="RunControl" displayName="General"/>
<item name="core_Pipeline"/>
</group>
<item name="InputDatafeed"/>
<item name="IntermediateDatafeed"/>
<item name="OutputDatafeed"/>
</layout>

<!--Charts Layout-->
<layout name="corestimeforms_Charts" configurationSheet="RunControl">
<item name="y" displayName="y" dataSheet="IntermediateDatasheet" column="y"/>
<item
name="yCum"
displayName="Cumulative y"
dataSheet="OutputDatasheet"
column="yCum"/>
</layout>

<!--Maps Layout-->
<layout name="corestimeforms_Maps" configurationSheet="RunControl">
<item
name="RasterMap"
displayName="Output Raster Map"
dataSheet="IntermediateDatasheet"
column="OutputRasterFile"/>
</layout>

</layouts>
<package name="helloworldConda" displayName="Example demonstrating how to create a package with Conda environments" version="1.0.7" url="https://apexrms.github.io/helloworldEnhanced/">
<transformers>
<transformer name="Primary" isPrimary="True">
<include>
<transformer name="corestime_Runtime"/>
<transformer name="firstModel"/>
<transformer name="secondModel"/>
</include>
<datafeeds>
<datafeed name="RunControl" displayName="Run Control" dataScope="Scenario">
<datasheets>
<datasheet name="RunControl" displayName="Run Control" isSingleRow="True">
<columns>
<column name="RunControlID" dataType="Integer" isPrimary="True"/>
<column name="ScenarioID" dataType="Integer"/>
<column name="MinimumIteration" displayName="Minimum Iteration" dataType="Integer" defaultValue="1" validationType="WholeNumber" validationCondition="GreaterEqual" formula1="1" isVisible="False"/>
<column name="MaximumIteration" displayName="Number of Iterations" dataType="Integer" defaultValue="5" validationType="WholeNumber" validationCondition="GreaterEqual" formula1="1"/>
<column name="MinimumTimestep" displayName="Minimum Timestep" dataType="Integer" defaultValue="0" validationType="WholeNumber" validationCondition="GreaterEqual" formula1="0"/>
<column name="MaximumTimestep" displayName="Maximum Timestep" dataType="Integer" defaultValue="10" validationType="WholeNumber" validationCondition="GreaterEqual" formula1="0"/>
</columns>
</datasheet>
</datasheets>
</datafeed>
<datafeed name="InputDatafeed" displayName="Inputs" dataScope="Scenario">
<datasheets>
<datasheet name="InputDatasheet" isSingleRow="True">
<columns>
<column name="InputDatasheetID" dataType="Integer" isPrimary="True"/>
<column name="ScenarioID" dataType="Integer"/>
<column name="mMean" dataType="Double" displayName="Slope Distribution Mean"/>
<column name="mSD" dataType="Double" displayName="Slope Distribution Standard Deviation"/>
<column name="InterceptRasterFile" displayName="Intercept Raster File" dataType="String" isExternalFile="True" isRaster="True"/>
</columns>
</datasheet>
</datasheets>
</datafeed>
<datafeed name="IntermediateDatafeed" displayName="Intermediate Outputs" dataScope="Scenario">
<datasheets>
<datasheet name="IntermediateDatasheet">
<columns>
<column name="IntermediateDatasheetID" dataType="Integer" isPrimary="True"/>
<column name="ScenarioID" dataType="Integer"/>
<column name="Iteration" dataType="Integer"/>
<column name="Timestep" dataType="Integer" displayName="Timestep"/>
<column name="y" dataType="Double" displayName="Value for y"/>
<column name="OutputRasterFile" displayName="Output Raster File" dataType="String" isExternalFile="True" isRaster="True" bandColumn="Band"/>
<column name="Band" displayName="Band" dataType="Integer" allowDbNull="True" isOptional="True"/>
</columns>
</datasheet>
</datasheets>
</datafeed>
<datafeed name="OutputDatafeed" displayName="Outputs" dataScope="Scenario">
<datasheets>
<datasheet name="OutputDatasheet">
<columns>
<column name="OutputDatasheetID" dataType="Integer" isPrimary="True"/>
<column name="ScenarioID" dataType="Integer"/>
<column name="Iteration" dataType="Integer"/>
<column name="Timestep" dataType="Integer" displayName="Timestep"/>
<column name="yCum" dataType="Double" displayName="Cumulative y"/>
</columns>
</datasheet>
</datasheets>
</datafeed>
</datafeeds>
</transformer>
<transformer name="firstModel" displayName="First Model" isRunnable="True" programName="Rscript" programArguments="model.R" configurationSheet="RunControl" condaEnv="helloworld.yml">
<pipeline>
<datafeed name="RunControl" type="Input"/>
<datafeed name="InputDatafeed" type="Input"/>
<datafeed name="IntermediateDatafeed" type="Output"/>
</pipeline>
</transformer>
<transformer name="secondModel" displayName="Second Model" isRunnable="True" programName="Rscript" programArguments="model2.R" configurationSheet="RunControl" condaEnv="helloworld.yml">
<pipeline>
<datafeed name="RunControl" type="Input"/>
<datafeed name="IntermediateDatafeed" type="Input"/>
<datafeed name="OutputDatafeed" type="Output"/>
</pipeline>
</transformer>
</transformers>
<layouts>
<layout name="coreforms_ResultTransformers">
<item name="corestime_ChartTransformer"/>
<item name="corestime_MapTransformer"/>
</layout>
<layout name="coreforms_LibraryDatafeeds">
<group name="Options">
<item name="core_Rconfig"/>
<item name="core_Options" displayName="General"/>
</group>
</layout>
<layout name="coreforms_ScenarioDatafeeds">
<group name="RunControl" displayName="Run Control">
<item name="RunControl" displayName="General"/>
<item name="core_Pipeline"/>
</group>
<item name="InputDatafeed"/>
<item name="IntermediateDatafeed"/>
<item name="OutputDatafeed"/>
</layout>
<layout name="corestimeforms_Charts" configurationSheet="RunControl">
<item name="y" displayName="y" dataSheet="IntermediateDatasheet" column="y"/>
<item name="yCum" displayName="Cumulative y" dataSheet="OutputDatasheet" column="yCum"/>
</layout>
<layout name="corestimeforms_Maps" configurationSheet="RunControl">
<item name="RasterMap" displayName="Output Raster Map" dataSheet="IntermediateDatasheet" column="OutputRasterFile"/>
</layout>
</layouts>
</package>

0 comments on commit 8b1b2a6

Please sign in to comment.