[kepler-code] r28808 - trunk/modules/science-pipes/workflows/dev
barseghian at ecoinformatics.org
barseghian at ecoinformatics.org
Mon Oct 17 19:17:25 PDT 2011
Author: barseghian
Date: 2011-10-17 19:17:25 -0700 (Mon, 17 Oct 2011)
New Revision: 28808
Modified:
trunk/modules/science-pipes/workflows/dev/survivorship_actors_test.xml
Log:
include survivorship date range filter actor
Modified: trunk/modules/science-pipes/workflows/dev/survivorship_actors_test.xml
===================================================================
--- trunk/modules/science-pipes/workflows/dev/survivorship_actors_test.xml 2011-10-18 02:16:42 UTC (rev 28807)
+++ trunk/modules/science-pipes/workflows/dev/survivorship_actors_test.xml 2011-10-18 02:17:25 UTC (rev 28808)
@@ -7,14 +7,14 @@
<property name="SDFDirector" class="ptolemy.domains.sdf.kernel.SDFDirector">
<property name="iterations" class="ptolemy.data.expr.Parameter" value="1">
</property>
- <property name="_location" class="ptolemy.kernel.util.Location" value="{35.0, 65.0}">
+ <property name="_location" class="ptolemy.kernel.util.Location" value="[-50.0, -15.0]">
</property>
</property>
<property name="_windowProperties" class="ptolemy.actor.gui.WindowPropertiesAttribute" value="{bounds={257, 22, 883, 806}, maximized=false}">
</property>
<property name="_vergilSize" class="ptolemy.actor.gui.SizeAttribute" value="[600, 681]">
</property>
- <property name="_vergilZoomFactor" class="ptolemy.data.expr.ExpertParameter" value="1.0">
+ <property name="_vergilZoomFactor" class="ptolemy.data.expr.ExpertParameter" value="0.8">
</property>
<property name="_vergilCenter" class="ptolemy.data.expr.ExpertParameter" value="{300.0, 340.5}">
</property>
@@ -23,15 +23,15 @@
</property>
<property name="_paneSize" class="ptolemy.actor.gui.SizeAttribute" value="[1189, 498]">
</property>
- <property name="_location" class="ptolemy.kernel.util.Location" value="[355.0, 525.0]">
+ <property name="_location" class="ptolemy.kernel.util.Location" value="[430.0, 535.0]">
</property>
</entity>
<entity name="Display2" class="ptolemy.actor.lib.gui.Display">
- <property name="_windowProperties" class="ptolemy.actor.gui.WindowPropertiesAttribute" value="{bounds={66, 22, 1189, 542}, maximized=false}">
+ <property name="_windowProperties" class="ptolemy.actor.gui.WindowPropertiesAttribute" value="{bounds={69, 238, 1189, 542}, maximized=false}">
</property>
<property name="_paneSize" class="ptolemy.actor.gui.SizeAttribute" value="[1189, 498]">
</property>
- <property name="_location" class="ptolemy.kernel.util.Location" value="[315.0, 270.0]">
+ <property name="_location" class="ptolemy.kernel.util.Location" value="[425.0, 300.0]">
</property>
</entity>
<entity name="Life Table Display" class="ptolemy.actor.lib.gui.Display">
@@ -39,37 +39,63 @@
</property>
<property name="_paneSize" class="ptolemy.actor.gui.SizeAttribute" value="[1189, 498]">
</property>
- <property name="_location" class="ptolemy.kernel.util.Location" value="[376.5703125, 119.96875]">
+ <property name="_location" class="ptolemy.kernel.util.Location" value="[460.0, 75.0]">
</property>
</entity>
<entity name="SurvivalCurveCalc" class="edu.cornell.birds.is.bap.actor.survivorship.SurvivalCurveCalc">
- <property name="_location" class="ptolemy.kernel.util.Location" value="[45.0, 255.0]">
+ <property name="_location" class="ptolemy.kernel.util.Location" value="[210.0, 295.0]">
</property>
</entity>
<entity name="SurvivalCurvePlot" class="edu.cornell.birds.is.bap.actor.survivorship.SurvivalCurvePlot">
- <property name="_location" class="ptolemy.kernel.util.Location" value="[180.0, 535.0]">
+ <property name="_location" class="ptolemy.kernel.util.Location" value="[260.0, 540.0]">
</property>
</entity>
<entity name="LifeTable" class="edu.cornell.birds.is.bap.actor.survivorship.LifeTable">
- <property name="_location" class="ptolemy.kernel.util.Location" value="[220.0, 115.0]">
+ <property name="_location" class="ptolemy.kernel.util.Location" value="[295.0, 125.0]">
</property>
</entity>
<entity name="SurvivorshipDataActor" class="edu.cornell.birds.is.bap.actor.survivorship.SurvivorshipDataActor">
+ <property name="cemeterySearchText" class="edu.cornell.birds.is.bap.ptolemy.StringChoiceParameter" value="Forty Fort Cemetery">
+<display name="Cemetery Search Text"/> </property>
<property name="_location" class="ptolemy.kernel.util.Location" value="[15.0, 365.0]">
</property>
</entity>
<entity name="ImageDisplay" class="ptolemy.actor.lib.image.ImageDisplay">
- <property name="_windowProperties" class="ptolemy.actor.gui.WindowPropertiesAttribute" value="{bounds={656, 428, 128, 44}, maximized=false}">
+ <property name="_windowProperties" class="ptolemy.actor.gui.WindowPropertiesAttribute" value="{bounds={112, 22, 700, 544}, maximized=false}">
</property>
- <property name="_pictureSize" class="ptolemy.actor.gui.SizeAttribute" value="[128, 0]">
+ <property name="_pictureSize" class="ptolemy.actor.gui.SizeAttribute" value="[700, 500]">
</property>
- <property name="_location" class="ptolemy.kernel.util.Location" value="[350.0, 410.0]">
+ <property name="_location" class="ptolemy.kernel.util.Location" value="[390.0, 410.0]">
</property>
</entity>
+ <entity name="SurvivorshipDateRangeFilter" class="edu.cornell.birds.is.bap.actor.survivorship.SurvivorshipDateRangeFilter">
+ <property name="fromYear" class="ptolemy.data.expr.StringParameter" value="1900">
+<display name="from year (YYYY)"/> </property>
+ <property name="toYear" class="ptolemy.data.expr.StringParameter" value="1990">
+<display name="to year (YYYY)"/> </property>
+ <property name="_location" class="ptolemy.kernel.util.Location" value="[-45.0, 180.0]">
+ </property>
+ </entity>
+ <entity name="ImageDisplay2" class="ptolemy.actor.lib.image.ImageDisplay">
+ <property name="_windowProperties" class="ptolemy.actor.gui.WindowPropertiesAttribute" value="{bounds={655, 236, 700, 544}, maximized=false}">
+ </property>
+ <property name="_pictureSize" class="ptolemy.actor.gui.SizeAttribute" value="[700, 500]">
+ </property>
+ <property name="_location" class="ptolemy.kernel.util.Location" value="[305.0, -5.0]">
+ </property>
+ </entity>
+ <entity name="SurvivalCurvePlot2" class="edu.cornell.birds.is.bap.actor.survivorship.SurvivalCurvePlot">
+ <property name="_location" class="ptolemy.kernel.util.Location" value="[155.0, 105.0]">
+ </property>
+ </entity>
+ <entity name="SurvivalCurveCalc2" class="edu.cornell.birds.is.bap.actor.survivorship.SurvivalCurveCalc">
+ <property name="_location" class="ptolemy.kernel.util.Location" value="[30.0, 75.0]">
+ </property>
+ </entity>
<relation name="relation6" class="ptolemy.actor.TypedIORelation">
<property name="width" class="ptolemy.data.expr.Parameter" value="1">
</property>
- <vertex name="vertex1" value="[225.0, 210.0]">
+ <vertex name="vertex1" value="[320.0, 345.0]">
</vertex>
</relation>
<relation name="relation" class="ptolemy.actor.TypedIORelation">
@@ -80,19 +106,39 @@
<property name="width" class="ptolemy.data.expr.Parameter" value="1">
</property>
</relation>
+ <relation name="relation3" class="ptolemy.actor.TypedIORelation">
+ <property name="width" class="ptolemy.data.expr.Parameter" value="1">
+ </property>
+ </relation>
<relation name="relation2" class="ptolemy.actor.TypedIORelation">
<property name="width" class="ptolemy.data.expr.Parameter" value="1">
</property>
</relation>
+ <relation name="relation7" class="ptolemy.actor.TypedIORelation">
+ <property name="width" class="ptolemy.data.expr.Parameter" value="1">
+ </property>
+ <vertex name="vertex1" value="[115.0, 325.0]">
+ </vertex>
+ </relation>
+ <relation name="relation10" class="ptolemy.actor.TypedIORelation">
+ <property name="width" class="ptolemy.data.expr.Parameter" value="1">
+ </property>
+ </relation>
+ <relation name="relation11" class="ptolemy.actor.TypedIORelation">
+ <property name="width" class="ptolemy.data.expr.Parameter" value="1">
+ </property>
+ </relation>
<relation name="relation8" class="ptolemy.actor.TypedIORelation">
<property name="width" class="ptolemy.data.expr.Parameter" value="1">
</property>
</relation>
- <relation name="relation5" class="ptolemy.actor.TypedIORelation">
+ <relation name="relation12" class="ptolemy.actor.TypedIORelation">
<property name="width" class="ptolemy.data.expr.Parameter" value="1">
</property>
+ <vertex name="vertex1" value="[190.0, 390.0]">
+ </vertex>
</relation>
- <relation name="relation3" class="ptolemy.actor.TypedIORelation">
+ <relation name="relation5" class="ptolemy.actor.TypedIORelation">
<property name="width" class="ptolemy.data.expr.Parameter" value="1">
</property>
</relation>
@@ -100,15 +146,25 @@
<link port="Display2.input" relation="relation"/>
<link port="Life Table Display.input" relation="relation2"/>
<link port="SurvivalCurveCalc.output" relation="relation"/>
- <link port="SurvivalCurveCalc.dataPort" relation="relation8"/>
+ <link port="SurvivalCurveCalc.dataPort" relation="relation7"/>
<link port="SurvivalCurveCalc.out" relation="relation6"/>
<link port="SurvivalCurvePlot.output" relation="relation4"/>
<link port="SurvivalCurvePlot.dataPort" relation="relation6"/>
- <link port="SurvivalCurvePlot.title" relation="relation5"/>
+ <link port="SurvivalCurvePlot.title" relation="relation12"/>
<link port="SurvivalCurvePlot.out" relation="relation3"/>
<link port="LifeTable.output" relation="relation2"/>
<link port="LifeTable.dataPort" relation="relation6"/>
- <link port="SurvivorshipDataActor.localFileName" relation="relation8"/>
- <link port="SurvivorshipDataActor.cemeteryName" relation="relation5"/>
+ <link port="SurvivorshipDataActor.localFileName" relation="relation7"/>
+ <link port="SurvivorshipDataActor.cemeteryName" relation="relation12"/>
<link port="ImageDisplay.input" relation="relation3"/>
+ <link port="SurvivorshipDateRangeFilter.in" relation="relation7"/>
+ <link port="SurvivorshipDateRangeFilter.out" relation="relation11"/>
+ <link port="SurvivorshipDateRangeFilter.criteriaSpecified" relation="relation5"/>
+ <link port="ImageDisplay2.input" relation="relation10"/>
+ <link port="SurvivalCurvePlot2.dataPort" relation="relation8"/>
+ <link port="SurvivalCurvePlot2.title" relation="relation12"/>
+ <link port="SurvivalCurvePlot2.subTitle" relation="relation5"/>
+ <link port="SurvivalCurvePlot2.out" relation="relation10"/>
+ <link port="SurvivalCurveCalc2.dataPort" relation="relation11"/>
+ <link port="SurvivalCurveCalc2.out" relation="relation8"/>
</entity>
More information about the Kepler-cvs
mailing list