From jonmon at ci.uchicago.edu Wed Jun 1 09:20:11 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Wed, 1 Jun 2011 09:20:11 -0500 (CDT) Subject: [Swift-commit] r4536 - in SwiftApps/Montage: exec templates Message-ID: <20110601142011.157C19CC9C@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-01 09:20:10 -0500 (Wed, 01 Jun 2011) New Revision: 4536 Added: SwiftApps/Montage/templates/local.xml SwiftApps/Montage/templates/pads-diff-coasters.xml SwiftApps/Montage/templates/pads-fit-coasters.xml SwiftApps/Montage/templates/pads-proj-coasters.xml Removed: SwiftApps/Montage/templates/pads-coasters.xml Modified: SwiftApps/Montage/exec/montage.sh Log: o SwiftApps/Montage/exec/montage.sh -- Added functionality to specify a different number of workers for each stage o SwiftApps/Montage/templates/pads-proj-coasters.xml o SwiftApps/Montage/templates/pads-diff-coasters.xml o SwiftApps/Montage/templates/pads-fit-coasters.xml -- Added template files for each stage in the workflow o SwiftApps/Montage/templates/local.xml -- Added template for the local operations o SwiftApps/Montage/templates/pads-coasters.xml -- Removed template. Now split up into seperate stages Modified: SwiftApps/Montage/exec/montage.sh =================================================================== --- SwiftApps/Montage/exec/montage.sh 2011-05-31 20:14:17 UTC (rev 4535) +++ SwiftApps/Montage/exec/montage.sh 2011-06-01 14:20:10 UTC (rev 4536) @@ -15,16 +15,29 @@ mkdir ${WORK_DIRECTORY} if [ $HOSTNAME == "login2.pads.ci.uchicago.edu" ]; then - echo "#site pads-coasters.xml internalhostname=192.5.86.6" >> sites.properties + echo "#site pads-proj-coasters.xml internalhostname=192.5.86.6" >> sites.properties + echo "#site pads-diff-coasters.xml internalhostname=192.5.86.6" >> sites.properties + echo "#site pads-fit-coasters.xml internalhostname=192.5.86.6" >> sites.properties elif [ $HOSTNAME == "login1.pads.ci.uchicago.edu" ]; then - echo "#site pads-coasters.xml internalhostname=192.5.86.5" >> sites.properties + echo "#site pads-proj-coasters.xml internalhostname=192.5.86.5" >> sites.properties + echo "#site pads-diff-coasters.xml internalhostname=192.5.86.5" >> sites.properties + echo "#site pads-fit-coasters.xml internalhostname=192.5.86.5" >> sites.properties fi -echo "#site pads-coasters.xml work=/gpfs/pads/jonmon/Swift/work/pads" >> sites.properties -echo "#site pads-coasters.xml slots=$1" >> sites.properties +echo "#site pads-proj-coasters.xml work=/gpfs/pads/jonmon/Swift/work/pads" >> sites.properties +echo "#site pads-proj-coasters.xml slots=$1" >> sites.properties -gensites -L ${SWIFT_MONTAGE}/templates -p sites.properties pads-coasters.xml > sites.xml +echo "#site pads-diff-coasters.xml work=/gpfs/pads/jonmon/Swift/work/pads" >> sites.properties +echo "#site pads-diff-coasters.xml slots=$1" >> sites.properties +echo "#site pads-fit-coasters.xml work=/gpfs/pads/jonmon/Swift/work/pads" >> sites.properties +echo "#site pads-fit-coasters.xml slots=$1" >> sites.properties + +gensites -L ${SWIFT_MONTAGE}/templates -p sites.properties pads-proj-coasters.xml > sites.xml +gensites -L ${SWIFT_MONTAGE}/templates -p sites.properties pads-diff-coasters.xml >> sites.xml +gensites -L ${SWIFT_MONTAGE}/templates -p sites.properties pads-fit-coasters.xml >> sites.xml +gensites -L ${SWIFT_MONTAGE}/templates -p sites.properties local.xml >> sites.xml + rm -f sites.properties mv sites.xml ${WORK_DIRECTORY} Added: SwiftApps/Montage/templates/local.xml =================================================================== --- SwiftApps/Montage/templates/local.xml (rev 0) +++ SwiftApps/Montage/templates/local.xml 2011-06-01 14:20:10 UTC (rev 4536) @@ -0,0 +1,7 @@ + + + + .05 + 1 + _WORK_ + Deleted: SwiftApps/Montage/templates/pads-coasters.xml =================================================================== --- SwiftApps/Montage/templates/pads-coasters.xml 2011-05-31 20:14:17 UTC (rev 4535) +++ SwiftApps/Montage/templates/pads-coasters.xml 2011-06-01 14:20:10 UTC (rev 4536) @@ -1,15 +0,0 @@ - - - - 3600 - _INTERNALHOSTNAME_ - 1 - _SLOTS_ - 1 - 1 - fast - 1 - 10000 - 1 - _WORK_ - Added: SwiftApps/Montage/templates/pads-diff-coasters.xml =================================================================== --- SwiftApps/Montage/templates/pads-diff-coasters.xml (rev 0) +++ SwiftApps/Montage/templates/pads-diff-coasters.xml 2011-06-01 14:20:10 UTC (rev 4536) @@ -0,0 +1,15 @@ + + + + 3600 + _INTERNALHOSTNAME_ + 1 + _SLOTS_ + 1 + 1 + fast + 2 + 100 + 1 + _WORK_ + Added: SwiftApps/Montage/templates/pads-fit-coasters.xml =================================================================== --- SwiftApps/Montage/templates/pads-fit-coasters.xml (rev 0) +++ SwiftApps/Montage/templates/pads-fit-coasters.xml 2011-06-01 14:20:10 UTC (rev 4536) @@ -0,0 +1,15 @@ + + + + 3600 + _INTERNALHOSTNAME_ + 1 + _SLOTS_ + 1 + 1 + fast + 2 + 100 + 1 + _WORK_ + Added: SwiftApps/Montage/templates/pads-proj-coasters.xml =================================================================== --- SwiftApps/Montage/templates/pads-proj-coasters.xml (rev 0) +++ SwiftApps/Montage/templates/pads-proj-coasters.xml 2011-06-01 14:20:10 UTC (rev 4536) @@ -0,0 +1,15 @@ + + + + 3600 + _INTERNALHOSTNAME_ + 1 + _SLOTS_ + 1 + 1 + fast + 2 + 100 + 1 + _WORK_ + From jonmon at ci.uchicago.edu Wed Jun 1 09:52:55 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Wed, 1 Jun 2011 09:52:55 -0500 (CDT) Subject: [Swift-commit] r4537 - SwiftApps/Montage/exec Message-ID: <20110601145255.531BE9CC9C@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-01 09:52:55 -0500 (Wed, 01 Jun 2011) New Revision: 4537 Modified: SwiftApps/Montage/exec/montage.sh Log: o SwiftApps/Montage/exec/montage.sh -- Modified run script to accept a different number of workers at each stage Modified: SwiftApps/Montage/exec/montage.sh =================================================================== --- SwiftApps/Montage/exec/montage.sh 2011-06-01 14:20:10 UTC (rev 4536) +++ SwiftApps/Montage/exec/montage.sh 2011-06-01 14:52:55 UTC (rev 4537) @@ -1,6 +1,6 @@ #!/bin/bash -EXPECTED_ARGS=2 +EXPECTED_ARGS=4 if [ $# -ne $EXPECTED_ARGS ] then @@ -28,21 +28,25 @@ echo "#site pads-proj-coasters.xml slots=$1" >> sites.properties echo "#site pads-diff-coasters.xml work=/gpfs/pads/jonmon/Swift/work/pads" >> sites.properties -echo "#site pads-diff-coasters.xml slots=$1" >> sites.properties +echo "#site pads-diff-coasters.xml slots=$2" >> sites.properties echo "#site pads-fit-coasters.xml work=/gpfs/pads/jonmon/Swift/work/pads" >> sites.properties -echo "#site pads-fit-coasters.xml slots=$1" >> sites.properties +echo "#site pads-fit-coasters.xml slots=$3" >> sites.properties -gensites -L ${SWIFT_MONTAGE}/templates -p sites.properties pads-proj-coasters.xml > sites.xml +echo "#site local.xml work=/gpfs/pads/jonmon/Swift/work/local" >> sites.properties + +echo "" > sites.xml +gensites -L ${SWIFT_MONTAGE}/templates -p sites.properties pads-proj-coasters.xml >> sites.xml gensites -L ${SWIFT_MONTAGE}/templates -p sites.properties pads-diff-coasters.xml >> sites.xml gensites -L ${SWIFT_MONTAGE}/templates -p sites.properties pads-fit-coasters.xml >> sites.xml gensites -L ${SWIFT_MONTAGE}/templates -p sites.properties local.xml >> sites.xml +echo "" >> sites.xml rm -f sites.properties mv sites.xml ${WORK_DIRECTORY} -mv tc.data ${WORK_DIRECTORY} -cp $2 ${WORK_DIRECTORY} +cp tc.data ${WORK_DIRECTORY} +cp $4 ${WORK_DIRECTORY} cd ${WORK_DIRECTORY} #swift -tc.file tc.data -sites.file sites.xml -config ${SWIFT_MONTAGE}/etc swift_montage.properties From jonmon at ci.uchicago.edu Wed Jun 1 11:19:18 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Wed, 1 Jun 2011 11:19:18 -0500 (CDT) Subject: [Swift-commit] r4538 - SwiftApps/Montage/exec Message-ID: <20110601161918.C2AF99CC9C@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-01 11:19:18 -0500 (Wed, 01 Jun 2011) New Revision: 4538 Modified: SwiftApps/Montage/exec/montage.sh Log: o SwiftApps/Montage/exec/montage.sh -- Changed error message is invalid number of parameters was given -- Fixed how the run scipt generated the run directories Modified: SwiftApps/Montage/exec/montage.sh =================================================================== --- SwiftApps/Montage/exec/montage.sh 2011-06-01 14:52:55 UTC (rev 4537) +++ SwiftApps/Montage/exec/montage.sh 2011-06-01 16:19:18 UTC (rev 4538) @@ -4,13 +4,13 @@ if [ $# -ne $EXPECTED_ARGS ] then - echo "Did not specify how many workers are to be run" + echo "Did not specify valid parameters" exit 1 fi -RUN_DIRECTORY=(`ls | grep run`) -len=${#RUN_DIRECTORY[*]} -WORK_DIRECTORY=(`printf "run.%04d" $len`) +RUN_DIRECTORY=(`ls | grep run | tail -n 1`) +NUM=`echo $RUN_DIRECTORY | awk -F . '{print $NF}'` +WORK_DIRECTORY=(`printf "run.%04d" $((NUM+1))`) mkdir ${WORK_DIRECTORY} From jonmon at ci.uchicago.edu Wed Jun 1 11:41:33 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Wed, 1 Jun 2011 11:41:33 -0500 (CDT) Subject: [Swift-commit] r4539 - SwiftApps/Montage/exec Message-ID: <20110601164133.B38029CC9C@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-01 11:41:33 -0500 (Wed, 01 Jun 2011) New Revision: 4539 Modified: SwiftApps/Montage/exec/montage.sh Log: o SwiftApps/Montage/exec/montage.sh -- The run script now checks to make sure that the SWIFT_MONTAGE environment variable is set Modified: SwiftApps/Montage/exec/montage.sh =================================================================== --- SwiftApps/Montage/exec/montage.sh 2011-06-01 16:19:18 UTC (rev 4538) +++ SwiftApps/Montage/exec/montage.sh 2011-06-01 16:41:33 UTC (rev 4539) @@ -8,6 +8,12 @@ exit 1 fi +# Fix this. Not sure how to set this variable if it not set or even what the error message should be +if [ "X$SWIFT_MONTAGE" == "X" ]; then + echo "Please set the SWIFT_MONTAGE environment variable to where the Swift_Montage wrappers home directory is." + exit 1 +fi + RUN_DIRECTORY=(`ls | grep run | tail -n 1`) NUM=`echo $RUN_DIRECTORY | awk -F . '{print $NF}'` WORK_DIRECTORY=(`printf "run.%04d" $((NUM+1))`) @@ -36,10 +42,20 @@ echo "#site local.xml work=/gpfs/pads/jonmon/Swift/work/local" >> sites.properties echo "" > sites.xml +echo "" >> sites.xml + gensites -L ${SWIFT_MONTAGE}/templates -p sites.properties pads-proj-coasters.xml >> sites.xml +echo "" >> sites.xml + gensites -L ${SWIFT_MONTAGE}/templates -p sites.properties pads-diff-coasters.xml >> sites.xml +echo "" >> sites.xml + gensites -L ${SWIFT_MONTAGE}/templates -p sites.properties pads-fit-coasters.xml >> sites.xml +echo "" >> sites.xml + gensites -L ${SWIFT_MONTAGE}/templates -p sites.properties local.xml >> sites.xml +echo "" >> sites.xml + echo "" >> sites.xml rm -f sites.properties From jonmon at ci.uchicago.edu Wed Jun 1 14:36:46 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Wed, 1 Jun 2011 14:36:46 -0500 (CDT) Subject: [Swift-commit] r4540 - SwiftApps/Montage/scripts Message-ID: <20110601193646.610249CCC8@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-01 14:36:46 -0500 (Wed, 01 Jun 2011) New Revision: 4540 Modified: SwiftApps/Montage/scripts/Swift_Montage_Apps.swift Log: o SwiftAps/Montage/scripts/Swift_Montage_Apps.swift -- Added app procedure for mShrink to shrink large images. Modified: SwiftApps/Montage/scripts/Swift_Montage_Apps.swift =================================================================== --- SwiftApps/Montage/scripts/Swift_Montage_Apps.swift 2011-06-01 16:41:33 UTC (rev 4539) +++ SwiftApps/Montage/scripts/Swift_Montage_Apps.swift 2011-06-01 19:36:46 UTC (rev 4540) @@ -71,8 +71,11 @@ mProject "-X" @raw_img @proj_img @hdr; } +app ( Image shrunk ) mShrink( Image original, int factor ) +{ + mShrink @orginial @shrunk factor; +} - /*----------------------------------------------------------------------------------*/ /* */ /* Util Scripts */ From tga at ci.uchicago.edu Wed Jun 1 14:56:02 2011 From: tga at ci.uchicago.edu (tga at ci.uchicago.edu) Date: Wed, 1 Jun 2011 14:56:02 -0500 (CDT) Subject: [Swift-commit] r4541 - SwiftApps/SwiftR/Swift/exec Message-ID: <20110601195602.82A2F9CCC8@svn.ci.uchicago.edu> Author: tga Date: 2011-06-01 14:56:02 -0500 (Wed, 01 Jun 2011) New Revision: 4541 Modified: SwiftApps/SwiftR/Swift/exec/rserver.swift SwiftApps/SwiftR/Swift/exec/start-swift Log: Added option to R server to choose whether "warmup" job is executed or not. Modified: SwiftApps/SwiftR/Swift/exec/rserver.swift =================================================================== --- SwiftApps/SwiftR/Swift/exec/rserver.swift 2011-06-01 19:36:46 UTC (rev 4540) +++ SwiftApps/SwiftR/Swift/exec/rserver.swift 2011-06-01 19:56:02 UTC (rev 4541) @@ -5,7 +5,6 @@ # needs to select between EvalRPersistent and simple RunR # enable persistent for local mode (not sure how) # condense stdout/err to 1 file -# replace ack with ftracef to result pipe # condense shellscript and rserverscript to one? app (external e, RData result, file stout, file sterr) runR (file shellscript, file RServerScript, RData rcall, RData exports[]) @@ -46,7 +45,9 @@ } } -passivate(); +if (@arg("warmup", "false") == "true") { + passivate(); +} string pipedir = @arg("pipedir"); global string requestPipeName = @strcat(pipedir,"/requestpipe"); Modified: SwiftApps/SwiftR/Swift/exec/start-swift =================================================================== --- SwiftApps/SwiftR/Swift/exec/start-swift 2011-06-01 19:36:46 UTC (rev 4540) +++ SwiftApps/SwiftR/Swift/exec/start-swift 2011-06-01 19:56:02 UTC (rev 4541) @@ -754,7 +754,10 @@ fi -$SWIFTRBIN/../swift/bin/swift $swiftLoggingFlag -config cf -tc.file tc -sites.file sites.xml $script -pipedir=$(pwd) >& $out & $out Author: tga Date: 2011-06-01 15:01:00 -0500 (Wed, 01 Jun 2011) New Revision: 4542 Modified: SwiftApps/SwiftR/Swift/exec/configure-server-cobalt SwiftApps/SwiftR/Swift/exec/configure-server-crayxt SwiftApps/SwiftR/Swift/exec/configure-server-local SwiftApps/SwiftR/Swift/exec/configure-server-pbs SwiftApps/SwiftR/Swift/exec/configure-server-sge SwiftApps/SwiftR/Swift/exec/configure-server-ssh Log: Removed obselete cruft from configuration files Modified: SwiftApps/SwiftR/Swift/exec/configure-server-cobalt =================================================================== --- SwiftApps/SwiftR/Swift/exec/configure-server-cobalt 2011-06-01 19:56:02 UTC (rev 4541) +++ SwiftApps/SwiftR/Swift/exec/configure-server-cobalt 2011-06-01 20:01:00 UTC (rev 4542) @@ -6,22 +6,12 @@ throttle=$2 cat >tc <sites.xml < - - - - 0.15 - 10000 - - $(pwd)/swiftwork - - passive Modified: SwiftApps/SwiftR/Swift/exec/configure-server-crayxt =================================================================== --- SwiftApps/SwiftR/Swift/exec/configure-server-crayxt 2011-06-01 19:56:02 UTC (rev 4541) +++ SwiftApps/SwiftR/Swift/exec/configure-server-crayxt 2011-06-01 20:01:00 UTC (rev 4542) @@ -6,7 +6,6 @@ throttlePBS=$2 cat >tc <sites.xml < - - - - 0.15 - 10000 - - $(pwd)/swiftwork - - passive Modified: SwiftApps/SwiftR/Swift/exec/configure-server-local =================================================================== --- SwiftApps/SwiftR/Swift/exec/configure-server-local 2011-06-01 19:56:02 UTC (rev 4541) +++ SwiftApps/SwiftR/Swift/exec/configure-server-local 2011-06-01 20:01:00 UTC (rev 4542) @@ -55,8 +55,6 @@ done -# 1 - echo '' >>sites.xml cat >cf <tc <sites.xml < - - - - 0.15 - 10000 - - $R_LIBS_USER - $(pwd)/swiftwork - - passive @@ -52,34 +41,3 @@ #throttle.host.submit=1 END - -: SAVE FOR REFERENCE <00:00:01 -# fast - - - - fast - 00:59:00 - $throttlePBS - 10000 - - $HOME/swiftwork - - - - - short - 12000 - 32 - 1 - 1 - 1 - 2.55 - 10000 - - $HOME/swiftwork - - -END Modified: SwiftApps/SwiftR/Swift/exec/configure-server-sge =================================================================== --- SwiftApps/SwiftR/Swift/exec/configure-server-sge 2011-06-01 19:56:02 UTC (rev 4541) +++ SwiftApps/SwiftR/Swift/exec/configure-server-sge 2011-06-01 20:01:00 UTC (rev 4542) @@ -6,7 +6,6 @@ throttle=$2 cat >tc <sites.xml < - - - 0.15 - 10000 - - $R_LIBS_USER - $(pwd)/swiftwork - file - - passive @@ -54,32 +43,3 @@ #throttle.host.submit=1 END -: SAVE FOR REFERENCE < - - 300000 - 4 - 1 - 1 - 0.15 - 10000 - - $(pwd)/swiftwork - proxy - - - - - - - 8 - 1 - 1 - .15 - 10000 - proxy - /scratch/local/wilde/pstest/swiftwork - - -END Modified: SwiftApps/SwiftR/Swift/exec/configure-server-ssh =================================================================== --- SwiftApps/SwiftR/Swift/exec/configure-server-ssh 2011-06-01 19:56:02 UTC (rev 4541) +++ SwiftApps/SwiftR/Swift/exec/configure-server-ssh 2011-06-01 20:01:00 UTC (rev 4542) @@ -6,21 +6,11 @@ cat >tc <sites.xml < - - - 0.15 - 10000 - $R_LIBS_USER - - $(pwd)/swiftwork - - passive @@ -46,19 +36,3 @@ #throttle.host.submit=1 END -true to save <00:00:01 -# fast - - - - - passive - 4 - .03 - 10000 - - $HOME/swiftwork - -END From tga at ci.uchicago.edu Wed Jun 1 17:15:27 2011 From: tga at ci.uchicago.edu (tga at ci.uchicago.edu) Date: Wed, 1 Jun 2011 17:15:27 -0500 (CDT) Subject: [Swift-commit] r4543 - SwiftApps/SwiftR/Swift/exec Message-ID: <20110601221527.61FE39CC9C@svn.ci.uchicago.edu> Author: tga Date: 2011-06-01 17:15:27 -0500 (Wed, 01 Jun 2011) New Revision: 4543 Modified: SwiftApps/SwiftR/Swift/exec/configure-server-cobalt SwiftApps/SwiftR/Swift/exec/configure-server-crayxt SwiftApps/SwiftR/Swift/exec/configure-server-local SwiftApps/SwiftR/Swift/exec/configure-server-pbs SwiftApps/SwiftR/Swift/exec/configure-server-pbsauto SwiftApps/SwiftR/Swift/exec/configure-server-sge SwiftApps/SwiftR/Swift/exec/configure-server-ssh SwiftApps/SwiftR/Swift/exec/start-swift Log: cleaning up parameter passing to configure scripts. Getting pbsauto working, so that automatic pbs job submission is available from R without custom config files. These changes ahve not been thoroughly tested yet. Modified: SwiftApps/SwiftR/Swift/exec/configure-server-cobalt =================================================================== --- SwiftApps/SwiftR/Swift/exec/configure-server-cobalt 2011-06-01 20:01:00 UTC (rev 4542) +++ SwiftApps/SwiftR/Swift/exec/configure-server-cobalt 2011-06-01 22:15:27 UTC (rev 4543) @@ -2,9 +2,6 @@ # configuration for cobalt with manually-started Swift workers (passive coasters) -cores=$1 -throttle=$2 - cat >tc <tc <1 --> - $throttlePBS + $throttle 10000 $LUSTRE_TMP Modified: SwiftApps/SwiftR/Swift/exec/configure-server-local =================================================================== --- SwiftApps/SwiftR/Swift/exec/configure-server-local 2011-06-01 20:01:00 UTC (rev 4542) +++ SwiftApps/SwiftR/Swift/exec/configure-server-local 2011-06-01 22:15:27 UTC (rev 4543) @@ -2,8 +2,6 @@ throttleOneCore="0.00" # FIXME: test if new swft fix makes zero OK rather than -0.001 -cores=$1 - if [ -r /proc/cpuinfo ]; then localcores=$(grep '^processor' /proc/cpuinfo | wc -l) else Modified: SwiftApps/SwiftR/Swift/exec/configure-server-pbs =================================================================== --- SwiftApps/SwiftR/Swift/exec/configure-server-pbs 2011-06-01 20:01:00 UTC (rev 4542) +++ SwiftApps/SwiftR/Swift/exec/configure-server-pbs 2011-06-01 22:15:27 UTC (rev 4543) @@ -2,10 +2,6 @@ # configuration for PBS with manually-started Swift workers (passive coasters) -cores=$1 - -throttlePBS=$2 - cat >tc < passive $cores - $throttlePBS + $throttle 10000 $R_LIBS_USER Modified: SwiftApps/SwiftR/Swift/exec/configure-server-pbsauto =================================================================== --- SwiftApps/SwiftR/Swift/exec/configure-server-pbsauto 2011-06-01 20:01:00 UTC (rev 4542) +++ SwiftApps/SwiftR/Swift/exec/configure-server-pbsauto 2011-06-01 22:15:27 UTC (rev 4543) @@ -1,63 +1,74 @@ #! /usr/bin/env bash -throttlePBS=.31 # FIXME: parameterize thsi and several other variables, below. - +#TODO: make configurable +maxwalltime="00:10:00" cat >tc <sites.xml < - - - 0.15 - 10000 - - $R_LIBS_USER - $(pwd)/swiftwork - - - - fast - 00:59:00 - $throttlePBS - 10000 - - $R_LIBS_USER - $HOME/swiftwork - - short - 12000 - 32 - 1 - 1 - 1 - 2.55 + + $R_LIBS_USER + $(pwd)/swiftwork + $(pwd)/swiftscratch + $throttle 10000 - - $HOME/swiftwork + + $nodes + $cores + + + 1 + 1 + + +END +if [ "$queue" != NONE ]; then + #TODO: error handling + # assume time in H:M:S format + t + cat >> sites.xml <$queue +END +fi + +if [ "$time" != NONE ]; then + cat >> sites.xml <$time_mins +END +fi + +cat >> sites.xml < END -# 00:00:01 -# fast - cat >cf < +# +# fast +# 00:59:00 +# $throttlePBS +# 10000 +# +# $R_LIBS_USER +# $HOME/swiftwork +# Modified: SwiftApps/SwiftR/Swift/exec/configure-server-sge =================================================================== --- SwiftApps/SwiftR/Swift/exec/configure-server-sge 2011-06-01 20:01:00 UTC (rev 4542) +++ SwiftApps/SwiftR/Swift/exec/configure-server-sge 2011-06-01 22:15:27 UTC (rev 4543) @@ -2,9 +2,6 @@ # Generate Swift configuration files for SGE with manually-started Swift workers (passive coasters) -cores=$1 -throttle=$2 - cat >tc <tc < passive $cores - 2.55 + $throttle 10000 $(pwd)/swiftwork Modified: SwiftApps/SwiftR/Swift/exec/start-swift =================================================================== --- SwiftApps/SwiftR/Swift/exec/start-swift 2011-06-01 20:01:00 UTC (rev 4542) +++ SwiftApps/SwiftR/Swift/exec/start-swift 2011-06-01 22:15:27 UTC (rev 4543) @@ -425,6 +425,34 @@ fi } +verify-is-time() +{ + argname=$1; shift + #check if positive integer + if [ "$1" -gt 0 ] 2> /dev/null; then + time_mins=$time + # echo time_mins: $time_mins + return 0 + fi + + d=${1%%:*} + hm=${1#*:} + h=${hm%%:*} + m=${hm#*:} + # check than they are integers >= 0 + if [ \( "$h" -ge 0 \) -a \( "$m" -ge 0 \) -a \( "$d" -ge 0 \) \ + -a \( \( "$h" -ge 0 \) -o \( "$m" -ge 0 \) -o \( "$d" -ge 0 \) \) ]; then + time_mins=$(($m + 60 * ($h + $d * 24))) +# echo time_mins: $time_mins + return 0 + else + echo $0: "value for $argname was neither valid d:m:s time, or positive + integer number of minutes" + usage + exit 1 + fi +} + verify-not-null() { argname=$1; shift @@ -459,7 +487,7 @@ -r rcmd ssh site specific, SGE only, typically ssh. qrsh for siraf cluster -s server local local, pbs, sge, ssh, pbsf (for firewalled workers) - ,cobalt,crayxt,custom + ,cobalt,crayxt,custom, pbsauto -t time 00:30:00 hh:mm:ss, for PBS, Cobalt and SGE only -w wkloglvl NONE NONE, ERROR, WARN, INFO, DEBUG, TRACE -k keepdir No argument, if flag is set, will keep working @@ -485,6 +513,7 @@ server=local time="00:30:00" +time_mins=30 nodes=1 queue=short cores=0 @@ -504,6 +533,7 @@ sites_file= tc_file= cf_file= +warmupjob=true rcmd=ssh # rcmd: ssh (typical) or qrsh (eg for siraf with node login restrictions) workmode=slot # slot: start one worker on each slot; node: start one worker for all slots on a node @@ -521,8 +551,8 @@ -p) throttle=$2; verify-is-numeric throttle $throttle; shift ;; -q) queue=$2; verify-not-null queue $queue; shift ;; -r) rcmd=$2; verify-is-one-of rcmd $rcmd ssh qrsh; shift ;; - -s) server=$2; verify-is-one-of server $server local ssh pbs pbsf sge cobalt crayxt custom; shift ;; - -t) time=$2; verify-not-null time $time; shift ;; + -s) server=$2; verify-is-one-of server $server local ssh pbs pbsf sge cobalt crayxt custom pbsauto; shift ;; + -t) time=$2; verify-is-time time $time; shift ;; -w) workerLogging=$2; verify-is-one-of workerLoggingLevel $workerLogging NONE ERROR WARN INFO DEBUG TRACE; shift ;; -L) swiftLoggingFlag="" ;; # swift default is lots of logging -k) keepdir=TRUE ;; @@ -626,6 +656,7 @@ exitcmd="" if [ $server = custom ]; then + warmupjob=false # have already set up tc.data and sites.xml files, just set #onexit function onexit { @@ -640,13 +671,13 @@ echo ok > ackfifo fi elif [ $server = local ]; then - + warmupjob=true if [ $cores -eq 0 ]; then cores=$defaultLocalCores fi - echo project=$project cores=$cores nodes=$nodes queue=$queue server=$server throttle=$throttle + echo project=$project cores=$cores nodes=$nodes queue=$queue server=$server - source $SWIFTRBIN/configure-server-local $cores + source $SWIFTRBIN/configure-server-local function onexit { stdcleanup_start # Find and terminate R workers: they should register their PiD @@ -671,13 +702,13 @@ echo ok > ackfifo fi elif [ $server = ssh ]; then - + warmupjob=true if [ $cores -eq 0 ]; then cores=$defaultSshCores fi - echo project=$project cores=$cores nodes=$nodes queue=$queue server=$server throttle=$throttle + echo project=$project cores=$cores nodes=$nodes queue=$queue server=$server - source $SWIFTRBIN/configure-server-ssh $cores $throttle $time + source $SWIFTRBIN/configure-server-ssh sshpidfile=${out/stdouterr/workerpids} @@ -711,18 +742,44 @@ wait-and-start-ssh-workers & starterpid=$! +elif [ \( $server = pbsauto \) ]; then + warmupjob=false + # Systems where Swift manages workers + if [ $cores -le 0 ]; then + cores=$defaultClusterCores + fi + echo server=$server project=$project cores=$cores nodes=$nodes queue=$queue + source $SWIFTRBIN/configure-server-pbsauto + + function onexit { + stdcleanup_start + trap - $TRAPEVENTS + # exit cleanly + stdcleanup_end + exit 0 +} + + trap onexit $TRAPEVENTS + exitcmd=onexit + + + if [ "$doack" = TRUE ]; then + echo ok > ackfifo + fi + elif [ \( $server = pbs \) -o \( $server = pbsf \) -o \( $server = sge \) \ -o \( $server = cobalt \) -o \( $server = crayxt \) ]; then - - if [ $cores -eq 0 ]; then + warmupjob=true + # Batch systems where we need to launch workers + if [ $cores -le 0 ]; then cores=$defaultClusterCores fi - echo project=$project cores=$cores nodes=$nodes queue=$queue server=$server throttle=$throttle + echo server=$server project=$project cores=$cores nodes=$nodes queue=$queue if [ $server = pbsf ] then - source $SWIFTRBIN/configure-server-pbs $cores $throttle + source $SWIFTRBIN/configure-server-pbs else - source $SWIFTRBIN/configure-server-${server} $cores $throttle + source $SWIFTRBIN/configure-server-${server} fi jobidfile=${out/stdouterr/jobid} @@ -756,7 +813,7 @@ $SWIFTRBIN/../swift/bin/swift $swiftLoggingFlag \ -config cf -tc.file tc -sites.file sites.xml $script -pipedir=$(pwd) \ - -warmup=true \ + -warmup=$warmupjob \ >& $out Author: davidk Date: 2011-06-02 16:27:03 -0500 (Thu, 02 Jun 2011) New Revision: 4544 Added: trunk/docs/newuser-guide/ trunk/docs/newuser-guide/pads-quickstart.txt trunk/examples/catsn.swift Removed: trunk/etc/sites/coaster-service.conf Modified: trunk/tests/providers/local-pbs/pads/sites.template.xml Log: Updated PADS pbs-local template and copied to etc/sites Added catsn.swift to examples directory Added start of new user guide Added: trunk/docs/newuser-guide/pads-quickstart.txt =================================================================== --- trunk/docs/newuser-guide/pads-quickstart.txt (rev 0) +++ trunk/docs/newuser-guide/pads-quickstart.txt 2011-06-02 21:27:03 UTC (rev 4544) @@ -0,0 +1,188 @@ +PADS Quickstart Guide +===================== + +Requesting Access +----------------- +If you do not already have a Computation Institute account, you can request +one at https://www.ci.uchicago.edu/accounts/. This page will give you a list +of resources you can request access to. Be sure that PADS is selected. If +you already have an existing CI account, but do not have access to PADS, +send an email to support at ci.uchicago.edu to request access. + +SSH Keys +-------- +Before accessing PADS, be sure to have your SSH keys configured correctly. +There is some basic information about SSH and how to generate your key at +http://www.ci.uchicago.edu/wiki/bin/view/Resources/SshKeys. Once you have +followed those instructions, you can add your key at +https://www.ci.uchicago.edu/support/sshkeys/. + +Connecting to a login node +-------------------------- +Once your keys are configured, you should be able to access a PADS login +node with the following command: + +----- +ssh yourusername at login.pads.ci.uchicago.edu +----- + +Configuring softenv +------------------- +Softenv is a system used for managing applications. In order to run Swift, +the softenv environment will have to be modified slightly. Softenv is +configured by a file in your home directory called .soft. Edit this file +to look like this: +----- ++java-sun ++maui ++torque + at default +----- + +Downloading and building swift +------------------------------ +The most recent versions of Swift can be found at +http://www.ci.uchicago.edu/swift/downloads/index.php. Follow the instructions +provided on that site to download and build Swift. + +Adding Swift to your PATH +------------------------- +Once you have installed Swift, add the Swift binary to your PATH so you can +easily run it from any directory. + +In your home directory, edit the file ".bashrc". + +If you have installed Swift via a source repository, add the following line +at the bottom of .bashrc. + +----- +export PATH=$PATH:$HOME/cog/modules/swift/dist/swift-svn/bin +----- + +If you have installed Swift via a binary package, add this line: + +----- +export PATH=$PATH:$HOME/swift-/bin +----- + +Replace with the actual name of the swift directory in the example above. + +What You Need To Know Before Running Swift +------------------------------------------ +Before you can create a Swift configuration file, there are some things +you will need to know. + +Swift Work Directory +~~~~~~~~~~~~~~~~~~~~ +The Swift work directory is a directory which Swift uses for processing work. +This directory needs to be writable. Common options for this are: + +----- +/home/username/swiftwork +/home/username/work +/tmp +----- + +Which project(s) are you a member of? +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +PADS requires that you are a member of a project. You can determine this by +running the following command: + +----- +$ projects --available + +The following projects are available for your use + +Project PI Title + +CI-CCR000013 Michael Wilde The Swift Parallel Scripting System +----- + +If you are not a member of a project, you must first request access +to a project at http://www.ci.uchicago.edu/hpc/projects. + +You should make sure that you have a project set as default. Run +the projects command with no arguments to determine if you have a default. + +------ +$ projects +You have no default project set. +----- + +To set your default project, use projects --set +------ +$ projects --set CI-CCR000013 --all +Your default project for all CI clusters has been set to CI-CCR000013. +----- + +Determine your Queue +~~~~~~~~~~~~~~~~~~~~ + +PADS has several different queues you can submit jobs to depending on +the type of work you will be doing. The command "qstat -q" will print +the most up to date list of this information. + +.PADS Queues +[options="header"] +|========================================================= +|Queue |Memory|CPU Time|Walltime|Node|Run|Que|Lm |State +|route |-- |-- |-- |-- | 0| 0|-- | E R +|short |-- |-- |04:00:00|-- | 64| 0|-- | E R +|extended|-- |-- |-- |-- | 0| 0|-- | E R +|fast |-- |-- |01:00:00|1 | 0|152|-- | E R +|long |-- |-- |24:00:00|-- |232|130|-- | E R +|========================================================= + +Generating Configuration Files +------------------------------ +Now that you know what queue to use, your project, and your work directory, it is time to +set up Swift. Swift uses a configuration file called sites.xml to determine how it should run. +There are two methods you can use for creating this file. You can manually edit +the configuration file, or generate it with a utility called gensites. + +Manually Editing sites.xml +~~~~~~~~~~~~~~~~~~~~~~~~~~ +Below is the template that is used by Swift's test suite for running on PADS. + +----- +include::../../tests/providers/local-pbs/pads/sites.template.xml[] +----- + +The values to note here are the ones that are listed between underscores. In the example above, they are _QUEUE_, and _WORK_. Queue is the PADS queue to use and WORK is the swift work directory. These are placeholder values you will need to modify to fit your needs. Copy and paste this template, replace the values, and call it sites.xml. + +Manually Editing tc.data +~~~~~~~~~~~~~~~~~~~~~~~~ +Below is the tc.data file used by Swift's test suite for running on PADS. + +----- +include::../../tests/providers/local-pbs/pads/tc.template.data[] +------ + +Copy these commands and save it as tc.data. + +Catsn.swift +----------- +The swift script we will run is called catsn.swift. It simply cats a file and saves the result. This is a nice simple test to ensure jobs are running correctly. Create a file called data.txt which contains some simple input - a "hello world" will do the trick. + +----- +include::../../examples/catsn.swift[] +----- + +Running Swift +------------- +Now that everything is in place, run Swift with the following command: + +----- +swift -sites.file sites.xml -tc.file tc.data catsn.swift -n=10 +----- + +You should see several new files being created, called catsn.0001.out, catsn.0002.out, etc. Each of these +files should contain the contents of what you placed into data.txt. If this happens, your job has run +successfully on PADS! + +More Help +--------- +The best place for additional help is the Swift user mailing list. You can subscribe to this list at +http://mail.ci.uchicago.edu/mailman/listinfo/swift-user. When submitting information, please send your sites.xml file, your tc.data, and any Swift log files that were created during your attempt. + + Deleted: trunk/etc/sites/coaster-service.conf =================================================================== --- trunk/etc/sites/coaster-service.conf 2011-06-01 22:15:27 UTC (rev 4543) +++ trunk/etc/sites/coaster-service.conf 2011-06-02 21:27:03 UTC (rev 4544) @@ -1,31 +0,0 @@ -# Keep all interesting settings in one place -# User should modify this to fit environment - -# Location of SWIFT. If empty, PATH is referenced -export SWIFT= - -# Where to place/launch worker.pl on the remote machine for sites.xml -export WORKER_WORK=/home/${USER}/work - -# How to launch workers- local or ssh -export WORKER_MODE=ssh - -# Worker logging setting passed to worker.pl for sites.xml -export WORKER_LOGGING=INFO - -# Worker host names for ssh -export WORKERS_HOSTS="crush thwomp stomp crush crank steamroller grind churn trounce thrash vanquish octagon octopus" - -# Directory to keep log files, relative to working directory when launching start-coaster-service -export LOG_DIR=logs - -# Manually define ports. If not specified, ports will be automatically generated -export LOCAL_PORT= -export SERVICE_PORT= - -# Below are various settings to give information about how to create sites.xml -# These must remain as comments in order for gensites to recognize them -#site work=$HOME/work -#site queue=prod-devel -#site maxtime=20 -#site nodes=64 Added: trunk/examples/catsn.swift =================================================================== --- trunk/examples/catsn.swift (rev 0) +++ trunk/examples/catsn.swift 2011-06-02 21:27:03 UTC (rev 4544) @@ -0,0 +1,15 @@ +type file; + +app (file o) cat (file i) +{ + cat @i stdout=@o; +} + +string t = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; +string char[] = @strsplit(t, ""); + +file out[]; +foreach j in [1:@toint(@arg("n","10"))] { + file data<"data.txt">; + out[j] = cat(data); +} Modified: trunk/tests/providers/local-pbs/pads/sites.template.xml =================================================================== --- trunk/tests/providers/local-pbs/pads/sites.template.xml 2011-06-01 22:15:27 UTC (rev 4543) +++ trunk/tests/providers/local-pbs/pads/sites.template.xml 2011-06-02 21:27:03 UTC (rev 4544) @@ -3,6 +3,7 @@ 0 + _QUEUE_ _WORK_ From tga at ci.uchicago.edu Thu Jun 2 17:25:02 2011 From: tga at ci.uchicago.edu (tga at ci.uchicago.edu) Date: Thu, 2 Jun 2011 17:25:02 -0500 (CDT) Subject: [Swift-commit] r4545 - in SwiftApps/SwiftR: . Swift/exec Message-ID: <20110602222502.EC7999CCA5@svn.ci.uchicago.edu> Author: tga Date: 2011-06-02 17:25:02 -0500 (Thu, 02 Jun 2011) New Revision: 4545 Modified: SwiftApps/SwiftR/IMMEDIATE-TODO SwiftApps/SwiftR/Swift/exec/configure-server-pbsauto SwiftApps/SwiftR/Swift/exec/start-swift Log: Fixes to get pbsauto working nicely on pads: now passes test suite and handles time, nodes and cores parameters correctly. Modified: SwiftApps/SwiftR/IMMEDIATE-TODO =================================================================== --- SwiftApps/SwiftR/IMMEDIATE-TODO 2011-06-02 21:27:03 UTC (rev 4544) +++ SwiftApps/SwiftR/IMMEDIATE-TODO 2011-06-02 22:25:02 UTC (rev 4545) @@ -30,7 +30,7 @@ - E.g. PBS with Dynamic submission of jobs of various lengths - other batch schedulers - This informs specifying + This involves specifying - job walltimes - queue - staging mechanism Modified: SwiftApps/SwiftR/Swift/exec/configure-server-pbsauto =================================================================== --- SwiftApps/SwiftR/Swift/exec/configure-server-pbsauto 2011-06-02 21:27:03 UTC (rev 4544) +++ SwiftApps/SwiftR/Swift/exec/configure-server-pbsauto 2011-06-02 22:25:02 UTC (rev 4545) @@ -22,6 +22,7 @@ $nodes $cores + $cores @@ -40,8 +41,10 @@ fi if [ "$time" != NONE ]; then + # Hack: Add 60 seconds to time to convince to request blocks for + # full time. cat >> sites.xml <$time_mins + $((time_secs + 60)) END fi Modified: SwiftApps/SwiftR/Swift/exec/start-swift =================================================================== --- SwiftApps/SwiftR/Swift/exec/start-swift 2011-06-02 21:27:03 UTC (rev 4544) +++ SwiftApps/SwiftR/Swift/exec/start-swift 2011-06-02 22:25:02 UTC (rev 4545) @@ -430,20 +430,21 @@ argname=$1; shift #check if positive integer if [ "$1" -gt 0 ] 2> /dev/null; then - time_mins=$time - # echo time_mins: $time_mins + time_secs=$time + # echo time_secs: $time_secs return 0 fi - d=${1%%:*} - hm=${1#*:} - h=${hm%%:*} - m=${hm#*:} - # check than they are integers >= 0 - if [ \( "$h" -ge 0 \) -a \( "$m" -ge 0 \) -a \( "$d" -ge 0 \) \ - -a \( \( "$h" -ge 0 \) -o \( "$m" -ge 0 \) -o \( "$d" -ge 0 \) \) ]; then - time_mins=$(($m + 60 * ($h + $d * 24))) -# echo time_mins: $time_mins + h=${1%%:*} + ms=${1#*:} + m=${ms%%:*} + s=${ms#*:} + # check than they are integers >= 1 + if [ \( "$h" -ge 0 \) -a \( "$m" -ge 0 \) -a \( "$s" -ge 0 \) \ + -a \( \( "$h" -ge 0 \) -o \( "$m" -ge 0 \) -o \( "$s" -ge 0 \) \) \ + ] 2> /dev/null ; then + time_secs=$(($s + 60 * ($m + $h * 60))) +# echo time_secs: $time_secs return 0 else echo $0: "value for $argname was neither valid d:m:s time, or positive @@ -513,7 +514,7 @@ server=local time="00:30:00" -time_mins=30 +time_secs=30 nodes=1 queue=short cores=0 From davidk at ci.uchicago.edu Fri Jun 3 09:53:59 2011 From: davidk at ci.uchicago.edu (davidk at ci.uchicago.edu) Date: Fri, 3 Jun 2011 09:53:59 -0500 (CDT) Subject: [Swift-commit] r4546 - www/docs Message-ID: <20110603145359.33AB89CCC8@svn.ci.uchicago.edu> Author: davidk Date: 2011-06-03 09:53:59 -0500 (Fri, 03 Jun 2011) New Revision: 4546 Modified: www/docs/index.php Log: Asciidoc tutorial added for trunk Modified: www/docs/index.php =================================================================== --- www/docs/index.php 2011-06-02 22:25:02 UTC (rev 4545) +++ www/docs/index.php 2011-06-03 14:53:59 UTC (rev 4546) @@ -43,13 +43,13 @@ [html] [pdf]
  • trunk - [html] [pdf] + [html] [pdf]
    • -
    • Swift Tutorial (on your own machine) [html] [pdf]
    • +
    • Swift Tutorial (on your own machine) [html] [pdf]

    @@ -59,7 +59,7 @@

      -
    • Swift Tutorial (on a UC machine) [html]
    • +
    • Swift Tutorial (on a UC machine) [html]

    @@ -100,8 +100,6 @@ document gives some usage information for those tools.

    - -

    Elsewhere

    From tga at ci.uchicago.edu Fri Jun 3 11:12:34 2011 From: tga at ci.uchicago.edu (tga at ci.uchicago.edu) Date: Fri, 3 Jun 2011 11:12:34 -0500 (CDT) Subject: [Swift-commit] r4548 - SwiftApps/SwiftR/Swift/exec Message-ID: <20110603161234.9F39F9CC9C@svn.ci.uchicago.edu> Author: tga Date: 2011-06-03 11:12:34 -0500 (Fri, 03 Jun 2011) New Revision: 4548 Modified: SwiftApps/SwiftR/Swift/exec/configure-server-pbsauto SwiftApps/SwiftR/Swift/exec/start-swift Log: Tweaked time settings for pbsauto so that time parameter is better respected. Modified: SwiftApps/SwiftR/Swift/exec/configure-server-pbsauto =================================================================== --- SwiftApps/SwiftR/Swift/exec/configure-server-pbsauto 2011-06-03 15:12:39 UTC (rev 4547) +++ SwiftApps/SwiftR/Swift/exec/configure-server-pbsauto 2011-06-03 16:12:34 UTC (rev 4548) @@ -1,7 +1,21 @@ #! /usr/bin/env bash -#TODO: make configurable -maxwalltime="00:10:00" +#TODO: is this best way to do this. + +# we assume that $time_secs specifies the lengths of jobs +# that should be submitted to pbs. +#We don't really know the expected duration of R jobs, so we will come up +# with a sensible value based on $time-secs +# +#Swift kills jobs that run for double maxwalltime, so maxwalltime should be +# > 0.5 $time_secs +# Ideally we want to run multiple jobs in each batch allocation, so we don't +# want coasters to mistakenly decide that it can't schedule a job when we +# have most of the batch allocation left. So we really want +# maxwalltime to be just over 0.5 $time_secs, once we round both to minutes +maxwalltime=$(( ($time_secs + 120) / 120 )) + + cat >tc < 1 1 + 2 + 2 - END if [ "$queue" != NONE ]; then #TODO: error handling Modified: SwiftApps/SwiftR/Swift/exec/start-swift =================================================================== --- SwiftApps/SwiftR/Swift/exec/start-swift 2011-06-03 15:12:39 UTC (rev 4547) +++ SwiftApps/SwiftR/Swift/exec/start-swift 2011-06-03 16:12:34 UTC (rev 4548) @@ -427,6 +427,10 @@ verify-is-time() { + # Three valid formats, following maxWallTime globus param: + # minutes (single int) + # h:m + # h:m:s argname=$1; shift #check if positive integer if [ "$1" -gt 0 ] 2> /dev/null; then @@ -439,9 +443,14 @@ ms=${1#*:} m=${ms%%:*} s=${ms#*:} - # check than they are integers >= 1 + + # if in h:m format, then #*: won't have deleted anything from m + if [ "$ms" = "$s" ]; then + s=0 + fi + # check than they are integers >= 0 and at least one is > 0 if [ \( "$h" -ge 0 \) -a \( "$m" -ge 0 \) -a \( "$s" -ge 0 \) \ - -a \( \( "$h" -ge 0 \) -o \( "$m" -ge 0 \) -o \( "$s" -ge 0 \) \) \ + -a \( \( "$h" -gt 0 \) -o \( "$m" -gt 0 \) -o \( "$s" -gt 0 \) \) \ ] 2> /dev/null ; then time_secs=$(($s + 60 * ($m + $h * 60))) # echo time_secs: $time_secs From tga at ci.uchicago.edu Fri Jun 3 11:40:15 2011 From: tga at ci.uchicago.edu (tga at ci.uchicago.edu) Date: Fri, 3 Jun 2011 11:40:15 -0500 (CDT) Subject: [Swift-commit] r4549 - in SwiftApps/SwiftR: . Swift/exec Message-ID: <20110603164015.E24689CC9C@svn.ci.uchicago.edu> Author: tga Date: 2011-06-03 11:40:15 -0500 (Fri, 03 Jun 2011) New Revision: 4549 Modified: SwiftApps/SwiftR/IMMEDIATE-TODO SwiftApps/SwiftR/Swift/exec/start-swift Log: Fixed default time bug. Modified: SwiftApps/SwiftR/IMMEDIATE-TODO =================================================================== --- SwiftApps/SwiftR/IMMEDIATE-TODO 2011-06-03 16:12:34 UTC (rev 4548) +++ SwiftApps/SwiftR/IMMEDIATE-TODO 2011-06-03 16:40:15 UTC (rev 4549) @@ -17,7 +17,7 @@ HIGH: -- sometimes the server crashes after servicing first request( - only observer when running locally and on sge) + only observed when running locally and on sge) HIGH: -- Benchmark ideas @@ -27,7 +27,10 @@ MED: -- Have a more user-friendly way to specify some of the more common custom setups: - - E.g. PBS with Dynamic submission of jobs of various lengths + - PBS with Dynamic submission of jobs of various lengths + * Done: pbsauto + * This needs to be tested a bit more on other setups + - other batch schedulers This involves specifying Modified: SwiftApps/SwiftR/Swift/exec/start-swift =================================================================== --- SwiftApps/SwiftR/Swift/exec/start-swift 2011-06-03 16:12:34 UTC (rev 4548) +++ SwiftApps/SwiftR/Swift/exec/start-swift 2011-06-03 16:40:15 UTC (rev 4549) @@ -523,7 +523,7 @@ server=local time="00:30:00" -time_secs=30 +time_secs=1800 nodes=1 queue=short cores=0 From wozniak at ci.uchicago.edu Fri Jun 3 11:43:21 2011 From: wozniak at ci.uchicago.edu (wozniak at ci.uchicago.edu) Date: Fri, 3 Jun 2011 11:43:21 -0500 (CDT) Subject: [Swift-commit] r4550 - trunk/tests/functions Message-ID: <20110603164321.2150F9CC9C@svn.ci.uchicago.edu> Author: wozniak Date: 2011-06-03 11:43:20 -0500 (Fri, 03 Jun 2011) New Revision: 4550 Added: trunk/tests/functions/tracef/ Log: tracef() tests From wozniak at ci.uchicago.edu Fri Jun 3 11:44:44 2011 From: wozniak at ci.uchicago.edu (wozniak at ci.uchicago.edu) Date: Fri, 3 Jun 2011 11:44:44 -0500 (CDT) Subject: [Swift-commit] r4551 - trunk/tests/functions Message-ID: <20110603164444.F0EA99CC9C@svn.ci.uchicago.edu> Author: wozniak Date: 2011-06-03 11:44:44 -0500 (Fri, 03 Jun 2011) New Revision: 4551 Removed: trunk/tests/functions/tracef/ Log: This wasn't necessary From wozniak at ci.uchicago.edu Fri Jun 3 11:46:02 2011 From: wozniak at ci.uchicago.edu (wozniak at ci.uchicago.edu) Date: Fri, 3 Jun 2011 11:46:02 -0500 (CDT) Subject: [Swift-commit] r4552 - in trunk/tests: functions language-behaviour Message-ID: <20110603164602.AFFAF9CC9C@svn.ci.uchicago.edu> Author: wozniak Date: 2011-06-03 11:46:02 -0500 (Fri, 03 Jun 2011) New Revision: 4552 Added: trunk/tests/functions/tracef.swift Removed: trunk/tests/language-behaviour/tracef.swift Log: Move tracef tests Copied: trunk/tests/functions/tracef.swift (from rev 4548, trunk/tests/language-behaviour/tracef.swift) =================================================================== --- trunk/tests/functions/tracef.swift (rev 0) +++ trunk/tests/functions/tracef.swift 2011-06-03 16:46:02 UTC (rev 4552) @@ -0,0 +1,4 @@ + +tracef("3:%i\n", 3); +tracef("4:%s\n", "4"); +tracef("fraction:%f\n", 22.0/7.0); Deleted: trunk/tests/language-behaviour/tracef.swift =================================================================== --- trunk/tests/language-behaviour/tracef.swift 2011-06-03 16:44:44 UTC (rev 4551) +++ trunk/tests/language-behaviour/tracef.swift 2011-06-03 16:46:02 UTC (rev 4552) @@ -1,4 +0,0 @@ - -tracef("3:%i\n", 3); -tracef("4:%s\n", "4"); -tracef("fraction:%f\n", 22.0/7.0); From wozniak at ci.uchicago.edu Fri Jun 3 11:49:01 2011 From: wozniak at ci.uchicago.edu (wozniak at ci.uchicago.edu) Date: Fri, 3 Jun 2011 11:49:01 -0500 (CDT) Subject: [Swift-commit] r4553 - trunk/tests/functions Message-ID: <20110603164901.8516E9CC9C@svn.ci.uchicago.edu> Author: wozniak Date: 2011-06-03 11:49:01 -0500 (Fri, 03 Jun 2011) New Revision: 4553 Added: trunk/tests/functions/450-tracef.swift Removed: trunk/tests/functions/tracef.swift Log: Add sort key to tracef test Copied: trunk/tests/functions/450-tracef.swift (from rev 4552, trunk/tests/functions/tracef.swift) =================================================================== --- trunk/tests/functions/450-tracef.swift (rev 0) +++ trunk/tests/functions/450-tracef.swift 2011-06-03 16:49:01 UTC (rev 4553) @@ -0,0 +1,4 @@ + +tracef("3:%i\n", 3); +tracef("4:%s\n", "4"); +tracef("fraction:%f\n", 22.0/7.0); Deleted: trunk/tests/functions/tracef.swift =================================================================== --- trunk/tests/functions/tracef.swift 2011-06-03 16:46:02 UTC (rev 4552) +++ trunk/tests/functions/tracef.swift 2011-06-03 16:49:01 UTC (rev 4553) @@ -1,4 +0,0 @@ - -tracef("3:%i\n", 3); -tracef("4:%s\n", "4"); -tracef("fraction:%f\n", 22.0/7.0); From wozniak at ci.uchicago.edu Fri Jun 3 11:58:36 2011 From: wozniak at ci.uchicago.edu (wozniak at ci.uchicago.edu) Date: Fri, 3 Jun 2011 11:58:36 -0500 (CDT) Subject: [Swift-commit] r4554 - trunk/tests Message-ID: <20110603165836.CE26D9CC9C@svn.ci.uchicago.edu> Author: wozniak Date: 2011-06-03 11:58:36 -0500 (Fri, 03 Jun 2011) New Revision: 4554 Modified: trunk/tests/suite.sh Log: Fix error in usage notes Modified: trunk/tests/suite.sh =================================================================== --- trunk/tests/suite.sh 2011-06-03 16:49:01 UTC (rev 4553) +++ trunk/tests/suite.sh 2011-06-03 16:58:36 UTC (rev 4554) @@ -119,7 +119,7 @@ # to files in RUNDIR and environment variables from suite.sh # such as $GROUP. Thus, you can: # bring in input files: cp $GROUP/input-file.txt . -# check output: grep TEXT1 exec.out +# check output: grep TEXT1 stdout.txt # grep TEXT2 output-file.txt # clean up (optional): rm output-file.txt # The results are added to the HTML output, etc., automatically. From davidk at ci.uchicago.edu Fri Jun 3 12:32:56 2011 From: davidk at ci.uchicago.edu (davidk at ci.uchicago.edu) Date: Fri, 3 Jun 2011 12:32:56 -0500 (CDT) Subject: [Swift-commit] r4555 - trunk/docs Message-ID: <20110603173256.603ED9CCC8@svn.ci.uchicago.edu> Author: davidk Date: 2011-06-03 12:32:56 -0500 (Fri, 03 Jun 2011) New Revision: 4555 Modified: trunk/docs/build_docs.sh Log: Fix for build_docs to copy all files in docs directory rather than just html and pdf output (may include charts, graphics, etc) Modified: trunk/docs/build_docs.sh =================================================================== --- trunk/docs/build_docs.sh 2011-06-03 16:58:36 UTC (rev 4554) +++ trunk/docs/build_docs.sh 2011-06-03 17:32:56 UTC (rev 4555) @@ -49,18 +49,12 @@ mkdir $INSTALLATION_DIRECTORY/$VERSION/$directory || crash "Unable to create directory $INSTALLATION_DIRECTORY/$VERSION/$directory" fi - # Copy HTML output - for copyfile in `ls *.html 2>/dev/null` + # Copy all files to destination (may include graphics, etc) + for copyfile in `ls * 2>/dev/null` do cp $copyfile $INSTALLATION_DIRECTORY/$VERSION/$directory || crash "Unable to copy $copyfile to $INSTALLATION_DIRECTORY/$VERSION/$directory" done - # Copy PDF output - for copyfile in `ls *.pdf 2>/dev/null` - do - cp $copyfile $INSTALLATION_DIRECTORY/$VERSION/$directory || crash "Unable to copy $copyfile to $INSTALLATION_DIRECTORY/$VERSION/$directory" - done - popd > /dev/null 2>&1 done popd > /dev/null 2>&1 From tga at ci.uchicago.edu Fri Jun 3 13:40:35 2011 From: tga at ci.uchicago.edu (tga at ci.uchicago.edu) Date: Fri, 3 Jun 2011 13:40:35 -0500 (CDT) Subject: [Swift-commit] r4556 - in SwiftApps/SwiftR/Swift: R exec Message-ID: <20110603184035.8B3ED9CC9C@svn.ci.uchicago.edu> Author: tga Date: 2011-06-03 13:40:35 -0500 (Fri, 03 Jun 2011) New Revision: 4556 Modified: SwiftApps/SwiftR/Swift/R/Apply.R SwiftApps/SwiftR/Swift/exec/EvalRBatchPersistent.sh SwiftApps/SwiftR/Swift/exec/start-swift SwiftApps/SwiftR/Swift/exec/start-swift-daemon Log: No longer assumes that /tmp/$USER is writable - falls back to a random temporary directory and gives meaningful error messages when misconfigured. Modified: SwiftApps/SwiftR/Swift/R/Apply.R =================================================================== --- SwiftApps/SwiftR/Swift/R/Apply.R 2011-06-03 17:32:56 UTC (rev 4555) +++ SwiftApps/SwiftR/Swift/R/Apply.R 2011-06-03 18:40:35 UTC (rev 4556) @@ -199,7 +199,16 @@ requestid = getOption(".swift.requestid") + 1; } else { - requestdirbase = file.path(tmpdir, Sys.info()[["user"]],"SwiftR", + topdir <- file.path(tmpdir, Sys.info()[["user"]],"SwiftR") + if (!dir.create(topdir,recursive=TRUE,showWarnings=FALSE, + mode=kDIR_MODE)) { + oldtopdir <- topdir + topdir <- tempdir() + warning(paste("Could not create working directory", oldtopdir, + "instead using", topdir)) + } + + requestdirbase = file.path(topdir, sprintf("requests.P%.5d",Sys.getpid())) dir.create(requestdirbase,recursive=TRUE,showWarnings=FALSE, mode=kDIR_MODE) Modified: SwiftApps/SwiftR/Swift/exec/EvalRBatchPersistent.sh =================================================================== --- SwiftApps/SwiftR/Swift/exec/EvalRBatchPersistent.sh 2011-06-03 17:32:56 UTC (rev 4555) +++ SwiftApps/SwiftR/Swift/exec/EvalRBatchPersistent.sh 2011-06-03 18:40:35 UTC (rev 4556) @@ -88,6 +88,19 @@ # Ensure that the dir for this slot exists. BASEDIR=$tmp/$(id -nu)/SwiftR/Rworkers +if mkdir -p $BASEDIR; then + : +else + OLD_BASEDIR=$BASEDIR + BASEDIR=$tmp/SwiftR.${SWIFT_WORKER_PID}.Rworkers + mkdir -p $BASEDIR + basedir_ok=$? + if [ $basedir_ok != 0 ]; then + echo "Could not create worker directory in either $OLD_BASEDIR or $BASEDIR" + exit 1 + fi +fi + WORKERDIR=$BASEDIR/worker.$SWIFT_WORKER_PID SLOTDIR=$WORKERDIR/${SWIFT_JOB_SLOT} Modified: SwiftApps/SwiftR/Swift/exec/start-swift =================================================================== --- SwiftApps/SwiftR/Swift/exec/start-swift 2011-06-03 17:32:56 UTC (rev 4555) +++ SwiftApps/SwiftR/Swift/exec/start-swift 2011-06-03 18:40:35 UTC (rev 4556) @@ -42,7 +42,7 @@ { get-contact LOGDIR=$(pwd)/swiftworkerlogs # full path. FIXME: Generate this with remote-side paths if not shared dir env? - LOGDIR=$tmp/$USER/SwiftR/swiftworkerlogs # FIXME: left this in /tmp so it works on any host. Better way? + LOGDIR=$topdir/swiftworkerlogs # FIXME: left this in /tmp so it works on any host. Better way? # mkdir -p $LOGDIR # is done with the ssh command, below @@ -319,7 +319,7 @@ { get-contact LOGDIR=$(pwd)/swiftworkerlogs # full path. FIXME: Generate this with remote-side paths if not shared dir env? - LOGDIR=/tmp/$USER/SwiftR/swiftworkerlogs # FIXME: left this in /tmp so it works on any host. Better way? + LOGDIR=$topdir/swiftworkerlogs # FIXME: left this in /tmp so it works on any host. Better way? mkdir -p $LOGDIR @@ -434,7 +434,7 @@ argname=$1; shift #check if positive integer if [ "$1" -gt 0 ] 2> /dev/null; then - time_secs=$time + time_secs=$(( $time * 60 )) # echo time_secs: $time_secs return 0 fi @@ -580,26 +580,43 @@ source $SWIFTRBIN/compat-setup SWIFTBIN=$SWIFTRBIN/../swift/bin # This depends on ~/SwiftR/Swift/swift being a symlink to swift in RLibrary/Swift -rundir=$tmp/$USER/SwiftR/swift.$server # rundir prefix # FIXME: handle multiple concurent independent swift servers per user -mkdir -p $(dirname $rundir) + # Setup a working directory if [ "$workdir" = NONE ] then + topdir=$tmp/$USER/SwiftR + + if mkdir -p $topdir 2> /dev/null ; then + : + else + topdir=$(mktemp -d $tmp/SwiftR.XXXXXX) + created_ok=$? + if [ "$created_ok" -ne 0 ]; then + echo "Could not create temporary directory under $tmp" + exit 1 + fi + fi + + rundir=$topdir/swift.$server # rundir prefix doack=FALSE - trundir=$(mktemp -d $rundir.XXXX) # FIXME: check success - if [ "$?" != "0" ] + trundir=$(mktemp -d $rundir.XXXX) + created_ok=$? + if [ "$created_ok" -ne 0 ] then - echo "Could not create temporary directory under $tmp/$USER/SwiftR" + echo "Could not create temporary directory under $topdir/SwiftR" exit 1 fi else + topdir=`dirname "$workdir"` + rundir=$topdir/swift.$server # rundir prefix doack=TRUE # let -daemon script know when we are done echo Working in $workdir trundir=$workdir mkdir -p $workdir fi +# link temporary dir with different server name rm -f $rundir ln -s $trundir $rundir Modified: SwiftApps/SwiftR/Swift/exec/start-swift-daemon =================================================================== --- SwiftApps/SwiftR/Swift/exec/start-swift-daemon 2011-06-03 17:32:56 UTC (rev 4555) +++ SwiftApps/SwiftR/Swift/exec/start-swift-daemon 2011-06-03 18:40:35 UTC (rev 4556) @@ -6,20 +6,33 @@ # This script forks off a child process, detaches it # and then, as the only thing written to stdout, echoes # the pid of start-swift +set -x ssscript=`dirname $0`/start-swift # Choose a working directory tmp=${SWIFTR_TMP:-/tmp} -mkdir -p $tmp/$USER/SwiftR -workdir=$(mktemp -d $tmp/$USER/SwiftR/swift.XXXX) +topdir=$tmp/$USER/SwiftR +if mkdir -p $topdir 2> /dev/null ; then + : +else + topdir=$(mktemp -d $tmp/SwiftR.XXXXXX) + created_ok=$? + if [ $created_ok -ne 0 ]; then + echo "Could not create temporary directory under $tmp" + exit 1 + fi +fi + +workdir=$(mktemp -d $topdir/swift.XXXX) + ackfifo=$workdir/ackfifo mkfifo $ackfifo if [ "$?" != "0" ] then - echo "Could not create temporary directory under $tmp/$USER/SwiftR" + echo "Could not create temporary directory under $topdir" exit 1 fi From tga at ci.uchicago.edu Fri Jun 3 13:46:22 2011 From: tga at ci.uchicago.edu (tga at ci.uchicago.edu) Date: Fri, 3 Jun 2011 13:46:22 -0500 (CDT) Subject: [Swift-commit] r4557 - SwiftApps/SwiftR/Swift/exec Message-ID: <20110603184622.896049CC9C@svn.ci.uchicago.edu> Author: tga Date: 2011-06-03 13:46:22 -0500 (Fri, 03 Jun 2011) New Revision: 4557 Modified: SwiftApps/SwiftR/Swift/exec/start-swift-daemon Log: didn't disable tracing. Modified: SwiftApps/SwiftR/Swift/exec/start-swift-daemon =================================================================== --- SwiftApps/SwiftR/Swift/exec/start-swift-daemon 2011-06-03 18:40:35 UTC (rev 4556) +++ SwiftApps/SwiftR/Swift/exec/start-swift-daemon 2011-06-03 18:46:22 UTC (rev 4557) @@ -6,7 +6,6 @@ # This script forks off a child process, detaches it # and then, as the only thing written to stdout, echoes # the pid of start-swift -set -x ssscript=`dirname $0`/start-swift # Choose a working directory From tga at ci.uchicago.edu Fri Jun 3 13:54:49 2011 From: tga at ci.uchicago.edu (tga at ci.uchicago.edu) Date: Fri, 3 Jun 2011 13:54:49 -0500 (CDT) Subject: [Swift-commit] r4558 - SwiftApps/SwiftR/Swift/R Message-ID: <20110603185449.D95E59CC9C@svn.ci.uchicago.edu> Author: tga Date: 2011-06-03 13:54:44 -0500 (Fri, 03 Jun 2011) New Revision: 4558 Modified: SwiftApps/SwiftR/Swift/R/Apply.R Log: Did not correctly detect when request directory already existed. Modified: SwiftApps/SwiftR/Swift/R/Apply.R =================================================================== --- SwiftApps/SwiftR/Swift/R/Apply.R 2011-06-03 18:46:22 UTC (rev 4557) +++ SwiftApps/SwiftR/Swift/R/Apply.R 2011-06-03 18:54:44 UTC (rev 4558) @@ -202,10 +202,13 @@ topdir <- file.path(tmpdir, Sys.info()[["user"]],"SwiftR") if (!dir.create(topdir,recursive=TRUE,showWarnings=FALSE, mode=kDIR_MODE)) { - oldtopdir <- topdir - topdir <- tempdir() - warning(paste("Could not create working directory", oldtopdir, - "instead using", topdir)) + # Might already have existed + if (!file.exists(topdir) && file.info(topdir)$isdir) { + oldtopdir <- topdir + topdir <- tempdir() + warning(paste("Could not create working directory", oldtopdir, + "instead using", topdir)) + } } requestdirbase = file.path(topdir, From wozniak at ci.uchicago.edu Fri Jun 3 14:10:23 2011 From: wozniak at ci.uchicago.edu (wozniak at ci.uchicago.edu) Date: Fri, 3 Jun 2011 14:10:23 -0500 (CDT) Subject: [Swift-commit] r4559 - trunk/src/org/griphyn/vdl/karajan/lib/swiftscript Message-ID: <20110603191023.79FAC9CC9C@svn.ci.uchicago.edu> Author: wozniak Date: 2011-06-03 14:10:23 -0500 (Fri, 03 Jun 2011) New Revision: 4559 Modified: trunk/src/org/griphyn/vdl/karajan/lib/swiftscript/Sprintf.java trunk/src/org/griphyn/vdl/karajan/lib/swiftscript/Tracef.java Log: Update tracef(), sprintf() functionality Modified: trunk/src/org/griphyn/vdl/karajan/lib/swiftscript/Sprintf.java =================================================================== --- trunk/src/org/griphyn/vdl/karajan/lib/swiftscript/Sprintf.java 2011-06-03 18:54:44 UTC (rev 4558) +++ trunk/src/org/griphyn/vdl/karajan/lib/swiftscript/Sprintf.java 2011-06-03 19:10:23 UTC (rev 4559) @@ -55,13 +55,14 @@ return result; } - private String format(DSHandle[] args) + public static String format(DSHandle[] args) throws ExecutionException { if (! (args[0].getType() == Types.STRING)) throw new ExecutionException ("First argument to sprintf() must be a string!"); - String spec = args[0].toString(); + String spec = (String) args[0].getValue(); + logger.debug("spec: " + spec); DSHandle[] vars = copyArray(args, 1, args.length-1); StringBuilder output = new StringBuilder(); @@ -71,7 +72,7 @@ } public static DSHandle[] copyArray(DSHandle[] src, - int offset, int length) + int offset, int length) { DSHandle[] result = new DSHandle[length]; @@ -99,7 +100,7 @@ } else if (c == '\\') { char d = spec.charAt(++i); - escape(d, output); + escape(i, spec, d, output); } else { output.append(c); @@ -107,7 +108,7 @@ i++; } } - + private static int append(char c, int arg, DSHandle[] vars, StringBuilder output) throws ExecutionException { @@ -147,7 +148,7 @@ return arg+1; } - private static void append_M(DSHandle arg, StringBuilder output) + private static void append_M(DSHandle arg, StringBuilder output) throws ExecutionException { try { synchronized (arg.getRoot()) { @@ -167,7 +168,7 @@ private static void append_f(DSHandle arg, StringBuilder output) throws ExecutionException { if (arg.getType() == Types.FLOAT) { - output.append(arg).toString(); + output.append(arg.getValue()); } else { throw new ExecutionException @@ -178,7 +179,8 @@ private static void append_i(DSHandle arg, StringBuilder output) throws ExecutionException { if (arg.getType() == Types.INT) { - output.append(arg).toString(); + Double d = (Double) arg.getValue(); + output.append(new Integer(d.intValue())); } else { throw new ExecutionException @@ -197,7 +199,7 @@ String entry = ""+i; DSHandle handle = node.getField(Path.parse(entry)); - output.append(handle); + output.append(handle.getValue()); if (i < size-1) output.append(","); } @@ -218,7 +220,7 @@ private static void append_s(DSHandle arg, StringBuilder output) throws ExecutionException { if (arg.getType() == Types.STRING) { - output.append(arg).toString(); + output.append(arg.getValue()); } else { throw new ExecutionException @@ -226,7 +228,12 @@ } } - private static void escape(char c, StringBuilder output) + /** + * @param i Only used for error messages + * @param spec Only used for error messages + */ + private static void escape(int i, String spec, + char c, StringBuilder output) throws ExecutionException { if (c == '\\') { output.append('\\'); @@ -239,7 +246,9 @@ } else { throw new ExecutionException - ("tracef(): unknown backslash escape sequence!"); + ("tracef(): unknown backslash escape sequence! " + + "(\\" + c + ")\n" + + "\t in " + spec + " character: " + i); } } } Modified: trunk/src/org/griphyn/vdl/karajan/lib/swiftscript/Tracef.java =================================================================== --- trunk/src/org/griphyn/vdl/karajan/lib/swiftscript/Tracef.java 2011-06-03 18:54:44 UTC (rev 4558) +++ trunk/src/org/griphyn/vdl/karajan/lib/swiftscript/Tracef.java 2011-06-03 19:10:23 UTC (rev 4559) @@ -37,12 +37,7 @@ VDLFunction.waitFor(stack, handle); } - String spec = args[0].toString(); - DSHandle[] vars = Sprintf.copyArray(args, 1, args.length-1); - - StringBuilder output = new StringBuilder(); - Sprintf.format(spec, vars, output); - String msg = output.toString(); + String msg = Sprintf.format(args); logger.info(msg); System.out.print(msg); return null; From wozniak at ci.uchicago.edu Fri Jun 3 14:13:53 2011 From: wozniak at ci.uchicago.edu (wozniak at ci.uchicago.edu) Date: Fri, 3 Jun 2011 14:13:53 -0500 (CDT) Subject: [Swift-commit] r4560 - trunk/tests/functions Message-ID: <20110603191353.4EFCF9CC9C@svn.ci.uchicago.edu> Author: wozniak Date: 2011-06-03 14:13:53 -0500 (Fri, 03 Jun 2011) New Revision: 4560 Added: trunk/tests/functions/450-tracef.check.sh Modified: trunk/tests/functions/450-tracef.swift Log: Update tracef() tests Added: trunk/tests/functions/450-tracef.check.sh =================================================================== --- trunk/tests/functions/450-tracef.check.sh (rev 0) +++ trunk/tests/functions/450-tracef.check.sh 2011-06-03 19:13:53 UTC (rev 4560) @@ -0,0 +1,15 @@ +#!/bin/bash + +set -x + +grep "int:3:3" stdout.txt || exit 1 +grep "string:4:4" stdout.txt || exit 1 +grep "fraction:3.14" stdout.txt || exit 1 +grep "file:file:.*/test.txt" stdout.txt || exit 1 +grep "array:\[9.0,91.0,19.0\]" stdout.txt || exit 1 +grep "pointer:.*Closed" stdout.txt || exit 1 + +[[ $( grep -c "WORD" stdout.txt ) == 2 ]] || exit 1 +[[ $( grep "WORD" stdout.txt | wc -w ) == 5 ]] || exit 1 + +exit 0 Property changes on: trunk/tests/functions/450-tracef.check.sh ___________________________________________________________________ Added: svn:executable + * Modified: trunk/tests/functions/450-tracef.swift =================================================================== --- trunk/tests/functions/450-tracef.swift 2011-06-03 19:10:23 UTC (rev 4559) +++ trunk/tests/functions/450-tracef.swift 2011-06-03 19:13:53 UTC (rev 4560) @@ -1,4 +1,20 @@ -tracef("3:%i\n", 3); -tracef("4:%s\n", "4"); +tracef("int:3:%i\n", 3); +tracef("string:4:%s\n", "4"); tracef("fraction:%f\n", 22.0/7.0); + +type file; +file f<"test.txt">; +tracef("file:%M\n", f); + +int i[]; +i[0] = 9; +i[1] = 91; +i[2] = 19; +tracef("array:%q\n", i); + +tracef("pointer:%p\n", 3); +tracef("spacing: WORD\tWORD\nWORD\tWORD\n"); + +// TODO: Debug the Swift parser- it handles backslash strangely +// tracef("backslash2: \\ \ qq \\\\ \\n"); From wozniak at ci.uchicago.edu Fri Jun 3 15:07:13 2011 From: wozniak at ci.uchicago.edu (wozniak at ci.uchicago.edu) Date: Fri, 3 Jun 2011 15:07:13 -0500 (CDT) Subject: [Swift-commit] r4561 - trunk/docs/userguide Message-ID: <20110603200713.8DF5D9CCC8@svn.ci.uchicago.edu> Author: wozniak Date: 2011-06-03 15:07:13 -0500 (Fri, 03 Jun 2011) New Revision: 4561 Modified: trunk/docs/userguide/userguide.txt Log: Document tracef() Modified: trunk/docs/userguide/userguide.txt =================================================================== --- trunk/docs/userguide/userguide.txt 2011-06-03 19:13:53 UTC (rev 4560) +++ trunk/docs/userguide/userguide.txt 2011-06-03 20:07:13 UTC (rev 4561) @@ -1661,7 +1661,6 @@ used with @arg to pass input parameters to a SwiftScript program as integers. - Built-in procedure reference ---------------------------- This section details built-in procedures that are available for use in @@ -1733,6 +1732,38 @@ log message. The particular output format should not be relied upon. (since Swift 0.4) +tracef +~~~~~~ + ++tracef(_spec_, _variable list_)+ will log its parameters as formatted +by the formatter _spec_. _spec_ must be a string. Checks the type of +the specifiers arguments against the variable list and allows for +certain escape characters. + +Example: +---- +int i = 3; +tracef("%s: %i\n", "the value is", i); +---- + +Specifiers: + ++%s+:: Format a string. ++%i+:: Format a number as an integer. ++%f+:: Format a number as a floating point number. ++%q+:: Format an array. ++%M+:: Format a mapped variable's filename. ++%k+:: Wait for the given variable but do not format it. ++%p+:: Format variable according to an internal format. + +Escape sequences: + ++\n+:: Produce a newline. ++\t+:: Produce a tab. + +Known issues: :: Swift does not correctly scan certain backslash +sequences such as +\\+. + writeData ~~~~~~~~~ writeData will write out data structures in the format described for From tga at ci.uchicago.edu Fri Jun 3 15:27:02 2011 From: tga at ci.uchicago.edu (tga at ci.uchicago.edu) Date: Fri, 3 Jun 2011 15:27:02 -0500 (CDT) Subject: [Swift-commit] r4562 - in SwiftApps/SwiftR/Swift: R exec Message-ID: <20110603202702.14EDD9CC9C@svn.ci.uchicago.edu> Author: tga Date: 2011-06-03 15:27:01 -0500 (Fri, 03 Jun 2011) New Revision: 4562 Modified: SwiftApps/SwiftR/Swift/R/Workers.R SwiftApps/SwiftR/Swift/exec/configure-server-cobalt SwiftApps/SwiftR/Swift/exec/configure-server-crayxt SwiftApps/SwiftR/Swift/exec/configure-server-local SwiftApps/SwiftR/Swift/exec/configure-server-pbs SwiftApps/SwiftR/Swift/exec/configure-server-pbsauto SwiftApps/SwiftR/Swift/exec/configure-server-sge SwiftApps/SwiftR/Swift/exec/configure-server-ssh SwiftApps/SwiftR/Swift/exec/rserver.swift SwiftApps/SwiftR/Swift/exec/start-swift Log: Added configurable number of task retries. found out that qsub sometimes returns code of 0 even on failure, added extra code to catch this case. Modified: SwiftApps/SwiftR/Swift/R/Workers.R =================================================================== --- SwiftApps/SwiftR/Swift/R/Workers.R 2011-06-03 20:07:13 UTC (rev 4561) +++ SwiftApps/SwiftR/Swift/R/Workers.R 2011-06-03 20:27:01 UTC (rev 4562) @@ -52,6 +52,7 @@ kernel=getOption("swift.kernel"), workmode=getOption("swift.workmode"), throttle=getOption("swift.throttle"), + retries=getOption("swift.retries"), queue=getOption("swift.queue"), rcmd=getOption("swift.rcmd"), time=getOption("swift.time"), workerLogging=getOption("swift.workerLogging"), @@ -138,6 +139,9 @@ if(! is.null(workmode) ) { cmdString <- paste(cmdString, "-m", shQuote(workmode)) } + if (! is.null(retries) ) { + cmdString <- paste(cmdString, "-retries", shQuote(retries)) + } if (server == "local") nodes <- 1 Modified: SwiftApps/SwiftR/Swift/exec/configure-server-cobalt =================================================================== --- SwiftApps/SwiftR/Swift/exec/configure-server-cobalt 2011-06-03 20:07:13 UTC (rev 4561) +++ SwiftApps/SwiftR/Swift/exec/configure-server-cobalt 2011-06-03 20:27:01 UTC (rev 4562) @@ -27,7 +27,7 @@ cat >cf <cf <cf <cf <cf <cf <cf < $jobidfile succ=$? + fi if [ $succ -eq 0 ] then - echo Started workers from batch job $(cat $jobidfile) + + # torque's error code is 0 sometimes when failed: make sure there + # is something in job id file + jobid=$(cat $jobidfile) + jobid=`echo $jobid` + if [ -z "$jobid" ]; then + echo Batch queue submission failed, exiting. + if [ "$doack" = TRUE ]; then + echo "Error: batch submission failed: qsub returned $succ" > ackfifo + fi + stdcleanup_start + stdcleanup_end + exit 1 + fi + echo Started workers from batch job $jobid if [ "$doack" = TRUE ]; then echo ok > ackfifo fi @@ -531,6 +546,7 @@ defaultSshCores=4 defaultClusterCores=8 throttle=10 +num_retries=0 hosts=no-hosts-specified queue=NONE project=NONE @@ -571,6 +587,7 @@ --tc.file) tc_file=$2; shift ;; --sites.file) sites_file=$2; shift ;; --cf.file) cf_file=$2; shift ;; + -retries) num_retries=$2; verify-is-numeric num_retries $num_retries; shift ;; *) usage; exit 1 ;; esac shift From tga at ci.uchicago.edu Fri Jun 3 15:38:29 2011 From: tga at ci.uchicago.edu (tga at ci.uchicago.edu) Date: Fri, 3 Jun 2011 15:38:29 -0500 (CDT) Subject: [Swift-commit] r4563 - SwiftApps/SwiftR/Swift/exec Message-ID: <20110603203829.68D609CC9C@svn.ci.uchicago.edu> Author: tga Date: 2011-06-03 15:38:29 -0500 (Fri, 03 Jun 2011) New Revision: 4563 Modified: SwiftApps/SwiftR/Swift/exec/start-swift Log: eliminated extraneous error message Modified: SwiftApps/SwiftR/Swift/exec/start-swift =================================================================== --- SwiftApps/SwiftR/Swift/exec/start-swift 2011-06-03 20:27:01 UTC (rev 4562) +++ SwiftApps/SwiftR/Swift/exec/start-swift 2011-06-03 20:38:29 UTC (rev 4563) @@ -387,7 +387,7 @@ # torque's error code is 0 sometimes when failed: make sure there # is something in job id file - jobid=$(cat $jobidfile) + jobid=$(cat $jobidfile 2> /dev/null) jobid=`echo $jobid` if [ -z "$jobid" ]; then echo Batch queue submission failed, exiting. @@ -834,7 +834,7 @@ coasterservicepid="" # null: saved in case we go back to using coaster servers trap - $TRAPEVENTS - jobid=$(cat $jobidfile) + jobid=$(cat $jobidfile 2> /dev/null) echo Terminating worker processes starter $starterpid and batch job $jobid if [ "_$starterpid" != _ ]; then kill $starterpid &> /dev/null From jonmon at ci.uchicago.edu Sat Jun 4 16:37:18 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Sat, 4 Jun 2011 16:37:18 -0500 (CDT) Subject: [Swift-commit] r4564 - trunk/bin Message-ID: <20110604213718.9BE929CC9C@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-04 16:37:18 -0500 (Sat, 04 Jun 2011) New Revision: 4564 Modified: trunk/bin/gensites Log: Added internalhostname variable for gensites Modified: trunk/bin/gensites =================================================================== --- trunk/bin/gensites 2011-06-03 20:38:29 UTC (rev 4563) +++ trunk/bin/gensites 2011-06-04 21:37:18 UTC (rev 4564) @@ -175,6 +175,9 @@ "#site $TEMPLATE execution_url="*|'#site slots='*) EXECUTION_URL=`get_value $line` ;; + "#site $TEMPLATE internalhostname="*|'#site internalhostname='*) + INTERNALHOSTNAME=`get_value $line` + ;; esac done < $PROPERTIES_FILE @@ -182,7 +185,7 @@ [[ ${WORK} == "" ]] && crash "Not specified: WORK" # Verify that the variables by the template are defined -for TOKEN in PROJECT QUEUE N_GRAN N_MAX SLOTS +for TOKEN in PROJECT QUEUE N_GRAN N_MAX SLOTS INTERNALHOSTNAME do # Need but can't find, due if grep _${TOKEN}_ $TEMPLATE_PATH > /dev/null; then @@ -203,6 +206,7 @@ echo "s/_N_GRAN_/${N_GRAN}/" echo "s/_N_MAX_/${N_MAX}/" echo "s/_SLOTS_/${SLOTS}/" + echo "s/_INTERNALHOSTNAME_/${INTERNALHOSTNAME}/" echo "s/_MAXTIME_/${MAXTIME}/" echo "s at _EXECUTION_URL_@${EXECUTION_URL}@" echo "s at _SERVICE_COASTERS_@${SERVICE_COASTERS:-NO_URL_GIVEN}@" From davidk at ci.uchicago.edu Sun Jun 5 00:05:50 2011 From: davidk at ci.uchicago.edu (davidk at ci.uchicago.edu) Date: Sun, 5 Jun 2011 00:05:50 -0500 (CDT) Subject: [Swift-commit] r4565 - trunk/bin Message-ID: <20110605050550.3C0AD9CC9C@svn.ci.uchicago.edu> Author: davidk Date: 2011-06-05 00:05:50 -0500 (Sun, 05 Jun 2011) New Revision: 4565 Modified: trunk/bin/gensites Log: Fixed a few issues with gensites working with start-coaster-service Modified: trunk/bin/gensites =================================================================== --- trunk/bin/gensites 2011-06-04 21:37:18 UTC (rev 4564) +++ trunk/bin/gensites 2011-06-05 05:05:50 UTC (rev 4565) @@ -172,7 +172,7 @@ "#site $TEMPLATE slots="*|'#site slots='*) SLOTS=`get_value $line` ;; - "#site $TEMPLATE execution_url="*|'#site slots='*) + "#site $TEMPLATE execution_url="*|'#site execution_url='*) EXECUTION_URL=`get_value $line` ;; "#site $TEMPLATE internalhostname="*|'#site internalhostname='*) @@ -185,7 +185,7 @@ [[ ${WORK} == "" ]] && crash "Not specified: WORK" # Verify that the variables by the template are defined -for TOKEN in PROJECT QUEUE N_GRAN N_MAX SLOTS INTERNALHOSTNAME +for TOKEN in NODES HOST WORK PROJECT QUEUE N_GRAN N_MAX SLOTS INTERNALHOSTNAME MAXTIME EXECUTION_URL do # Need but can't find, due if grep _${TOKEN}_ $TEMPLATE_PATH > /dev/null; then From jonmon at ci.uchicago.edu Mon Jun 6 10:54:26 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Mon, 6 Jun 2011 10:54:26 -0500 (CDT) Subject: [Swift-commit] r4567 - SwiftApps/Montage/scripts Message-ID: <20110606155426.775469CCA5@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-06 10:54:26 -0500 (Mon, 06 Jun 2011) New Revision: 4567 Modified: SwiftApps/Montage/scripts/Swift_Montage_Apps.swift SwiftApps/Montage/scripts/Swift_Montage_Batch.swift Log: Modifications to the Montage wrappers o Fixed typo in mShrink app procedure o Switched to not explicitly mapping a file in some cases of the batch functions Modified: SwiftApps/Montage/scripts/Swift_Montage_Apps.swift =================================================================== --- SwiftApps/Montage/scripts/Swift_Montage_Apps.swift 2011-06-06 15:19:20 UTC (rev 4566) +++ SwiftApps/Montage/scripts/Swift_Montage_Apps.swift 2011-06-06 15:54:26 UTC (rev 4567) @@ -73,7 +73,7 @@ app ( Image shrunk ) mShrink( Image original, int factor ) { - mShrink @orginial @shrunk factor; + mShrink @original @shrunk factor; } /*----------------------------------------------------------------------------------*/ Modified: SwiftApps/Montage/scripts/Swift_Montage_Batch.swift =================================================================== --- SwiftApps/Montage/scripts/Swift_Montage_Batch.swift 2011-06-06 15:19:20 UTC (rev 4566) +++ SwiftApps/Montage/scripts/Swift_Montage_Batch.swift 2011-06-06 15:54:26 UTC (rev 4567) @@ -1,7 +1,6 @@ ( Image corr_imgs[] ) mBgBatch( Image bg_imgs[], Table img_tbl, Table corr_tbl ) { - Table tmp <"back_tmp.tbl">; - tmp = Background_list( img_tbl, corr_tbl ); + Table back_list = Background_list( img_tbl, corr_tbl ); BackgroundStruct back_struct[] = readData2( tmp ); @@ -41,8 +40,7 @@ { Status stats[] ; - Table status_tbl <"stats.tbl">; - status_tbl = create_status_table( diff_tbl ); + Table status_tbl = create_status_table( diff_tbl ); foreach img, i in stats { From jonmon at ci.uchicago.edu Mon Jun 6 10:57:09 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Mon, 6 Jun 2011 10:57:09 -0500 (CDT) Subject: [Swift-commit] r4568 - SwiftApps/Montage Message-ID: <20110606155709.D74429CCA5@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-06 10:57:09 -0500 (Mon, 06 Jun 2011) New Revision: 4568 Modified: SwiftApps/Montage/TODO Log: Deleted some items from the Montage TODO list Modified: SwiftApps/Montage/TODO =================================================================== --- SwiftApps/Montage/TODO 2011-06-06 15:54:26 UTC (rev 4567) +++ SwiftApps/Montage/TODO 2011-06-06 15:57:09 UTC (rev 4568) @@ -3,12 +3,10 @@ -- Need to fix mProjectBatch. Currently calls mProject blindly. Need to figure out how to choose between mProject and mProjectPP o exec/montage.sh - -- Fix how to calculate the run directory -- Figure out how to specify what site location that are going to be run on and do gensites on the templates - -- Make sure all environment variables are set that are needed to run the execution script o optimizations - -- Create different pool entries. One for projectiog, calculating difference images, and background rectification. Each one will require different number of workers to execute with so different pool entries will be required. This will also change the tc.data files. + -- Try different sites.xml settings. Try different throttleing parameters as well as different queue sizes. o templates - -- Add more templates for other machines. For sure needs localhost + -- Add more templates for other machines. Add one for Beagle From jonmon at ci.uchicago.edu Mon Jun 6 12:24:42 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Mon, 6 Jun 2011 12:24:42 -0500 (CDT) Subject: [Swift-commit] r4569 - SwiftApps/Montage/scripts Message-ID: <20110606172442.AE45D9CCA5@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-06 12:24:42 -0500 (Mon, 06 Jun 2011) New Revision: 4569 Modified: SwiftApps/Montage/scripts/Swift_Montage_Batch.swift Log: Forgot to update a variable name in Montage wrappers Modified: SwiftApps/Montage/scripts/Swift_Montage_Batch.swift =================================================================== --- SwiftApps/Montage/scripts/Swift_Montage_Batch.swift 2011-06-06 15:57:09 UTC (rev 4568) +++ SwiftApps/Montage/scripts/Swift_Montage_Batch.swift 2011-06-06 17:24:42 UTC (rev 4569) @@ -2,7 +2,7 @@ { Table back_list = Background_list( img_tbl, corr_tbl ); - BackgroundStruct back_struct[] = readData2( tmp ); + BackgroundStruct back_struct[] = readData2( back_list ); foreach background_entry, i in back_struct { From davidk at ci.uchicago.edu Mon Jun 6 13:26:29 2011 From: davidk at ci.uchicago.edu (davidk at ci.uchicago.edu) Date: Mon, 6 Jun 2011 13:26:29 -0500 (CDT) Subject: [Swift-commit] r4570 - in trunk: bin etc Message-ID: <20110606182629.995239CCA5@svn.ci.uchicago.edu> Author: davidk Date: 2011-06-06 13:26:29 -0500 (Mon, 06 Jun 2011) New Revision: 4570 Modified: trunk/bin/start-coaster-service trunk/bin/stop-coaster-service trunk/etc/coaster-service.conf Log: Modifications to coaster scripts to test with futuregrid Modified: trunk/bin/start-coaster-service =================================================================== --- trunk/bin/start-coaster-service 2011-06-06 17:24:42 UTC (rev 4569) +++ trunk/bin/start-coaster-service 2011-06-06 18:26:29 UTC (rev 4570) @@ -8,6 +8,46 @@ exit 1 } +# Start futuregrid workers +start-workers-futuregrid() +{ + PORT=$1 + EXECUTION_URL=http://localhost:$PORT + + if [ ! -d "$SWIFTVMBOOT_DIR" ] || [ ! -x "$SWIFTVMBOOT_DIR/bin/bootit.sh" ]; then + crash "SWIFTVMBOOT_DIR incorrectly defined in coaster-service.conf" + fi + + echo Starting virtual machines.. please wait + #$SWIFTVMBOOT_DIR/bin/bootit.sh + SWIFTVMBOOT_OUTPUT=$SWIFTVMBOOT_DIR/output.json + + if [ ! -f "$SWIFTVMBOOT_OUTPUT" ]; then + crash "Error: Swift VM output file $SWIFTVMBOOT_OUTPUT does not exist!" + fi + + SWIFTVM_INSTANCES=`grep instance_id $SWIFTVMBOOT_OUTPUT |awk '{print $2}'|sed 's/\"//g;s/,//g;s/null//g'` + echo $SWIFTVM_INSTANCES > .swiftvm_instances + + WORKER_HOSTS=`grep hostname $SWIFTVMBOOT_OUTPUT |awk '{print $2}'|sed 's/\"//g;s/,//g;s/null//g'` + + # Start worker script + for MACHINE in $WORKER_HOSTS + do + # Enable ssh tunneling if needed + if [ $SSH_TUNNELING == "yes" ]; then + ssh -R *:$PORT:localhost:$PORT $WORKER_USERNAME@$MACHINE sleep 999 & + echo $! >> $PID_FILE + fi + + # Copy and start worker script + scp $SWIFT_BIN/$WORKER $WORKER_USERNAME@$MACHINE:$WORKER_WORK > /dev/null 2>&1 + echo "Starting worker on $MACHINE" + ssh $WORKER_USERNAME@$MACHINE $WORKER_WORK/$WORKER $EXECUTION_URL $MACHINE $LOG_DIR & + echo $! >> $PID_FILE + done +} + # Start SSH workers start-workers-ssh() { @@ -44,6 +84,9 @@ start-workers-cobalt() { PORT=$1 + if [ -z "$PORT" ]; then + crash "start-workers-cobalt: Port number not specified, giving up" + fi EXECUTION_URL=http://$IPADDR:$PORT local TIMESTAMP=$(date "+%Y.%m%d.%H%M%S") local -Z 5 R=${RANDOM} @@ -77,7 +120,7 @@ # Determine information needed about this machine if [ -z "$IPADDR" ]; then if [ -x "/sbin/ifconfig" ]; then - IPADDR=$( /sbin/ifconfig | grep inet | head -1 | cut -d ':' -f 2 | awk '{print $1}' ) + IPADDR=$( /sbin/ifconfig | grep 'inet addr' | grep -v 127.0.0.1 | cut -d ':' -f 2 | awk '{print $1}' |head -1) else crash "Unable to determine IP address of system. Please add to coaster-service.conf" fi @@ -174,9 +217,27 @@ cobalt) start-workers-cobalt $LOCAL_PORT ;; + futuregrid) + start-workers-futuregrid $LOCAL_PORT + ;; + *) + crash "Unknown WORKER_MODE. Please modify coaster-service.conf" + ;; esac # Generate sites.xml export EXECUTION_URL="http://$IPADDR:$SERVICE_PORT" echo Generating sites.xml.. gensites persistent-coasters -p $CONFIG_FILE > $RUN_DIR/sites.xml + +# Generate config file +if [ $SHARED_FILESYSTEM == "no" ]; then +cat > $RUN_DIR/cf << EOF +use.provider.staging=true +wrapperlog.always.transfer=false +execution.retries=0 +provider.staging.pin.swiftfiles=false +EOF +else + echo > $RUN_DIR/cf +fi Modified: trunk/bin/stop-coaster-service =================================================================== --- trunk/bin/stop-coaster-service 2011-06-06 17:24:42 UTC (rev 4569) +++ trunk/bin/stop-coaster-service 2011-06-06 18:26:29 UTC (rev 4570) @@ -1,8 +1,26 @@ #!/bin/bash +# Files relative to location of this script +PID_FILE=".coaster-service-pids" +SWIFTVM_INSTANCES=".swiftvm_instances" +CONFIG_FILE="../etc/coaster-service.conf" + +# crash: Report a problem and exit +crash() +{ + MSG=$1 + echo ${MSG} >&2 + exit 1 +} + pushd $(dirname $(readlink -f $0)) > /dev/null 2>&1 -PID_FILE=".coaster-service-pids" +# Read config file to determine worker mode +if [ -f "$CONFIG_FILE" ]; then + source "$CONFIG_FILE" +else + crash "Cannot find coaster-service.conf!" +fi echo Ending coaster processes.. if [ -f "$PID_FILE" ]; then @@ -20,4 +38,13 @@ fi echo Done +if [ $WORKER_MODE == "futuregrid" ] && [ -f "$SWIFTVM_INSTANCES" ]; then + for INSTANCE in `cat $SWIFTVM_INSTANCES` + do + $SWIFTVMBOOT_DIR/ve/bin/cloudinitd terminate $INSTANCE + done + rm $SWIFTVM_INSTANCES > /dev/null 2>&1 +fi + + popd > /dev/null 2>&1 Modified: trunk/etc/coaster-service.conf =================================================================== --- trunk/etc/coaster-service.conf 2011-06-06 17:24:42 UTC (rev 4569) +++ trunk/etc/coaster-service.conf 2011-06-06 18:26:29 UTC (rev 4570) @@ -1,33 +1,45 @@ # Keep all interesting settings in one place # User should modify this to fit environment -# Location of SWIFT. If empty, PATH is referenced +# Location of SWIFT. If empty, PATH is searched export SWIFT= -# Where to place/launch worker.pl on the remote machine for sites.xml -export WORKER_WORK=/home/${USER}/work +# Where to copy worker.pl on the remote machine for sites.xml +export WORKER_WORK=$HOME/swiftwork -# How to launch workers: local, ssh, or cobalt +# How to launch workers: local, ssh, cobalt, or futuregrid export WORKER_MODE=ssh # Worker logging setting passed to worker.pl for sites.xml export WORKER_LOGGING=INFO -# Worker host names for ssh +# SSH hosts to start workers on (ssh mode only) export WORKER_HOSTS="host1 host2 host3" +# Do all the worker nodes you're using have a shared filesystem? (yes/no) +export SHARED_FILESYSTEM=no + +# Username to use on worker nodes +export WORKER_USERNAME=$USER + +# Enable SSH tunneling? (yes/no) +export SSH_TUNNELING=no + # Directory to keep log files, relative to working directory when launching start-coaster-service export LOG_DIR=logs -# Manually define ports. If not specified, ports will be automatically generated +# Manually define ports. If not specified, an available port will be used export LOCAL_PORT= export SERVICE_PORT= -# start-coaster-service tries to automatically detect IP address. Specify here if auto detection is not working correctly +# start-coaster-service tries to automatically detect the IP address of this system. Specify here if you have multiple network interfaces export IPADDR= -# Below are various settings to give information about how to create sites.xml -export WORK=$HOME/work +# Location of the swift-vm-boot scripts +export SWIFTVMBOOT_DIR=$HOME/swift-vm-boot + +# Swift information for creating sites.xml +export WORK=$HOME/swiftwork export QUEUE=prod-devel export MAXTIME=20 export NODE=64 From davidk at ci.uchicago.edu Mon Jun 6 14:15:11 2011 From: davidk at ci.uchicago.edu (davidk at ci.uchicago.edu) Date: Mon, 6 Jun 2011 14:15:11 -0500 (CDT) Subject: [Swift-commit] r4571 - in trunk: bin etc Message-ID: <20110606191511.B1DE59CCA5@svn.ci.uchicago.edu> Author: davidk Date: 2011-06-06 14:15:11 -0500 (Mon, 06 Jun 2011) New Revision: 4571 Modified: trunk/bin/start-coaster-service trunk/etc/coaster-service.conf Log: Modified start-coaster-service to only create config file when needed Better defaults on coaster-service.conf Modified: trunk/bin/start-coaster-service =================================================================== --- trunk/bin/start-coaster-service 2011-06-06 18:26:29 UTC (rev 4570) +++ trunk/bin/start-coaster-service 2011-06-06 19:15:11 UTC (rev 4571) @@ -227,17 +227,16 @@ # Generate sites.xml export EXECUTION_URL="http://$IPADDR:$SERVICE_PORT" -echo Generating sites.xml.. +echo Generating sites.xml gensites persistent-coasters -p $CONFIG_FILE > $RUN_DIR/sites.xml # Generate config file if [ $SHARED_FILESYSTEM == "no" ]; then +echo Generating config file cat > $RUN_DIR/cf << EOF use.provider.staging=true wrapperlog.always.transfer=false execution.retries=0 provider.staging.pin.swiftfiles=false EOF -else - echo > $RUN_DIR/cf fi Modified: trunk/etc/coaster-service.conf =================================================================== --- trunk/etc/coaster-service.conf 2011-06-06 18:26:29 UTC (rev 4570) +++ trunk/etc/coaster-service.conf 2011-06-06 19:15:11 UTC (rev 4571) @@ -17,7 +17,7 @@ export WORKER_HOSTS="host1 host2 host3" # Do all the worker nodes you're using have a shared filesystem? (yes/no) -export SHARED_FILESYSTEM=no +export SHARED_FILESYSTEM=yes # Username to use on worker nodes export WORKER_USERNAME=$USER From jonmon at ci.uchicago.edu Mon Jun 6 15:30:40 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Mon, 6 Jun 2011 15:30:40 -0500 (CDT) Subject: [Swift-commit] r4572 - SwiftApps/Montage/scripts Message-ID: <20110606203040.5B7DD9CCAC@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-06 15:30:40 -0500 (Mon, 06 Jun 2011) New Revision: 4572 Modified: SwiftApps/Montage/scripts/Swift_Montage_Apps.swift SwiftApps/Montage/scripts/Swift_Montage_Batch.swift Log: Added more functionality o Now can use the mDiffFit fucntion from Montage Modified: SwiftApps/Montage/scripts/Swift_Montage_Apps.swift =================================================================== --- SwiftApps/Montage/scripts/Swift_Montage_Apps.swift 2011-06-06 19:15:11 UTC (rev 4571) +++ SwiftApps/Montage/scripts/Swift_Montage_Apps.swift 2011-06-06 20:30:40 UTC (rev 4572) @@ -29,6 +29,12 @@ } +app ( Image diff_img, Status stat ) mDiffFit( Image img_1, Image img_2, MosaicData hdr ) +{ + mDiffFit "-n" "-s" @stat @img_1 @img_2 @diff_img @hdr; +} + + app ( Status stat ) mFitplane( Image diff_img ) { // mFitplane "-s" @stat @diff_img; Modified: SwiftApps/Montage/scripts/Swift_Montage_Batch.swift =================================================================== --- SwiftApps/Montage/scripts/Swift_Montage_Batch.swift 2011-06-06 19:15:11 UTC (rev 4571) +++ SwiftApps/Montage/scripts/Swift_Montage_Batch.swift 2011-06-06 20:30:40 UTC (rev 4572) @@ -36,6 +36,30 @@ } +( Image diff_imgs[], Table fits_tbl ) mDiffFitBatch( string src_dir, string dest_dir, Table diff_tbl, MosaicData hdr ) +{ + DiffStruct diffs[] ; + Status stats[]; + + Table status_tbl = create_status_table( diff_tbl ); + + foreach d_entry, i in diffs + { + Image img_1 ; + Image img_2 ; + + Image diff_img ; + Status stat ; + + ( diff_img, stat ) = mDiffFit( img_1, img_2, hdr ); + + diff_imgs[ i ] = diff_img; + stats[ i ] = stat; + } + fits_tbl = mConcatFit( status_tbl, stats ); +} + + ( Table fits_tbl ) mFitBatch( Image diff_imgs[], Table diff_tbl ) { Status stats[] ; @@ -56,8 +80,8 @@ foreach img, i in raw_imgs { Image proj_img ; + proj_img = mProject( img, hdr ); // proj_img = mProjectPP( img, hdr ); - proj_img = mProject( img, hdr ); proj_imgs[ i ] = proj_img; } From davidk at ci.uchicago.edu Mon Jun 6 15:58:31 2011 From: davidk at ci.uchicago.edu (davidk at ci.uchicago.edu) Date: Mon, 6 Jun 2011 15:58:31 -0500 (CDT) Subject: [Swift-commit] r4573 - trunk/bin Message-ID: <20110606205832.0188B9CCAC@svn.ci.uchicago.edu> Author: davidk Date: 2011-06-06 15:58:31 -0500 (Mon, 06 Jun 2011) New Revision: 4573 Modified: trunk/bin/start-coaster-service Log: Have start-coaster-service create a simple example tc file Modified: trunk/bin/start-coaster-service =================================================================== --- trunk/bin/start-coaster-service 2011-06-06 20:30:40 UTC (rev 4572) +++ trunk/bin/start-coaster-service 2011-06-06 20:58:31 UTC (rev 4573) @@ -19,7 +19,7 @@ fi echo Starting virtual machines.. please wait - #$SWIFTVMBOOT_DIR/bin/bootit.sh + $SWIFTVMBOOT_DIR/bin/bootit.sh SWIFTVMBOOT_OUTPUT=$SWIFTVMBOOT_DIR/output.json if [ ! -f "$SWIFTVMBOOT_OUTPUT" ]; then @@ -240,3 +240,17 @@ provider.staging.pin.swiftfiles=false EOF fi + +# Generate TC file +echo Generating tc.data +cat > $RUN_DIR/tc.data << EOF +persistent-coasters echo /bin/echo null null null +persistent-coasters cat /bin/cat null null null +persistent-coasters ls /bin/ls null null null +persistent-coasters grep /bin/grep null null null +persistent-coasters sort /bin/sort null null null +persistent-coasters paste /bin/paste null null null +persistent-coasters cp /bin/cp null null null +persistent-coasters wc /usr/bin/wc null null null +EOF + From jonmon at ci.uchicago.edu Tue Jun 7 13:33:55 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Tue, 7 Jun 2011 13:33:55 -0500 (CDT) Subject: [Swift-commit] r4574 - SwiftApps/Montage/scripts Message-ID: <20110607183355.60B5C9CCA5@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-07 13:33:55 -0500 (Tue, 07 Jun 2011) New Revision: 4574 Modified: SwiftApps/Montage/scripts/Swift_Montage_Apps.swift SwiftApps/Montage/scripts/Swift_Montage_Batch.swift Log: Added fix so that the area file generated by mProject are also mapped for stageout Modified: SwiftApps/Montage/scripts/Swift_Montage_Apps.swift =================================================================== --- SwiftApps/Montage/scripts/Swift_Montage_Apps.swift 2011-06-06 20:58:31 UTC (rev 4573) +++ SwiftApps/Montage/scripts/Swift_Montage_Apps.swift 2011-06-07 18:33:55 UTC (rev 4574) @@ -72,7 +72,8 @@ } -app ( Image proj_img ) mProject( Image raw_img, MosaicData hdr ) +//app ( Image proj_img ) mProject( Image raw_img, MosaicData hdr ) +app ( Image proj_img, Image area_img ) mProject( Image raw_img, MosaicData hdr ) { mProject "-X" @raw_img @proj_img @hdr; } Modified: SwiftApps/Montage/scripts/Swift_Montage_Batch.swift =================================================================== --- SwiftApps/Montage/scripts/Swift_Montage_Batch.swift 2011-06-06 20:58:31 UTC (rev 4573) +++ SwiftApps/Montage/scripts/Swift_Montage_Batch.swift 2011-06-07 18:33:55 UTC (rev 4574) @@ -1,4 +1,4 @@ -( Image corr_imgs[] ) mBgBatch( Image bg_imgs[], Table img_tbl, Table corr_tbl ) +( Image corr_imgs[] ) mBackgroundBatch( Image bg_imgs[], Table img_tbl, Table corr_tbl ) { Table back_list = Background_list( img_tbl, corr_tbl ); @@ -42,18 +42,18 @@ Status stats[]; Table status_tbl = create_status_table( diff_tbl ); - + foreach d_entry, i in diffs { Image img_1 ; Image img_2 ; Image diff_img ; - Status stat ; - + Status stat ; + ( diff_img, stat ) = mDiffFit( img_1, img_2, hdr ); - diff_imgs[ i ] = diff_img; + diff_imgs[ i ] = diff_img; stats[ i ] = stat; } fits_tbl = mConcatFit( status_tbl, stats ); @@ -75,14 +75,17 @@ } -( Image proj_imgs[] ) mProjectBatch( Image raw_imgs[], MosaicData hdr ) +( Image proj_imgs[], Image area_imgs[] ) mProjectBatch( Image raw_imgs[], MosaicData hdr ) { foreach img, i in raw_imgs { Image proj_img ; - proj_img = mProject( img, hdr ); + Image area_img ; +// proj_img = mProject( img, hdr ); // proj_img = mProjectPP( img, hdr ); + ( proj_img, area_img ) = mProject( img, hdr ); proj_imgs[ i ] = proj_img; + area_imgs[ i ] = area_img; } } From davidk at ci.uchicago.edu Tue Jun 7 14:02:17 2011 From: davidk at ci.uchicago.edu (davidk at ci.uchicago.edu) Date: Tue, 7 Jun 2011 14:02:17 -0500 (CDT) Subject: [Swift-commit] r4575 - in trunk: bin docs/newuser-guide examples Message-ID: <20110607190217.7CA249CCA5@svn.ci.uchicago.edu> Author: davidk Date: 2011-06-07 14:02:17 -0500 (Tue, 07 Jun 2011) New Revision: 4575 Added: trunk/docs/newuser-guide/futuregrid-quickstart.txt trunk/examples/hostsn.swift Modified: trunk/bin/start-coaster-service trunk/docs/newuser-guide/pads-quickstart.txt Log: More content for the new user guide More apps for start-coaster-service tc generation Include hostsn script in examples Modified: trunk/bin/start-coaster-service =================================================================== --- trunk/bin/start-coaster-service 2011-06-07 18:33:55 UTC (rev 4574) +++ trunk/bin/start-coaster-service 2011-06-07 19:02:17 UTC (rev 4575) @@ -244,13 +244,14 @@ # Generate TC file echo Generating tc.data cat > $RUN_DIR/tc.data << EOF -persistent-coasters echo /bin/echo null null null -persistent-coasters cat /bin/cat null null null -persistent-coasters ls /bin/ls null null null -persistent-coasters grep /bin/grep null null null -persistent-coasters sort /bin/sort null null null -persistent-coasters paste /bin/paste null null null -persistent-coasters cp /bin/cp null null null -persistent-coasters wc /usr/bin/wc null null null +persistent-coasters echo /bin/echo null null null +persistent-coasters cat /bin/cat null null null +persistent-coasters ls /bin/ls null null null +persistent-coasters grep /bin/grep null null null +persistent-coasters sort /bin/sort null null null +persistent-coasters paste /bin/paste null null null +persistent-coasters cp /bin/cp null null null +persistent-coasters wc /usr/bin/wc null null null +persistent-coasters hostname /bin/hostname null null null EOF Added: trunk/docs/newuser-guide/futuregrid-quickstart.txt =================================================================== --- trunk/docs/newuser-guide/futuregrid-quickstart.txt (rev 0) +++ trunk/docs/newuser-guide/futuregrid-quickstart.txt 2011-06-07 19:02:17 UTC (rev 4575) @@ -0,0 +1,134 @@ +Futuregrid Quickstart Guide +=========================== + +Downloading and Building Swift +------------------------------ +The most recent versions of Swift can be found at +http://www.ci.uchicago.edu/swift/downloads/index.php. To run on futuregrid, +you will need to download the development/trunk version from SVN. + +Adding Swift to your PATH +------------------------- +Once you have installed Swift, add the Swift binary to your PATH so you can +easily run it from any directory. + +In your home directory, edit the file ".bashrc". + +If you have installed Swift via a source repository, add the following line +at the bottom of .bashrc. + +----- +export PATH=$PATH:$HOME/cog/modules/swift/dist/swift-svn/bin +----- + +Requesting Futuregrid Access +---------------------------- +If you do not already have a futuregrid account, you can follow the +instructions at https://portal.futuregrid.org/gettingstarted to get started. +This page provides information on how to create an account, how to join +a project, how to set up your SSH keys, and how to create a new project. + +Downloading Swift VM Tools +-------------------------- +A set of scripts based around cloudinitd are used to easily start virtual +machines. To download, change to your home directory and run the +following command: + +----- +$ svn co https://svn.ci.uchicago.edu/svn/vdl2/usertools/swift-vm-boot +----- + +Download your Credentials +------------------------- +Run the following commands to retrieve your credentials: +----- +$ scp yourusername at hotel.futuregrid.org:nimbus_creds.tar.gz . +$ tar xvfz nimbus_creds.tar.gz +----- +When you extract your credential file, look at the file called +hotel.conf. Near the bottom of this file will be two settings +called vws.repository.s3id and vws.repository.s3key. Copy these +values for the next step. + +Configuring Swift VM Tools +-------------------------- +Change directories into the swift-vm-boot directory. Edit the file +called env.sh. There are two settings here that you will need to +modify: FUTUREGRID_IAAS_ACCESS_KEY and FUTUREGRID_IAAS_SECRET_KEY. +Paste your access key (s3id) and secret key (s3key) here and save +the file. By default, env.sh requests 2 nodes on hotel and 2 nodes +on sierra. Change these values as needed. Run install.sh from the +swift-vm-boot directory to complete the installation of Swift VM +Tools. The Swift VM Tools may require a fairly recent version of +Python. If you run into problems while running the install.sh +script, please try a more recent version of Python and associated +libraries. + +Configuring coaster-service.conf +-------------------------------- +Within your swift distribution's etc directory is a file called +coaster-service.conf. There are many options here you can modify +as needed, but these are the settings that will be required +to run on futuregrid: + +----- +export WORKER_WORK=/tmp +export WORKER_MODE=futuregrid +export SHARED_FILESYSTEM=no +export WORKER_USERNAME=root +export SSH_TUNNELING=yes +export SWIFTVMBOOT_DIR=$HOME/swift-vm-boot +export WORK=/tmp +----- + +These is a brief description of these settings in the coaster-service.conf file. +Tunneling should be used when you are restricted by a firewall. If your local +machine has multiple network interfaces, you should also manually set the IP +address of your machine with export IPADDR=your.ip.address.here. + +Starting the Coaster Service Script +----------------------------------- +Now that everything is configured, change to a temporary directory +and run this command to start the coaster service: + +----- +$ start-coaster-service +----- + +This command will start the VMs, start the required processes on the worker nodes, +and generate Swift configuration files for you to use. The configuration files +will be generated in your current directory. These files are sites.xml, tc.data, +and cf. + +Running Swift +------------- +Now that you have all of your configuration files generated, run the following command: + +----- +$ swift -sites.file sites.xml -tc.file tc.data -config cf +----- + +If you would like to create a custom tc file for repeated use, rename it to something other +than tc.data to prevent it from being overwritten. The sites.xml however will need to be +regenerated every time you start the coaster service. If you need to repeatedly modify some +sites.xml options, you may edit the template in Swift's etc/sites/persistent-coasters. You +may also create your own custom tc files with the hostname of persistent-coasters. More +information about this can be found in the Swift userguide at +http://www.ci.uchicago.edu/swift/guides/trunk/userguide/userguide.html. + +Stopping the Coaster Service Script +----------------------------------- +To stop the coaster service, run the following command: +----- +$ stop-coaster-service +----- + +This will kill the coaster service, kill the worker scripts on remote systems and terminate +the virtual machines that were created during start-coaster-service. + +More Help +--------- +The best place for additional help is the Swift user mailing list. You can subscribe to this list at +http://mail.ci.uchicago.edu/mailman/listinfo/swift-user. When submitting information, please send +your sites.xml file, your tc.data, and any error messages you run into. + Modified: trunk/docs/newuser-guide/pads-quickstart.txt =================================================================== --- trunk/docs/newuser-guide/pads-quickstart.txt 2011-06-07 18:33:55 UTC (rev 4574) +++ trunk/docs/newuser-guide/pads-quickstart.txt 2011-06-07 19:02:17 UTC (rev 4575) @@ -39,7 +39,7 @@ @default ----- -Downloading and building swift +Downloading and building Swift ------------------------------ The most recent versions of Swift can be found at http://www.ci.uchicago.edu/swift/downloads/index.php. Follow the instructions Added: trunk/examples/hostsn.swift =================================================================== --- trunk/examples/hostsn.swift (rev 0) +++ trunk/examples/hostsn.swift 2011-06-07 19:02:17 UTC (rev 4575) @@ -0,0 +1,11 @@ +type file; + +app (file o) hostname () +{ + hostname stdout=@o; +} + +file out[]; +foreach j in [1:@toint(@arg("n","1"))] { + out[j] = hostname(); +} From ketan at ci.uchicago.edu Tue Jun 7 14:02:51 2011 From: ketan at ci.uchicago.edu (ketan at ci.uchicago.edu) Date: Tue, 7 Jun 2011 14:02:51 -0500 (CDT) Subject: [Swift-commit] r4576 - trunk/docs/newuser-guide Message-ID: <20110607190251.8C1A09CCA5@svn.ci.uchicago.edu> Author: ketan Date: 2011-06-07 14:02:50 -0500 (Tue, 07 Jun 2011) New Revision: 4576 Added: trunk/docs/newuser-guide/beagle-quickstart.txt Log: Added beagle quickstart guide to swift newuser guide Added: trunk/docs/newuser-guide/beagle-quickstart.txt =================================================================== --- trunk/docs/newuser-guide/beagle-quickstart.txt (rev 0) +++ trunk/docs/newuser-guide/beagle-quickstart.txt 2011-06-07 19:02:50 UTC (rev 4576) @@ -0,0 +1,49 @@ +PADS Quickstart Guide +===================== + +Requesting Access +----------------- +If you do not already have a Computation Institute account, you can request +one at https://www.ci.uchicago.edu/accounts/. This page will give you a list +of resources you can request access to. +You already have an existing CI account, but do not have access to Beagle, +send an email to support at ci.uchicago.edu to request access. + +Connecting to a login node +-------------------------- +Once you have account, you should be able to access a Beagle login +node with the following command: + +----- +ssh yourusername at login.beagle.ci.uchicago.edu +----- + +Follow the steps outlined below to get started with Swift on Beagle: + +*step 1.* Load the Swift module on Beagle as follows: +module load swift+ + +*step 2.* Create and change to a directory where your Swift related work will +stay. (say, +mkdir swift-lab+, followed by, +cd swift-lab+) + +*step 3.* To get started with a simple example running +/bin/cat+ to read an +input file +data.txt+ and write to an output file +f.nnn.out+, copy the folder +at +/home/ketan/catsn+ to the above directory. (+cp -r /home/ketan/catsn +.+ followed by +cd catsn+). + +*step 4.* In the sites file: +beagle-coaster.xml+, make the following two +changes: *1)* change the path of +workdirectory+ to your preferred location +(say to +/lustre/beagle/$USER/swift-lab/swift.workdir+) and *2)* Change the +project name to your project (+CI-CCR000013+) . The workdirectory will contain +execution data related to each run, e.g. wrapper scripts, system information, +inputs and outputs. + +*step 5.* Run the example using following commandline (also found in run.sh): ++swift -config cf -tc.file tc -sites.file beagle-coaster.xml catsn.swift -n=1+ +. You can further change the value of +-n+ to any arbitrary number to run that +many number of concurrent +cat+ + +*step 6.* Check the output in the generated +outdir+ directory (+ls outdir+) + +Note: Running from sandbox node or requesting 1 hour walltime for upto 3 nodes +will get fast prioritized execution. Good for small tests. + From jonmon at ci.uchicago.edu Tue Jun 7 14:47:37 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Tue, 7 Jun 2011 14:47:37 -0500 (CDT) Subject: [Swift-commit] r4577 - SwiftApps/Montage/scripts Message-ID: <20110607194737.8BC4E9CFD6@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-07 14:47:37 -0500 (Tue, 07 Jun 2011) New Revision: 4577 Modified: SwiftApps/Montage/scripts/Swift_Montage_Apps.swift SwiftApps/Montage/scripts/Swift_Montage_Batch.swift SwiftApps/Montage/scripts/mDiff_wrap.sh Log: Changed several interfaces to allow the mapping of the area files in the Montage scripts Modified: SwiftApps/Montage/scripts/Swift_Montage_Apps.swift =================================================================== --- SwiftApps/Montage/scripts/Swift_Montage_Apps.swift 2011-06-07 19:02:50 UTC (rev 4576) +++ SwiftApps/Montage/scripts/Swift_Montage_Apps.swift 2011-06-07 19:47:37 UTC (rev 4577) @@ -4,9 +4,10 @@ } -app ( Image bg_img ) mBackground( Image img, float a, float b, float c ) +app ( Image bg_img ) mBackground( Image img, Image area_img, float a, float b, float c ) { - mBackground "-n" @img @bg_img a b c; +// mBackground "-n" @img @bg_img a b c; + mBackground @img @bg_img a b c; } @@ -22,16 +23,18 @@ } -app ( Image diff_img ) mDiff( Image proj_img_1, Image proj_img_2, MosaicData hdr ) +app ( Image diff_img ) mDiff( Image proj_img_1, Image area_img_1, Image proj_img_2, Image area_img_2, MosaicData hdr ) { // mDiff "-n" @proj_img_1 @proj_img_2 @diff_img @hdr; - mDiff_wrap "-n" @proj_img_1 @proj_img_2 @diff_img @hdr; +// mDiff_wrap "-n" @proj_img_1 @proj_img_2 @diff_img @hdr; + mDiff_wrap @proj_img_1 @proj_img_2 @diff_img @hdr; } -app ( Image diff_img, Status stat ) mDiffFit( Image img_1, Image img_2, MosaicData hdr ) +app ( Image diff_img, Status stat ) mDiffFit( Image img_1, Image area_img_1, Image img_2, Image area_img_2, MosaicData hdr ) { - mDiffFit "-n" "-s" @stat @img_1 @img_2 @diff_img @hdr; +// mDiffFit "-n" "-s" @stat @img_1 @img_2 @diff_img @hdr; + mDiffFit "-s" @stat @img_1 @img_2 @diff_img @hdr; } @@ -56,7 +59,7 @@ app ( JPEG mos_img_jpg ) mJPEG( Image mos_img ) { - mJPEG "-gray" @mos_img "20%" "99.98%" "loglog" "-out" @mos_img_jpg; + mJPEG "-gray" @mos_img "0s" "max" "gaussian-log" "-out" @mos_img_jpg; } Modified: SwiftApps/Montage/scripts/Swift_Montage_Batch.swift =================================================================== --- SwiftApps/Montage/scripts/Swift_Montage_Batch.swift 2011-06-07 19:02:50 UTC (rev 4576) +++ SwiftApps/Montage/scripts/Swift_Montage_Batch.swift 2011-06-07 19:47:37 UTC (rev 4577) @@ -7,12 +7,13 @@ foreach background_entry, i in back_struct { Image proj_img ; + Image area_img ; Image corr_img ; float a = background_entry.a; float b = background_entry.b; float c = background_entry.c; - corr_img = mBackground( proj_img, a, b, c ); + corr_img = mBackground( proj_img, area_img, a, b, c ); corr_imgs[ i ] = corr_img; } @@ -27,9 +28,11 @@ { Image img_1 ; Image img_2 ; + Image area_img_1 ; + Image area_img_2 ; Image diff_img ; - diff_img = mDiff( img_1, img_2, hdr ); + diff_img = mDiff( img_1, area_img_1, img_2, area_img_2, hdr ); diff_imgs[ i ] = diff_img; } @@ -47,11 +50,13 @@ { Image img_1 ; Image img_2 ; + Image area_img_1 ; + Image area_img_2 ; Image diff_img ; Status stat ; - ( diff_img, stat ) = mDiffFit( img_1, img_2, hdr ); + ( diff_img, stat ) = mDiffFit( img_1, area_img_1, img_2, area_img_2, hdr ); diff_imgs[ i ] = diff_img; stats[ i ] = stat; @@ -80,7 +85,7 @@ foreach img, i in raw_imgs { Image proj_img ; - Image area_img ; + Image area_img ; // proj_img = mProject( img, hdr ); // proj_img = mProjectPP( img, hdr ); ( proj_img, area_img ) = mProject( img, hdr ); Modified: SwiftApps/Montage/scripts/mDiff_wrap.sh =================================================================== --- SwiftApps/Montage/scripts/mDiff_wrap.sh 2011-06-07 19:02:50 UTC (rev 4576) +++ SwiftApps/Montage/scripts/mDiff_wrap.sh 2011-06-07 19:47:37 UTC (rev 4577) @@ -1,8 +1,8 @@ #!/bin/bash -mDiff $1 $2 $3 $4 $5 +mDiff $1 $2 $3 $4 mkdir -p `dirname $4` -touch $4 +touch $3 exit 0 From jonmon at ci.uchicago.edu Tue Jun 7 14:50:56 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Tue, 7 Jun 2011 14:50:56 -0500 (CDT) Subject: [Swift-commit] r4578 - in SwiftApps/Montage: . scripts Message-ID: <20110607195056.32F639CFD6@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-07 14:50:56 -0500 (Tue, 07 Jun 2011) New Revision: 4578 Modified: SwiftApps/Montage/TODO SwiftApps/Montage/scripts/Swift_Montage_Apps.swift Log: removed commented out lines during the testing of mapping the area files out. Updated TODO file Modified: SwiftApps/Montage/TODO =================================================================== --- SwiftApps/Montage/TODO 2011-06-07 19:47:37 UTC (rev 4577) +++ SwiftApps/Montage/TODO 2011-06-07 19:50:56 UTC (rev 4578) @@ -1,5 +1,4 @@ o scripts/Swift_Montage_Batch.swift - -- Must map out the area files as well. Then change all the app procedures accordingly to remove the -n option.(-n stands for ignore the area files) -- Need to fix mProjectBatch. Currently calls mProject blindly. Need to figure out how to choose between mProject and mProjectPP o exec/montage.sh Modified: SwiftApps/Montage/scripts/Swift_Montage_Apps.swift =================================================================== --- SwiftApps/Montage/scripts/Swift_Montage_Apps.swift 2011-06-07 19:47:37 UTC (rev 4577) +++ SwiftApps/Montage/scripts/Swift_Montage_Apps.swift 2011-06-07 19:50:56 UTC (rev 4578) @@ -6,7 +6,6 @@ app ( Image bg_img ) mBackground( Image img, Image area_img, float a, float b, float c ) { -// mBackground "-n" @img @bg_img a b c; mBackground @img @bg_img a b c; } @@ -25,22 +24,18 @@ app ( Image diff_img ) mDiff( Image proj_img_1, Image area_img_1, Image proj_img_2, Image area_img_2, MosaicData hdr ) { -// mDiff "-n" @proj_img_1 @proj_img_2 @diff_img @hdr; -// mDiff_wrap "-n" @proj_img_1 @proj_img_2 @diff_img @hdr; mDiff_wrap @proj_img_1 @proj_img_2 @diff_img @hdr; } app ( Image diff_img, Status stat ) mDiffFit( Image img_1, Image area_img_1, Image img_2, Image area_img_2, MosaicData hdr ) { -// mDiffFit "-n" "-s" @stat @img_1 @img_2 @diff_img @hdr; mDiffFit "-s" @stat @img_1 @img_2 @diff_img @hdr; } app ( Status stat ) mFitplane( Image diff_img ) { -// mFitplane "-s" @stat @diff_img; mFitplane_wrap "-s" @stat @diff_img; } @@ -75,7 +70,6 @@ } -//app ( Image proj_img ) mProject( Image raw_img, MosaicData hdr ) app ( Image proj_img, Image area_img ) mProject( Image raw_img, MosaicData hdr ) { mProject "-X" @raw_img @proj_img @hdr; From davidk at ci.uchicago.edu Tue Jun 7 17:07:37 2011 From: davidk at ci.uchicago.edu (davidk at ci.uchicago.edu) Date: Tue, 7 Jun 2011 17:07:37 -0500 (CDT) Subject: [Swift-commit] r4580 - in trunk/docs: . userguide Message-ID: <20110607220737.E902F9CCA5@svn.ci.uchicago.edu> Author: davidk Date: 2011-06-07 17:07:37 -0500 (Tue, 07 Jun 2011) New Revision: 4580 Removed: trunk/docs/userguide/overview.txt Modified: trunk/docs/build_docs.sh Log: Fix for group permissions in build_docs.sh Removed duplicate chapter from userguide Modified: trunk/docs/build_docs.sh =================================================================== --- trunk/docs/build_docs.sh 2011-06-07 20:47:31 UTC (rev 4579) +++ trunk/docs/build_docs.sh 2011-06-07 22:07:37 UTC (rev 4580) @@ -8,6 +8,9 @@ exit 1 } +# Change file permissions to values set below +CHMOD_VALUE="664" + # Verify correct arguments if [ -n "$1" ]; then INSTALLATION_DIRECTORY=$1 @@ -53,6 +56,7 @@ for copyfile in `ls * 2>/dev/null` do cp $copyfile $INSTALLATION_DIRECTORY/$VERSION/$directory || crash "Unable to copy $copyfile to $INSTALLATION_DIRECTORY/$VERSION/$directory" + chmod $CHMOD_VALUE $INSTALLATION_DIRECTORY/$VERSION/$directory/$copyfile > /dev/null 2>&1 done popd > /dev/null 2>&1 Deleted: trunk/docs/userguide/overview.txt =================================================================== --- trunk/docs/userguide/overview.txt 2011-06-07 20:47:31 UTC (rev 4579) +++ trunk/docs/userguide/overview.txt 2011-06-07 22:07:37 UTC (rev 4580) @@ -1,20 +0,0 @@ -Overview --------- -This manual provides reference material for Swift: the SwiftScript -language and the Swift runtime system. For introductory material, -consult the Swift tutorial -. - -Swift is a data-oriented coarse grained scripting language that supports -dataset typing and mapping, dataset iteration, conditional branching, -and procedural composition. - -Swift programs (or workflows) are written in a language called -SwiftScript. - -SwiftScript programs are dataflow oriented - they are primarily -concerned with processing (possibly large) collections of data files, by -invoking programs to do that processing. Swift handles execution of such -programs on remote sites by choosing sites, handling the staging of -input and output files to and from the chosen sites and remote execution -of program code. From tga at ci.uchicago.edu Tue Jun 7 23:41:46 2011 From: tga at ci.uchicago.edu (tga at ci.uchicago.edu) Date: Tue, 7 Jun 2011 23:41:46 -0500 (CDT) Subject: [Swift-commit] r4581 - SwiftApps/SwiftR/Swift Message-ID: <20110608044146.AE3899CCA5@svn.ci.uchicago.edu> Author: tga Date: 2011-06-07 23:41:46 -0500 (Tue, 07 Jun 2011) New Revision: 4581 Modified: SwiftApps/SwiftR/Swift/DESCRIPTION Log: Bumping version number for next release. Modified: SwiftApps/SwiftR/Swift/DESCRIPTION =================================================================== --- SwiftApps/SwiftR/Swift/DESCRIPTION 2011-06-07 22:07:37 UTC (rev 4580) +++ SwiftApps/SwiftR/Swift/DESCRIPTION 2011-06-08 04:41:46 UTC (rev 4581) @@ -1,12 +1,12 @@ Package: Swift Type: Package Title: R interface to Swift parallel scripting languaage -Version: 0.2.4 -Date: 2011-05-06 +Version: 0.2.5 +Date: 2011-06-07 Author: Michael Wilde Maintainer: Michael Wilde Description: Routines to invoke R functions on remote resources through Swift. License: Apache License LazyLoad: yes -Packaged: 2011-05-06; Tim Armstrong +Packaged: 2011-06-07; Tim Armstrong From jonmon at ci.uchicago.edu Wed Jun 8 12:47:06 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Wed, 8 Jun 2011 12:47:06 -0500 (CDT) Subject: [Swift-commit] r4582 - SwiftApps/Montage/scripts Message-ID: <20110608174706.10B7C9CFD6@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-08 12:47:05 -0500 (Wed, 08 Jun 2011) New Revision: 4582 Modified: SwiftApps/Montage/scripts/Swift_Montage_Batch.swift Log: the different table is now called on the raw image data. Calling the difference table on the projected images was causing some problems in which the raw images didn't overlap but the projected images did. this caused problems for mDiff and mDiffFit as files weren't being created. wrote wrapper scripts to solve this issue but this solution is much nicer Modified: SwiftApps/Montage/scripts/Swift_Montage_Batch.swift =================================================================== --- SwiftApps/Montage/scripts/Swift_Montage_Batch.swift 2011-06-08 04:41:46 UTC (rev 4581) +++ SwiftApps/Montage/scripts/Swift_Montage_Batch.swift 2011-06-08 17:47:05 UTC (rev 4582) @@ -39,7 +39,8 @@ } -( Image diff_imgs[], Table fits_tbl ) mDiffFitBatch( string src_dir, string dest_dir, Table diff_tbl, MosaicData hdr ) +( Image diff_imgs[], Table fits_tbl ) mDiffFitBatch( string src_dir, string dest_dir, string files[], Table diff_tbl, MosaicData hdr ) +//( Image diff_imgs[], Table fits_tbl ) mDiffFitBatch( string src_dir, string dest_dir, Table diff_tbl, MosaicData hdr ) { DiffStruct diffs[] ; Status stats[]; @@ -48,8 +49,8 @@ foreach d_entry, i in diffs { - Image img_1 ; - Image img_2 ; + Image img_1 ; + Image img_2 ; Image area_img_1 ; Image area_img_2 ; From jonmon at ci.uchicago.edu Wed Jun 8 12:49:33 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Wed, 8 Jun 2011 12:49:33 -0500 (CDT) Subject: [Swift-commit] r4583 - SwiftApps/Montage/scripts Message-ID: <20110608174933.8E57C9CFD6@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-08 12:49:33 -0500 (Wed, 08 Jun 2011) New Revision: 4583 Modified: SwiftApps/Montage/scripts/Swift_Montage_Apps.swift Log: Should not need to use the the wrapper scripts anymore. Modified: SwiftApps/Montage/scripts/Swift_Montage_Apps.swift =================================================================== --- SwiftApps/Montage/scripts/Swift_Montage_Apps.swift 2011-06-08 17:47:05 UTC (rev 4582) +++ SwiftApps/Montage/scripts/Swift_Montage_Apps.swift 2011-06-08 17:49:33 UTC (rev 4583) @@ -24,7 +24,7 @@ app ( Image diff_img ) mDiff( Image proj_img_1, Image area_img_1, Image proj_img_2, Image area_img_2, MosaicData hdr ) { - mDiff_wrap @proj_img_1 @proj_img_2 @diff_img @hdr; + mDiff at proj_img_1 @proj_img_2 @diff_img @hdr; } @@ -36,7 +36,7 @@ app ( Status stat ) mFitplane( Image diff_img ) { - mFitplane_wrap "-s" @stat @diff_img; + mFitplane"-s" @stat @diff_img; } From jonmon at ci.uchicago.edu Wed Jun 8 16:45:21 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Wed, 8 Jun 2011 16:45:21 -0500 (CDT) Subject: [Swift-commit] r4584 - SwiftApps/Montage/exec Message-ID: <20110608214521.B642E9CFD6@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-08 16:45:21 -0500 (Wed, 08 Jun 2011) New Revision: 4584 Modified: SwiftApps/Montage/exec/montage.sh Log: Minor edits to the execution script Modified: SwiftApps/Montage/exec/montage.sh =================================================================== --- SwiftApps/Montage/exec/montage.sh 2011-06-08 17:49:33 UTC (rev 4583) +++ SwiftApps/Montage/exec/montage.sh 2011-06-08 21:45:21 UTC (rev 4584) @@ -9,26 +9,31 @@ fi # Fix this. Not sure how to set this variable if it not set or even what the error message should be -if [ "X$SWIFT_MONTAGE" == "X" ]; then +if [ "X$SWIFT_MONTAGE" = "X" ] ; then echo "Please set the SWIFT_MONTAGE environment variable to where the Swift_Montage wrappers home directory is." exit 1 fi +if [ "X$SWIFT_MONTAGE_WORK" = "X" ] ; then + echo "Please set the SWIFT_MONTAGE_WORK environment varible to where the montage work should be done." + exit 1 +fi + RUN_DIRECTORY=(`ls | grep run | tail -n 1`) NUM=`echo $RUN_DIRECTORY | awk -F . '{print $NF}'` WORK_DIRECTORY=(`printf "run.%04d" $((NUM+1))`) mkdir ${WORK_DIRECTORY} -if [ $HOSTNAME == "login2.pads.ci.uchicago.edu" ]; then - echo "#site pads-proj-coasters.xml internalhostname=192.5.86.6" >> sites.properties - echo "#site pads-diff-coasters.xml internalhostname=192.5.86.6" >> sites.properties - echo "#site pads-fit-coasters.xml internalhostname=192.5.86.6" >> sites.properties -elif [ $HOSTNAME == "login1.pads.ci.uchicago.edu" ]; then - echo "#site pads-proj-coasters.xml internalhostname=192.5.86.5" >> sites.properties - echo "#site pads-diff-coasters.xml internalhostname=192.5.86.5" >> sites.properties - echo "#site pads-fit-coasters.xml internalhostname=192.5.86.5" >> sites.properties -fi +# if [ $HOSTNAME == "login2.pads.ci.uchicago.edu" ]; then +# echo "#site pads-proj-coasters.xml internalhostname=192.5.86.6" >> sites.properties +# echo "#site pads-diff-coasters.xml internalhostname=192.5.86.6" >> sites.properties +# echo "#site pads-fit-coasters.xml internalhostname=192.5.86.6" >> sites.properties +# elif [ $HOSTNAME == "login1.pads.ci.uchicago.edu" ]; then +# echo "#site pads-proj-coasters.xml internalhostname=192.5.86.5" >> sites.properties +# echo "#site pads-diff-coasters.xml internalhostname=192.5.86.5" >> sites.properties +# echo "#site pads-fit-coasters.xml internalhostname=192.5.86.5" >> sites.properties +# fi echo "#site pads-proj-coasters.xml work=/gpfs/pads/jonmon/Swift/work/pads" >> sites.properties echo "#site pads-proj-coasters.xml slots=$1" >> sites.properties @@ -36,11 +41,12 @@ echo "#site pads-diff-coasters.xml work=/gpfs/pads/jonmon/Swift/work/pads" >> sites.properties echo "#site pads-diff-coasters.xml slots=$2" >> sites.properties -echo "#site pads-fit-coasters.xml work=/gpfs/pads/jonmon/Swift/work/pads" >> sites.properties -echo "#site pads-fit-coasters.xml slots=$3" >> sites.properties +echo "#site pads-fit-coasters.xml work=/gpfs/pads/jonmon/Swift/work/pads" >> sites.properties +echo "#site pads-fit-coasters.xml slots=$3" >> sites.properties -echo "#site local.xml work=/gpfs/pads/jonmon/Swift/work/local" >> sites.properties +echo "#site local.xml work=/gpfs/pads/jonmon/Swift/work/local" >> sites.properties + echo "" > sites.xml echo "" >> sites.xml @@ -62,8 +68,8 @@ mv sites.xml ${WORK_DIRECTORY} cp tc.data ${WORK_DIRECTORY} -cp $4 ${WORK_DIRECTORY} +cp -r $4 ${WORK_DIRECTORY} cd ${WORK_DIRECTORY} -#swift -tc.file tc.data -sites.file sites.xml -config ${SWIFT_MONTAGE}/etc swift_montage.properties +echo "swift -tc.file tc.data -sites.file sites.xml -config ${SWIFT_MONTAGE}/etc swift_montage.properties ${SWIFT_MONTAGE}/scripts/montage.swift" #clear ; swiftrun -sites localhost pads -input raw_dir header.hdr -script m101_montage.swift From jonmon at ci.uchicago.edu Wed Jun 8 16:48:30 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Wed, 8 Jun 2011 16:48:30 -0500 (CDT) Subject: [Swift-commit] r4585 - SwiftApps/Montage/exec Message-ID: <20110608214830.8D00E9CFD6@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-08 16:48:30 -0500 (Wed, 08 Jun 2011) New Revision: 4585 Modified: SwiftApps/Montage/exec/montage.sh Log: Added change so now the tc file must be added at the command line. Might change this later Modified: SwiftApps/Montage/exec/montage.sh =================================================================== --- SwiftApps/Montage/exec/montage.sh 2011-06-08 21:45:21 UTC (rev 4584) +++ SwiftApps/Montage/exec/montage.sh 2011-06-08 21:48:30 UTC (rev 4585) @@ -1,6 +1,6 @@ #!/bin/bash -EXPECTED_ARGS=4 +EXPECTED_ARGS=5 if [ $# -ne $EXPECTED_ARGS ] then @@ -67,8 +67,8 @@ rm -f sites.properties mv sites.xml ${WORK_DIRECTORY} -cp tc.data ${WORK_DIRECTORY} -cp -r $4 ${WORK_DIRECTORY} +cp $4 ${WORK_DIRECTORY} +cp -r $5 ${WORK_DIRECTORY} cd ${WORK_DIRECTORY} echo "swift -tc.file tc.data -sites.file sites.xml -config ${SWIFT_MONTAGE}/etc swift_montage.properties ${SWIFT_MONTAGE}/scripts/montage.swift" From jonmon at ci.uchicago.edu Wed Jun 8 16:56:42 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Wed, 8 Jun 2011 16:56:42 -0500 (CDT) Subject: [Swift-commit] r4586 - in SwiftApps/Montage: exec scripts Message-ID: <20110608215642.95E6A9CFD6@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-08 16:56:42 -0500 (Wed, 08 Jun 2011) New Revision: 4586 Added: SwiftApps/Montage/scripts/montage.swift Modified: SwiftApps/Montage/exec/montage.sh Log: Fixed error in the execution scirpt. erroneus space in the config file path. added the general montage workflow to the scripts repository Modified: SwiftApps/Montage/exec/montage.sh =================================================================== --- SwiftApps/Montage/exec/montage.sh 2011-06-08 21:48:30 UTC (rev 4585) +++ SwiftApps/Montage/exec/montage.sh 2011-06-08 21:56:42 UTC (rev 4586) @@ -67,9 +67,10 @@ rm -f sites.properties mv sites.xml ${WORK_DIRECTORY} +cp ${SWIFT_MONTAGE}/scripts/montage.swift ${WORK_DIRECTORY} cp $4 ${WORK_DIRECTORY} cp -r $5 ${WORK_DIRECTORY} cd ${WORK_DIRECTORY} -echo "swift -tc.file tc.data -sites.file sites.xml -config ${SWIFT_MONTAGE}/etc swift_montage.properties ${SWIFT_MONTAGE}/scripts/montage.swift" +echo "swift -tc.file tc.data -sites.file sites.xml -config ${SWIFT_MONTAGE}/etc/swift_montage.properties ${SWIFT_MONTAGE}/scripts/montage.swift | tee -a swift.out" #clear ; swiftrun -sites localhost pads -input raw_dir header.hdr -script m101_montage.swift Added: SwiftApps/Montage/scripts/montage.swift =================================================================== --- SwiftApps/Montage/scripts/montage.swift (rev 0) +++ SwiftApps/Montage/scripts/montage.swift 2011-06-08 21:56:42 UTC (rev 4586) @@ -0,0 +1,35 @@ +import "Swift_Montage_Types"; +import "Swift_Montage_Apps"; +import "Swift_Montage_Batch"; + +MosaicData header <"header.hdr">; +Table images_tbl <"images.tbl">; +Table raw_images_tbl <"raw-images.tbl">; +Table difference_tbl <"diffs.tbl">; +Table fits_images_tbl <"fits.tbl">; +Table corrections_tbl <"corrections.tbl">; +Table stat_tbl <"stats.tbl">; +Image corrected_mos <"final/corrected.fits">; +JPEG corrected_jpg_img <"final/corrected.jpg">; +Image projected_images[]; +Image projected_areas[]; +Image difference_images[]; +Image corrected_images[]; + +Image raw_image_files[] ; + +difference_tbl = mOverlaps( raw_images_tbl ); + +( projected_images, projected_areas ) = mProjectBatch( raw_image_files, header ); + +images_tbl = mImgtbl( projected_images ); + +( difference_images, fits_images_tbl ) = mDiffFitBatch( "proj_dir", "diff_dir", @filenames(projected_images), difference_tbl, header ); + +corrections_tbl = mBgModel( images_tbl, fits_images_tbl ); + +corrected_images = mBackgroundBatch( projected_images, images_tbl, corrections_tbl ); + +corrected_mos = mAdd( corrected_images, images_tbl, header ); + +corrected_jpg_img = mJPEG( corrected_mos ); From hategan at ci.uchicago.edu Wed Jun 8 21:13:07 2011 From: hategan at ci.uchicago.edu (hategan at ci.uchicago.edu) Date: Wed, 8 Jun 2011 21:13:07 -0500 (CDT) Subject: [Swift-commit] r4587 - trunk/src/org/griphyn/vdl/karajan/lib Message-ID: <20110609021307.4B8949CFD6@svn.ci.uchicago.edu> Author: hategan Date: 2011-06-08 21:13:07 -0500 (Wed, 08 Jun 2011) New Revision: 4587 Modified: trunk/src/org/griphyn/vdl/karajan/lib/Stageout.java Log: 1. wait for static return arrays to be initialized before starting the app (i.e. make sure the size is known); 2. the list of stageouts for complex types (and arrays) was broken (e.g. it returned the leaf var instead of the root var; fixed both issues Modified: trunk/src/org/griphyn/vdl/karajan/lib/Stageout.java =================================================================== --- trunk/src/org/griphyn/vdl/karajan/lib/Stageout.java 2011-06-08 21:56:42 UTC (rev 4586) +++ trunk/src/org/griphyn/vdl/karajan/lib/Stageout.java 2011-06-09 02:13:07 UTC (rev 4587) @@ -9,17 +9,15 @@ import org.apache.log4j.Logger; import org.globus.cog.karajan.arguments.Arg; +import org.globus.cog.karajan.arguments.Arg.Channel; import org.globus.cog.karajan.arguments.ArgUtil; import org.globus.cog.karajan.arguments.NamedArguments; -import org.globus.cog.karajan.arguments.Arg.Channel; -import org.globus.cog.karajan.stack.VariableNotFoundException; import org.globus.cog.karajan.stack.VariableStack; import org.globus.cog.karajan.workflow.ExecutionException; import org.globus.cog.karajan.workflow.futures.FutureNotYetAvailable; import org.griphyn.vdl.mapping.AbstractDataNode; import org.griphyn.vdl.mapping.DSHandle; import org.griphyn.vdl.mapping.HandleOpenException; -import org.griphyn.vdl.mapping.InvalidPathException; import org.griphyn.vdl.mapping.MappingDependentException; import org.griphyn.vdl.mapping.Path; @@ -40,8 +38,8 @@ .isPrimitive()); } - private List list(Path p, DSHandle var) { - ArrayList l = new ArrayList(2); + private List list(Path p, DSHandle var) { + ArrayList l = new ArrayList(2); l.add(p); l.add(var); return l; @@ -51,6 +49,19 @@ DSHandle var = (DSHandle) VAR.getValue(stack); boolean deperr = false; boolean mdeperr = false; + // currently only static arrays are supported as app returns + // however, previous to this, there was no code to check + // if these arrays had their sizes closed, which could lead to + // race conditions (e.g. if this array's mapper had some parameter + // dependencies that weren't closed at the time the app was started). + if (var.getType().isArray()) { + if (!var.isClosed()) { + if (logger.isDebugEnabled()) { + logger.debug("Waiting for array size from " + var); + } + throw new FutureNotYetAvailable(addFutureListener(stack, var)); + } + } try { if (!isPrimitive(var)) { retPaths(STAGEOUT, stack, var); @@ -76,15 +87,12 @@ try { Collection fp = var.getFringePaths(); for (Path p : fp) { - channel.ret(stack, list(p, var.getField(p))); + channel.ret(stack, list(p, var)); } } catch (HandleOpenException e) { throw new FutureNotYetAvailable(addFutureListener(stack, e .getSource())); } - catch (InvalidPathException e) { - throw new ExecutionException(e); - } } } From hategan at ci.uchicago.edu Wed Jun 8 21:14:52 2011 From: hategan at ci.uchicago.edu (hategan at ci.uchicago.edu) Date: Wed, 8 Jun 2011 21:14:52 -0500 (CDT) Subject: [Swift-commit] r4588 - trunk/src/org/griphyn/vdl/karajan/lib Message-ID: <20110609021452.0F7099CFD6@svn.ci.uchicago.edu> Author: hategan Date: 2011-06-08 21:14:51 -0500 (Wed, 08 Jun 2011) New Revision: 4588 Modified: trunk/src/org/griphyn/vdl/karajan/lib/SetFieldValue.java Log: 1. wait for the destination variables to be initialized if they aren't; 2. fixed array copying (the code would just go into a loop copying the first element in the array over and over, and eventually leading to a stack overflow) Modified: trunk/src/org/griphyn/vdl/karajan/lib/SetFieldValue.java =================================================================== --- trunk/src/org/griphyn/vdl/karajan/lib/SetFieldValue.java 2011-06-09 02:13:07 UTC (rev 4587) +++ trunk/src/org/griphyn/vdl/karajan/lib/SetFieldValue.java 2011-06-09 02:14:51 UTC (rev 4588) @@ -10,6 +10,7 @@ import org.globus.cog.karajan.workflow.futures.FutureNotYetAvailable; import org.griphyn.vdl.karajan.Pair; import org.griphyn.vdl.karajan.PairIterator; +import org.griphyn.vdl.karajan.VDL2FutureException; import org.griphyn.vdl.mapping.AbstractDataNode; import org.griphyn.vdl.mapping.DSHandle; import org.griphyn.vdl.mapping.InvalidPathException; @@ -43,13 +44,17 @@ throw new FutureNotYetAvailable(addFutureListener(stack, value)); } } - synchronized (var.getRoot()) { - deepCopy(leaf, value, stack); - - if (var.getParent() != null && var.getParent().getType().isArray()) { - markAsAvailable(stack, leaf.getParent(), leaf.getPathFromRoot().getLast()); - } + try { + synchronized (var.getRoot()) { + deepCopy(leaf, value, stack); + if (var.getParent() != null && var.getParent().getType().isArray()) { + markAsAvailable(stack, leaf.getParent(), leaf.getPathFromRoot().getLast()); + } + } } + catch (VDL2FutureException e) { + throw new FutureNotYetAvailable(addFutureListener(stack, e.getHandle())); + } return null; } @@ -85,7 +90,14 @@ dest.setValue(source.getValue()); } else if (source.getType().isArray()) { - PairIterator it = new PairIterator(source.getArrayValue()); + PairIterator it; + if (stack.isDefined("it")) { + it = (PairIterator) stack.getVar("it"); + } + else { + it = new PairIterator(source.getArrayValue()); + stack.setVar("it", it); + } while (it.hasNext()) { Pair pair = (Pair) it.next(); Object lhs = pair.get(0); @@ -100,7 +112,7 @@ DSHandle field; try { field = dest.getField(memberPath); - } + } catch (InvalidPathException ipe) { throw new ExecutionException("Could not get destination field",ipe); } @@ -128,6 +140,7 @@ throw new ExecutionException("Failed to copy " + source + " to " + dest, fc.getException()); } } + dest.closeShallow(); } else { FileCopier fc = new FileCopier(source.getMapper().map(source.getPathFromRoot()), From hategan at ci.uchicago.edu Wed Jun 8 21:15:33 2011 From: hategan at ci.uchicago.edu (hategan at ci.uchicago.edu) Date: Wed, 8 Jun 2011 21:15:33 -0500 (CDT) Subject: [Swift-commit] r4589 - trunk/src/org/griphyn/vdl/mapping Message-ID: <20110609021533.4BA3B9CFD6@svn.ci.uchicago.edu> Author: hategan Date: 2011-06-08 21:15:33 -0500 (Wed, 08 Jun 2011) New Revision: 4589 Modified: trunk/src/org/griphyn/vdl/mapping/Path.java Log: fixed comment Modified: trunk/src/org/griphyn/vdl/mapping/Path.java =================================================================== --- trunk/src/org/griphyn/vdl/mapping/Path.java 2011-06-09 02:14:51 UTC (rev 4588) +++ trunk/src/org/griphyn/vdl/mapping/Path.java 2011-06-09 02:15:33 UTC (rev 4589) @@ -176,7 +176,7 @@ public String getFirst() { return ((Entry) elements.get(0)).name; - } + } public String getLast() { return ((Entry) elements.get(elements.size() - 1)).name; @@ -248,7 +248,7 @@ * Returns a human readable string representation of this path. The string * returned by this method will not correctly be parsed * into the same path by {@link Path.parse}. In other words no guarantee is - * made that Path.parse(somePath.stringForm()).equals(somePath). + * made that Path.parse(somePath.toString()).equals(somePath). * For a consistent such representation of this path use {@link stringForm}. */ public synchronized String toString() { From hategan at ci.uchicago.edu Wed Jun 8 21:16:22 2011 From: hategan at ci.uchicago.edu (hategan at ci.uchicago.edu) Date: Wed, 8 Jun 2011 21:16:22 -0500 (CDT) Subject: [Swift-commit] r4590 - trunk/src/org/griphyn/vdl/mapping Message-ID: <20110609021622.5E8C29CFD6@svn.ci.uchicago.edu> Author: hategan Date: 2011-06-08 21:16:22 -0500 (Wed, 08 Jun 2011) New Revision: 4590 Modified: trunk/src/org/griphyn/vdl/mapping/AbstractDataNode.java Log: a few improvements to toString() Modified: trunk/src/org/griphyn/vdl/mapping/AbstractDataNode.java =================================================================== --- trunk/src/org/griphyn/vdl/mapping/AbstractDataNode.java 2011-06-09 02:15:33 UTC (rev 4589) +++ trunk/src/org/griphyn/vdl/mapping/AbstractDataNode.java 2011-06-09 02:16:22 UTC (rev 4590) @@ -93,21 +93,27 @@ sb.append(getDisplayableName()); Path p = getPathFromRoot(); if (!p.isEmpty()) { - sb.append("."); + if (!p.isArrayIndex(0)) { + sb.append("."); + } sb.append(p.toString()); } sb.append(":"); - sb.append(getType()); - sb.append(" = "); - if (value == null) { - sb.append("?"); + Type type = getType(); + String strtype = type.toString(); + if (type.isArray() && closed) { + strtype = strtype.replace("[]", "[" + this.getHandles().size() + "]"); } - else if (value instanceof Throwable) { - sb.append(value.getClass().getName()); + sb.append(strtype); + if (value != null) { + sb.append(" = "); + if (value instanceof Throwable) { + sb.append(value.getClass().getName()); + } + else { + sb.append(value); + } } - else { - sb.append(value); - } if (closed) { sb.append(" - Closed"); } @@ -256,7 +262,6 @@ else { handle = createDSHandle(name); } - } return handle; } From jonmon at ci.uchicago.edu Wed Jun 8 21:16:47 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Wed, 8 Jun 2011 21:16:47 -0500 (CDT) Subject: [Swift-commit] r4591 - trunk/docs/userguide Message-ID: <20110609021647.521239CFD6@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-08 21:16:47 -0500 (Wed, 08 Jun 2011) New Revision: 4591 Modified: trunk/docs/userguide/profiles Log: added globus namespace profile internalhostname entry. Also added env namespace SWIFT_GEN_SCRIPTS entry Modified: trunk/docs/userguide/profiles =================================================================== --- trunk/docs/userguide/profiles 2011-06-09 02:16:22 UTC (rev 4590) +++ trunk/docs/userguide/profiles 2011-06-09 02:16:47 UTC (rev 4591) @@ -178,6 +178,13 @@ Swing window showing, graphically, the state of the coaster scheduler (blocks, jobs, etc.). Default: false +internalhostname - If the head node has multiple network interfaces, +only one of which is visible from the worker nodes. The choice of +which interface is the one that worker nodes can connect to is a +matter of the particular cluster. This must be set in the your +sites file to clarify to the workers which exact interface on the +head node they are to try to connect to. + env namespace ~~~~~~~~~~~~~ Profile keys set in the env namespace will be set in the unix @@ -204,3 +211,8 @@ about the remote site to be gathered and returned to the submit side. (since Swift 0.9) +SWIFT_GEN_SCRIPTS - set in the env namespace profiles. This variable +just needs to be set, it doesn't matter what it is set to. If set, then Swift +will keep the script that was used to execute the job in the job directory. +The script will be called run.sh and will have the command line that Swift +tried to execute with. From hategan at ci.uchicago.edu Wed Jun 8 21:16:59 2011 From: hategan at ci.uchicago.edu (hategan at ci.uchicago.edu) Date: Wed, 8 Jun 2011 21:16:59 -0500 (CDT) Subject: [Swift-commit] r4592 - trunk/src/org/griphyn/vdl/mapping Message-ID: <20110609021659.AF4369CFD6@svn.ci.uchicago.edu> Author: hategan Date: 2011-06-08 21:16:59 -0500 (Wed, 08 Jun 2011) New Revision: 4592 Modified: trunk/src/org/griphyn/vdl/mapping/ArrayDataNode.java Log: don't override AbstractDataNode's toString() Modified: trunk/src/org/griphyn/vdl/mapping/ArrayDataNode.java =================================================================== --- trunk/src/org/griphyn/vdl/mapping/ArrayDataNode.java 2011-06-09 02:16:47 UTC (rev 4591) +++ trunk/src/org/griphyn/vdl/mapping/ArrayDataNode.java 2011-06-09 02:16:59 UTC (rev 4592) @@ -13,13 +13,6 @@ protected ArrayDataNode(Field field, DSHandle root, DSHandle parent) { super(field, root, parent); } - - public String toString() { - String prefix = getDisplayableName(); - //return getType() + " " + prefix + "." + getPathFromRoot() + "[]/" + getHandles().size() - // + ": " + getValue(); - return prefix + "." + getPathFromRoot() + "[]/" + getHandles().size(); - } public void getFringePaths(List list, Path parentPath) throws HandleOpenException { checkMappingException(); From hategan at ci.uchicago.edu Wed Jun 8 21:17:49 2011 From: hategan at ci.uchicago.edu (hategan at ci.uchicago.edu) Date: Wed, 8 Jun 2011 21:17:49 -0500 (CDT) Subject: [Swift-commit] r4593 - trunk/src/org/griphyn/vdl/mapping Message-ID: <20110609021749.580CC9CFD6@svn.ci.uchicago.edu> Author: hategan Date: 2011-06-08 21:17:49 -0500 (Wed, 08 Jun 2011) New Revision: 4593 Modified: trunk/src/org/griphyn/vdl/mapping/RootArrayDataNode.java Log: also fix the initialization issue that was present in non-array types for arrays Modified: trunk/src/org/griphyn/vdl/mapping/RootArrayDataNode.java =================================================================== --- trunk/src/org/griphyn/vdl/mapping/RootArrayDataNode.java 2011-06-09 02:16:59 UTC (rev 4592) +++ trunk/src/org/griphyn/vdl/mapping/RootArrayDataNode.java 2011-06-09 02:17:49 UTC (rev 4593) @@ -1,7 +1,7 @@ package org.griphyn.vdl.mapping; -import java.util.Map; import java.util.Iterator; +import java.util.Map; import org.griphyn.vdl.karajan.VDL2FutureException; import org.griphyn.vdl.type.Field; @@ -50,9 +50,9 @@ } try { mapper = MapperFactory.getMapper(desc, params); - checkInputs(); getField().setName(PARAM_PREFIX.getStringValue(mapper)); initialized(); + checkInputs(); } catch (InvalidMapperException e) { throw new RuntimeException(e); @@ -73,7 +73,6 @@ setValue(new MappingDependentException(this, e)); closeShallow(); } - initialized(); } public void handleClosed(DSHandle handle) { From hategan at ci.uchicago.edu Wed Jun 8 21:18:37 2011 From: hategan at ci.uchicago.edu (hategan at ci.uchicago.edu) Date: Wed, 8 Jun 2011 21:18:37 -0500 (CDT) Subject: [Swift-commit] r4594 - trunk/src/org/griphyn/vdl/mapping Message-ID: <20110609021837.D29A89CFDA@svn.ci.uchicago.edu> Author: hategan Date: 2011-06-08 21:18:37 -0500 (Wed, 08 Jun 2011) New Revision: 4594 Modified: trunk/src/org/griphyn/vdl/mapping/RootDataNode.java Log: fixed the "mapper returned a path that it cannot subsequently map" error Modified: trunk/src/org/griphyn/vdl/mapping/RootDataNode.java =================================================================== --- trunk/src/org/griphyn/vdl/mapping/RootDataNode.java 2011-06-09 02:17:49 UTC (rev 4593) +++ trunk/src/org/griphyn/vdl/mapping/RootDataNode.java 2011-06-09 02:18:37 UTC (rev 4594) @@ -87,7 +87,6 @@ closeShallow(); return; } - initialized(); } public void handleClosed(DSHandle handle) { @@ -117,6 +116,11 @@ checkConsistency(root); } else if (mapper.isStatic()) { + if (root.isClosed()) { + // this means that code that would have used this variable is already done + // which can happen in cases such as if(false) {a = ...} + return; + } // Static mappers are (array) mappers which know the size of // an array statically. A good example is the fixed array mapper Iterator i = mapper.existing().iterator(); @@ -227,5 +231,5 @@ private void initialized() { initialized = true; waitingMapperParam = null; - } + } } From davidk at ci.uchicago.edu Wed Jun 8 22:45:00 2011 From: davidk at ci.uchicago.edu (davidk at ci.uchicago.edu) Date: Wed, 8 Jun 2011 22:45:00 -0500 (CDT) Subject: [Swift-commit] r4595 - in trunk/docs: cookbook tutorial tutorial/images tutorial/images/icons userguide Message-ID: <20110609034500.392239CFD6@svn.ci.uchicago.edu> Author: davidk Date: 2011-06-08 22:45:00 -0500 (Wed, 08 Jun 2011) New Revision: 4595 Added: trunk/docs/cookbook/images trunk/docs/tutorial/images/ trunk/docs/tutorial/images/icons/ trunk/docs/tutorial/images/icons/caution.png trunk/docs/tutorial/images/icons/example.png trunk/docs/tutorial/images/icons/home.png trunk/docs/tutorial/images/icons/important.png trunk/docs/tutorial/images/icons/next.png trunk/docs/tutorial/images/icons/note.png trunk/docs/tutorial/images/icons/prev.png trunk/docs/tutorial/images/icons/tip.png trunk/docs/tutorial/images/icons/up.png trunk/docs/tutorial/images/icons/warning.png trunk/docs/userguide/images Log: Add the default asciidoc icons (for warnings, tips, etc) Added: trunk/docs/cookbook/images =================================================================== --- trunk/docs/cookbook/images (rev 0) +++ trunk/docs/cookbook/images 2011-06-09 03:45:00 UTC (rev 4595) @@ -0,0 +1 @@ +link ../tutorial/images \ No newline at end of file Property changes on: trunk/docs/cookbook/images ___________________________________________________________________ Added: svn:special + * Added: trunk/docs/tutorial/images/icons/caution.png =================================================================== (Binary files differ) Property changes on: trunk/docs/tutorial/images/icons/caution.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/docs/tutorial/images/icons/example.png =================================================================== (Binary files differ) Property changes on: trunk/docs/tutorial/images/icons/example.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/docs/tutorial/images/icons/home.png =================================================================== (Binary files differ) Property changes on: trunk/docs/tutorial/images/icons/home.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/docs/tutorial/images/icons/important.png =================================================================== (Binary files differ) Property changes on: trunk/docs/tutorial/images/icons/important.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/docs/tutorial/images/icons/next.png =================================================================== (Binary files differ) Property changes on: trunk/docs/tutorial/images/icons/next.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/docs/tutorial/images/icons/note.png =================================================================== (Binary files differ) Property changes on: trunk/docs/tutorial/images/icons/note.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/docs/tutorial/images/icons/prev.png =================================================================== (Binary files differ) Property changes on: trunk/docs/tutorial/images/icons/prev.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/docs/tutorial/images/icons/tip.png =================================================================== (Binary files differ) Property changes on: trunk/docs/tutorial/images/icons/tip.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/docs/tutorial/images/icons/up.png =================================================================== (Binary files differ) Property changes on: trunk/docs/tutorial/images/icons/up.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/docs/tutorial/images/icons/warning.png =================================================================== (Binary files differ) Property changes on: trunk/docs/tutorial/images/icons/warning.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/docs/userguide/images =================================================================== --- trunk/docs/userguide/images (rev 0) +++ trunk/docs/userguide/images 2011-06-09 03:45:00 UTC (rev 4595) @@ -0,0 +1 @@ +link ../tutorial/images/ \ No newline at end of file Property changes on: trunk/docs/userguide/images ___________________________________________________________________ Added: svn:special + * From jonmon at ci.uchicago.edu Thu Jun 9 14:02:18 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Thu, 9 Jun 2011 14:02:18 -0500 (CDT) Subject: [Swift-commit] r4596 - in SwiftApps/Montage: . docs docs/images docs/images/icons exec Message-ID: <20110609190218.EDEA99CFC7@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-09 14:02:18 -0500 (Thu, 09 Jun 2011) New Revision: 4596 Added: SwiftApps/Montage/docs/ SwiftApps/Montage/docs/API.html SwiftApps/Montage/docs/API.txt SwiftApps/Montage/docs/images/ SwiftApps/Montage/docs/images/icons/ SwiftApps/Montage/docs/images/icons/note.png SwiftApps/Montage/docs/images/icons/warning.png SwiftApps/Montage/docs/updateAPI.sh Modified: SwiftApps/Montage/exec/montage.sh Log: o Added asciidoc documentation for the Swift Montage wrappers. o Updated the montage.sh execution script Added: SwiftApps/Montage/docs/API.html =================================================================== --- SwiftApps/Montage/docs/API.html (rev 0) +++ SwiftApps/Montage/docs/API.html 2011-06-09 19:02:18 UTC (rev 4596) @@ -0,0 +1,1108 @@ + + + + + +Swift Montage API + + + + + +
    +
    +
    +

    This is the API for the Swift Montage wrappers. Montage is a toolkit for +generating science grade astronomical mosaics. The image file format for +Montage is Flexible Image Transport System or FITS.

    +

    Swift is a dataflow parallel scripting language. The language allows the user +to parallelize a workflow that has been represented as a swiftscript. Swift +implements the site execution model to allow for efficient use of available +resources for the users application.

    +
    +
    +
    +

    Swift Montage API

    +
    +
    +

    Types

    +

    These are all the Types that are declared for Swift

    +
    +
    Image
    +
    +
    type Image;
    +
    +

    This is the Image type. It is used to declare the raw images, projected +images, difference images, rectified images, and the mosaic.

    +
    +
    MosaicData
    +
    +
    type MosaicData;
    +
    +

    This is the MosaicData type. It is used to declare and map to the FITS header +file.

    +
    +
    Table
    +
    +
    type Table;
    +
    +

    This is the Table type. During the execution of the workflow several files of +metadata is generated. These are tables that the Montage functions use to read +for the next stage of the workflow.

    +
    +
    JPEG
    +
    +
    type JPEG
    +
    +

    This is the JPEG type. This is used to map to the jpeg version of the mosaic.

    +
    +
    Status
    +
    +
    type Status;
    +
    +

    This is the status type. During the difference stage of the workflow status +file are generated that have the information about the coefficients that will +be used to rectify the image.

    +
    +
    BackgroundStruct
    +
    +
    type BackgroundStruct
    +{
    +    string fname;
    +    float a;
    +    float b;
    +    float c;
    +};
    +
    +

    This is a struct type. The entries are a string for the name of the image and +three coefficients to rectify this portion of the mosaic of all floating point +types.

    +
    +
    DiffStruct
    +
    +
    type DiffStruct
    +{
    +    int cntr1;
    +    int cntr2;
    +    Image plus;
    +    Image minus;
    +    Image diff;
    +};
    +
    +

    This is a struct type. The entries are two control integers that make this +entry unique, the two images that overlapped which are name plus and minus, +and the name of the difference image that they produced.

    +
    +
    +

    App Procedures

    +

    These are all the app procedures for Swift Montage. Currently the options to +the Montage functions are hard coded and the user cannot choose which options +to run.

    +
    +
    mAdd
    +
    +
    app ( Image mos ) mAdd( Image imgs[], Table img_tbl, MosaicData hdr )
    +
    +

    This app procedure will call the mAdd fucntion from the Montage toolkit. This +procedure takes +in a list of images to be added together, the img_tbl for these images, and +the FITS header file for the mosaic being created. The procedure then outputs +a single FITS file that represents the mosaic. All the images that will be +part of this mosaic must reside in the same directory.

    +
    +
    mBackground
    +
    +
    app ( Image bg_img ) mBackground( Image img, Image area_img, float a, float b, float c )
    +
    +

    This app procedure will call the mBackground function from the Montage +toolkit. This procedure takes in a single image along with the area image file that has +been generated by either mProject or the faster mProjectPP along with the +three coefficients. The procedure then output the background rectified image +after the coefficients have been applied.

    +
    +
    mBgModel
    +
    +
    app ( Table corr_tbl ) mBgModel( Table img_tbl, Table fits_tbl )
    +
    +

    This app procedure will call the mBgModel function from the Montage +toolkit. This procedure takes in an image table that represents the list of images that +will be added into a mosaic and a table of the information that is required to +fit them together. The procedure will then output a corrections table of the +coefficients that must be applied to the images.

    +
    +
    mConcatFit
    +
    +
    app ( Table fits_tbl ) mConcatFit( Table status_tbl, Status stats[] )
    +
    +

    This app procedure will call the mConcatFit function from the Montage +toolkit. This procedure takes in a table representing the status files that were generated +from either mFitplane or mDiffFit and a list of these status files as +input. The procedure will then output a table of all the status files +together. The status files must all reside in the same directory.

    +
    +
    mDiff
    +
    +
    app ( Image diff_img ) mDiff( Image proj_img_1, Image area_img_1, Image proj_img_2, Image area_img_2, MosaicData hdr )
    +
    +

    This app procedure will call the mDiff function from the Montage toolkit. This +procedure takes in two images along with their associated area image files and +the FITS header file for the mosaic. The procedure will then output a +difference image representing the information of where the two images overlap.

    +
    +
    mDiffFit
    +
    +
    app ( Image diff_img, Status stat ) mDiffFit( Image img_1, Image area_img_1, Image img_2, Image area_img_2, MosaicData hdr )
    +
    +

    This app procedure will call the mDiffFit function from the Montage +toolkit. The mDiffFit function in Montage is the combination of the mDiff and +mFitplane functions.

    +
    +
    mFitplane
    +
    +
    app ( Status stat ) mFitplane( Image diff_img )
    +
    +

    This app procedure will call the mFitplane function from the Montage +toolkit. This procedure takes in as input the difference image that was the output from +the mDiff procedure. The procedure will then output a status file that +contains the information on how to fit these two images together.

    +
    +
    mImgtbl
    +
    +
    app ( Table img_tbl ) mImgtbl( Image imgs[] )
    +
    +

    This app procedure will call the mImgtbl function from the Montage +toolkit. This procedure takes in as input a list of images to create a table +from. The output is an image table that represents these images. All the +images that will be part of this table must reside in the same directory.

    +
    +
    mMakeHdr
    +
    +
    app ( MosaicData hdr ) mMakeHdr( Table img_tbl )
    +
    +

    This app procedure will call the mMakeHdr function from the Montage +toolkit. This procedure will take in as input an image table representing the +images that will be combined into a single mosaic. The procedure will then output the +FITS header file for the mosaic.

    +
    +
    mJPEG
    +
    +
    app ( JPEG mos_img_jpg ) mJPEG( Image mos_img )
    +
    +

    This app procedure will call the mJPEG function from the Montage toolkit. This +procedure will take in as input as input a FITS image. The procedure will +then ouput the same image in jpeg format.

    +
    +
    mOverlaps
    +
    +
    app ( Table diff_tbl ) mOverlaps( Table img_tbl )
    +
    +

    This app procedure will call the mOverlaps function from the Montage +toolkit. This procedure takes in as input an image table of the images that +will be combined into a single mosaic. The procedure will then output a table +of all the images that overlap with each other in the mosaic.

    +
    +
    mProjectPP
    +
    +
    app ( Image proj_img, Image area_img ) mProjectPP( Image raw_img, MosaicData hdr )
    +
    +

    This app procedure will call the mProjectPP function from the Montage +toolkit. This procedure takes in as input a FITS image file and the FITS header file +that for the mosaic. The output is the projected image and the area image file +associated with the projected image.

    +
    + + + +
    +Note +The mProjectPP app procedure is a "special case" version of mProject +and can be used only where the input and output images have tangent-plane +projections (e.g. TAN, SIN) or where they can be approximated with acceptable +error.
    +
    +
    +
    mProject
    +
    +
    app ( Image proj_img, Image area_img ) mProject( Image raw_img, MosaicData hdr )
    +
    +

    This app procedure will call the mProject function from the Montage +toolkit. This procedure takes in as input a FITS image file and the FITS header file +that for the mosaic. The output is the projected image and the area image file +associated with the projected image.

    +
    + + + +
    +Note +The mProject app procedure is for general projection. There are some cases in +which the faster mProjectPP procedure should be used.
    +
    +
    +
    mShrink
    +
    +
    app ( Image shrunk ) mShrink( Image original, int factor )
    +
    +

    This app procedure will call the mShrink function in the Montage toolkit. This +procedure takes in as input a single image and an re-sizing factor represented +as an integer. The procedure will then output the re-sized image.

    +
    +
    Backgound_list
    +
    +
    app ( Table back_tbl ) Background_list( Table imgs_tbl, Table corrs_tbl )
    +
    +

    This app procedure will call the Background_list python script that is included in +the scripts directory for the Swift Montage wrappers. This procedure takes in as input an image table of the +images that are being combined into a single mosaic and the table of +coefficients to rectify the mosaic. The procedure will then output a file in a +format that can be read in by the Swift readData2 function into the +Background_struct declared type.

    +
    +
    create_status_table
    +
    +
    app ( Table stat_tbl ) create_status_table( Table diff_tbl )
    +
    +

    This app procedure will call the create_status_table python script that is +included in the scripts directory for the Swift Montage wrappers. This +procedure takes in as input the difference table that has been generated by +the mOverlaps procedure. The procedure will the output a table that can be +used as input to the mConcatFit app procedure.

    +
    +
    +

    Batch Wrappers

    +

    These are the Batch scripts. These scripts do most of the file mapping +and is where the parallelization is taking place.

    +
    +
    mBackgroundBatch
    +
    +
    ( Image corr_imgs[] ) mBackgroundBatch( Image bg_imgs[], Table img_tbl, Table corr_tbl )
    +
    +

    This batch swift script takes in a list of images that will be combined into a +mosaic, an image table representing the images for the mosaic, and a table of +the coefficients that must be applied to each image. The script will then +output a list of the images after the coefficients have been applied. The +application of the coefficients to each image is done in parallel.

    +
    + + + +
    +Note +mBackgroundBatch calls the mBackground app procedure.
    +
    +
    +
    mDiffBatch
    +
    +
    ( Image diff_imgs[] ) mDiffBatch( string src_dir, string dest_dir, string files[], Table diff_tbl, MosaicData hdr )
    +
    +

    This batch script takes in as input a source directory of where the images to calculate +overlaps are located, a destination directory of where to store these +difference images, a list of the file names for the images that will be +combined into the mosaic, a difference table that contains which images overlap with +each other, and the FITS header file for the mosaic. This script will then +output the difference images. The calculation each difference image are +done in parallel.

    +
    + + + +
    +Warning +The images that are in the source directory must be projected images +and the area files for these images must also reside in the source directory.
    +
    +
    + + + +
    +Note +mDiffBatch calls the mDiff app procedure.
    +
    +
    +
    mDiffFitBatch
    +
    +
    ( Image diff_imgs[], Table fits_tbl ) mDiffFitBatch( string src_dir, string dest_dir, string files[], Table diff_tbl, MosaicData hdr )
    +
    +

    This batch script takes in as input a source directory of where the images to +calculate overlaps are located, a destination directory of where to store +these difference images, a list of the file names for the images that will be +combined into the mosaic, a difference table that contains which images overlap +with each other and the FITS header file for the mosaic. This script will then +output a list of difference images and a table of information on how to fit +the images together. The calculation of each difference image and the fitting +table is done in parallel.

    +
    + + + +
    +Warning +The images that are in the source directory must be projected images +and the area files for these images must also reside in the source directory.
    +
    +
    + + + +
    +Note +mDiffFitBatch calls the mDiffFit app procedure.
    +
    +
    +
    mFitBatch
    +
    +
    ( Table fits_tbl ) mFitBatch( Image diff_imgs[], Table diff_tbl )
    +
    +

    This batch script takes in as input the list of difference images that has +been generated and the table that contains which images overlap with each +other. The script then generates a table containing describing how to fit the +two overalpping images together.

    +
    + + + +
    +Note +mFitBatch calls the mFitplane app procedure.
    +
    +
    +
    mProjectBatch
    +
    +
    ( Image proj_imgs[], Image area_imgs[] ) mProjectBatch( Image raw_imgs[], MosaicData hdr )
    +
    +

    This batch script takes in list of raw image files and the FITS header file +and projects each image. When projecting each image the function will decide +if it is possible to use the fast image projetion algorithm or to just use +standard projection. Also, an area image file is generated for each projected +image that is used in later functions.

    +
    + + + +
    +Note +mProjectBatch calls the faster mProjectPP app procedure if the image allows +it. If mProjectPP cannot be used then the app procedure mProject is called.
    +
    +
    +
    +
    +
    +

    + + + Added: SwiftApps/Montage/docs/API.txt =================================================================== --- SwiftApps/Montage/docs/API.txt (rev 0) +++ SwiftApps/Montage/docs/API.txt 2011-06-09 19:02:18 UTC (rev 4596) @@ -0,0 +1,324 @@ +Swift Montage API +================= + +This is the API for the Swift Montage wrappers. Montage is a toolkit for +generating science grade astronomical mosaics. The image file format for +Montage is Flexible Image Transport System or FITS. + +Swift is a dataflow parallel scripting language. The language allows the user +to parallelize a workflow that has been represented as a swiftscript. Swift +implements the site execution model to allow for efficient use of available +resources for the users application. + +[[X1]] + +Swift Montage API +----------------- + +Types +~~~~~ +These are all the Types that are declared for Swift + +.Image +---- +type Image; +---- +This is the Image type. It is used to declare the raw images, projected +images, difference images, rectified images, and the mosaic. + +.MosaicData +---- +type MosaicData; +---- +This is the MosaicData type. It is used to declare and map to the FITS header +file. + +.Table +---- +type Table; +---- +This is the Table type. During the execution of the workflow several files of +metadata is generated. These are tables that the Montage functions use to read +for the next stage of the workflow. + +.JPEG +---- +type JPEG +---- +This is the JPEG type. This is used to map to the jpeg version of the mosaic. + +.Status +---- +type Status; +---- +This is the status type. During the difference stage of the workflow status +file are generated that have the information about the coefficients that will +be used to rectify the image. + +.BackgroundStruct +---- +type BackgroundStruct +{ + string fname; + float a; + float b; + float c; +}; +---- +This is a struct type. The entries are a string for the name of the image and +three coefficients to rectify this portion of the mosaic of all floating point +types. + +.DiffStruct +---- +type DiffStruct +{ + int cntr1; + int cntr2; + Image plus; + Image minus; + Image diff; +}; +---- +This is a struct type. The entries are two control integers that make this +entry unique, the two images that overlapped which are name plus and minus, +and the name of the difference image that they produced. + +App Procedures +~~~~~~~~~~~~~~ +These are all the app procedures for Swift Montage. Currently the options to +the Montage functions are hard coded and the user cannot choose which options +to run. + +.mAdd +---- +app ( Image mos ) mAdd( Image imgs[], Table img_tbl, MosaicData hdr ) +---- +This app procedure will call the mAdd fucntion from the Montage toolkit. This +procedure takes +in a list of images to be added together, the img_tbl for these images, and +the FITS header file for the mosaic being created. The procedure then outputs +a single FITS file that represents the mosaic. All the images that will be +part of this mosaic must reside in the same directory. + +.mBackground +---- +app ( Image bg_img ) mBackground( Image img, Image area_img, float a, float b, float c ) +---- +This app procedure will call the mBackground function from the Montage +toolkit. This procedure takes in a single image along with the area image file that has +been generated by either mProject or the faster mProjectPP along with the +three coefficients. The procedure then output the background rectified image +after the coefficients have been applied. + +.mBgModel +---- +app ( Table corr_tbl ) mBgModel( Table img_tbl, Table fits_tbl ) +---- +This app procedure will call the mBgModel function from the Montage +toolkit. This procedure takes in an image table that represents the list of images that +will be added into a mosaic and a table of the information that is required to +fit them together. The procedure will then output a corrections table of the +coefficients that must be applied to the images. + +.mConcatFit +---- +app ( Table fits_tbl ) mConcatFit( Table status_tbl, Status stats[] ) +---- +This app procedure will call the mConcatFit function from the Montage +toolkit. This procedure takes in a table representing the status files that were generated +from either mFitplane or mDiffFit and a list of these status files as +input. The procedure will then output a table of all the status files +together. The status files must all reside in the same directory. + +.mDiff +---- +app ( Image diff_img ) mDiff( Image proj_img_1, Image area_img_1, Image proj_img_2, Image area_img_2, MosaicData hdr ) +---- +This app procedure will call the mDiff function from the Montage toolkit. This +procedure takes in two images along with their associated area image files and +the FITS header file for the mosaic. The procedure will then output a +difference image representing the information of where the two images overlap. + +.mDiffFit +---- +app ( Image diff_img, Status stat ) mDiffFit( Image img_1, Image area_img_1, Image img_2, Image area_img_2, MosaicData hdr ) +---- +This app procedure will call the mDiffFit function from the Montage +toolkit. The mDiffFit function in Montage is the combination of the mDiff and +mFitplane functions. + +.mFitplane +---- +app ( Status stat ) mFitplane( Image diff_img ) +---- +This app procedure will call the mFitplane function from the Montage +toolkit. This procedure takes in as input the difference image that was the output from +the mDiff procedure. The procedure will then output a status file that +contains the information on how to fit these two images together. + +.mImgtbl +---- +app ( Table img_tbl ) mImgtbl( Image imgs[] ) +---- +This app procedure will call the mImgtbl function from the Montage +toolkit. This procedure takes in as input a list of images to create a table +from. The output is an image table that represents these images. All the +images that will be part of this table must reside in the same directory. + +.mMakeHdr +---- +app ( MosaicData hdr ) mMakeHdr( Table img_tbl ) +---- +This app procedure will call the mMakeHdr function from the Montage +toolkit. This procedure will take in as input an image table representing the +images that will be combined into a single mosaic. The procedure will then output the +FITS header file for the mosaic. + +.mJPEG +---- +app ( JPEG mos_img_jpg ) mJPEG( Image mos_img ) +---- +This app procedure will call the mJPEG function from the Montage toolkit. This +procedure will take in as input as input a FITS image. The procedure will +then ouput the same image in jpeg format. + +.mOverlaps +---- +app ( Table diff_tbl ) mOverlaps( Table img_tbl ) +---- +This app procedure will call the mOverlaps function from the Montage +toolkit. This procedure takes in as input an image table of the images that +will be combined into a single mosaic. The procedure will then output a table +of all the images that overlap with each other in the mosaic. + +.mProjectPP +---- +app ( Image proj_img, Image area_img ) mProjectPP( Image raw_img, MosaicData hdr ) +---- +This app procedure will call the mProjectPP function from the Montage +toolkit. This procedure takes in as input a FITS image file and the FITS header file +that for the mosaic. The output is the projected image and the area image file +associated with the projected image. + +NOTE: The mProjectPP app procedure is a "special case" version of mProject +and can be used only where the input and output images have tangent-plane +projections (e.g. TAN, SIN) or where they can be approximated with acceptable +error. + +.mProject +---- +app ( Image proj_img, Image area_img ) mProject( Image raw_img, MosaicData hdr ) +---- +This app procedure will call the mProject function from the Montage +toolkit. This procedure takes in as input a FITS image file and the FITS header file +that for the mosaic. The output is the projected image and the area image file +associated with the projected image. + +NOTE: The mProject app procedure is for general projection. There are some cases in +which the faster mProjectPP procedure should be used. + +.mShrink +---- +app ( Image shrunk ) mShrink( Image original, int factor ) +---- +This app procedure will call the mShrink function in the Montage toolkit. This +procedure takes in as input a single image and an re-sizing factor represented +as an integer. The procedure will then output the re-sized image. + +.Backgound_list +---- +app ( Table back_tbl ) Background_list( Table imgs_tbl, Table corrs_tbl ) +---- +This app procedure will call the Background_list python script that is included in +the scripts directory for the Swift Montage wrappers. This procedure takes in as input an image table of the +images that are being combined into a single mosaic and the table of +coefficients to rectify the mosaic. The procedure will then output a file in a +format that can be read in by the Swift readData2 function into the +Background_struct declared type. + +.create_status_table +---- +app ( Table stat_tbl ) create_status_table( Table diff_tbl ) +---- +This app procedure will call the create_status_table python script that is +included in the scripts directory for the Swift Montage wrappers. This +procedure takes in as input the difference table that has been generated by +the mOverlaps procedure. The procedure will the output a table that can be +used as input to the mConcatFit app procedure. + +Batch Wrappers +~~~~~~~~~~~~~~ +These are the Batch scripts. These scripts do most of the file mapping +and is where the parallelization is taking place. + +.mBackgroundBatch +---- +( Image corr_imgs[] ) mBackgroundBatch( Image bg_imgs[], Table img_tbl, Table corr_tbl ) +---- +This batch swift script takes in a list of images that will be combined into a +mosaic, an image table representing the images for the mosaic, and a table of +the coefficients that must be applied to each image. The script will then +output a list of the images after the coefficients have been applied. The +application of the coefficients to each image is done in parallel. + +NOTE: mBackgroundBatch calls the mBackground app procedure. + +.mDiffBatch +---- +( Image diff_imgs[] ) mDiffBatch( string src_dir, string dest_dir, string files[], Table diff_tbl, MosaicData hdr ) +---- +This batch script takes in as input a source directory of where the images to calculate +overlaps are located, a destination directory of where to store these +difference images, a list of the file names for the images that will be +combined into the mosaic, a difference table that contains which images overlap with +each other, and the FITS header file for the mosaic. This script will then +output the difference images. The calculation each difference image are +done in parallel. + +WARNING: The images that are in the source directory must be projected images +and the area files for these images must also reside in the source directory. + +NOTE: mDiffBatch calls the mDiff app procedure. + +.mDiffFitBatch +---- +( Image diff_imgs[], Table fits_tbl ) mDiffFitBatch( string src_dir, string dest_dir, string files[], Table diff_tbl, MosaicData hdr ) +---- +This batch script takes in as input a source directory of where the images to +calculate overlaps are located, a destination directory of where to store +these difference images, a list of the file names for the images that will be +combined into the mosaic, a difference table that contains which images overlap +with each other and the FITS header file for the mosaic. This script will then +output a list of difference images and a table of information on how to fit +the images together. The calculation of each difference image and the fitting +table is done in parallel. + +WARNING: The images that are in the source directory must be projected images +and the area files for these images must also reside in the source directory. + +NOTE: mDiffFitBatch calls the mDiffFit app procedure. + +.mFitBatch +---- +( Table fits_tbl ) mFitBatch( Image diff_imgs[], Table diff_tbl ) +---- +This batch script takes in as input the list of difference images that has +been generated and the table that contains which images overlap with each +other. The script then generates a table containing describing how to fit the +two overalpping images together. + +NOTE: mFitBatch calls the mFitplane app procedure. + +.mProjectBatch +---- +( Image proj_imgs[], Image area_imgs[] ) mProjectBatch( Image raw_imgs[], MosaicData hdr ) +---- +This batch script takes in list of raw image files and the FITS header file +and projects each image. When projecting each image the function will decide +if it is possible to use the fast image projetion algorithm or to just use +standard projection. Also, an area image file is generated for each projected +image that is used in later functions. + +NOTE: mProjectBatch calls the faster mProjectPP app procedure if the image allows +it. If mProjectPP cannot be used then the app procedure mProject is called. Added: SwiftApps/Montage/docs/images/icons/note.png =================================================================== (Binary files differ) Property changes on: SwiftApps/Montage/docs/images/icons/note.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: SwiftApps/Montage/docs/images/icons/warning.png =================================================================== (Binary files differ) Property changes on: SwiftApps/Montage/docs/images/icons/warning.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: SwiftApps/Montage/docs/updateAPI.sh =================================================================== --- SwiftApps/Montage/docs/updateAPI.sh (rev 0) +++ SwiftApps/Montage/docs/updateAPI.sh 2011-06-09 19:02:18 UTC (rev 4596) @@ -0,0 +1,2 @@ +#!/bin/bash +asciidoc -a toc -a max-width=1100px -a icons API.txt Property changes on: SwiftApps/Montage/docs/updateAPI.sh ___________________________________________________________________ Added: svn:executable + * Modified: SwiftApps/Montage/exec/montage.sh =================================================================== --- SwiftApps/Montage/exec/montage.sh 2011-06-09 03:45:00 UTC (rev 4595) +++ SwiftApps/Montage/exec/montage.sh 2011-06-09 19:02:18 UTC (rev 4596) @@ -71,6 +71,6 @@ cp $4 ${WORK_DIRECTORY} cp -r $5 ${WORK_DIRECTORY} cd ${WORK_DIRECTORY} -echo "swift -tc.file tc.data -sites.file sites.xml -config ${SWIFT_MONTAGE}/etc/swift_montage.properties ${SWIFT_MONTAGE}/scripts/montage.swift | tee -a swift.out" +echo "clear ; swift -tc.file tc.data -sites.file sites.xml -config ${SWIFT_MONTAGE}/etc/swift_montage.properties ${SWIFT_MONTAGE}/scripts/montage.swift | tee -a swift.out" #clear ; swiftrun -sites localhost pads -input raw_dir header.hdr -script m101_montage.swift From jonmon at ci.uchicago.edu Thu Jun 9 16:36:04 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Thu, 9 Jun 2011 16:36:04 -0500 (CDT) Subject: [Swift-commit] r4597 - SwiftApps/Montage/docs Message-ID: <20110609213604.4F7009CFC7@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-09 16:36:04 -0500 (Thu, 09 Jun 2011) New Revision: 4597 Modified: SwiftApps/Montage/docs/API.html SwiftApps/Montage/docs/API.txt Log: updated documentation Modified: SwiftApps/Montage/docs/API.html =================================================================== --- SwiftApps/Montage/docs/API.html 2011-06-09 19:02:18 UTC (rev 4596) +++ SwiftApps/Montage/docs/API.html 2011-06-09 21:36:04 UTC (rev 4597) @@ -728,14 +728,24 @@ to parallelize a workflow that has been represented as a swiftscript. Swift implements the site execution model to allow for efficient use of available resources for the users application.

    +
    + + + +
    +Note +Both the Montage binaries as well as the Swift binaries must be included +in your PATH environment variable for the wrappers to function properly.
    +

    Swift Montage API

    Types

    -

    These are all the Types that are declared for Swift

    +

    These are all the Types that are declared for Swift. They are located in the +file Swift_Montage_types.swift.

    Image
    @@ -804,9 +814,17 @@

    App Procedures

    -

    These are all the app procedures for Swift Montage. Currently the options to -the Montage functions are hard coded and the user cannot choose which options -to run.

    +

    These are all the app procedures for Swift Montage. They are located in the +file Swift_Montage_Apps.swift

    +
    + + + +
    +Note +Currently the options to the Montage functions are hard coded and the +user cannot choose which options to run.
    +
    mAdd
    @@ -980,7 +998,8 @@

    Batch Wrappers

    These are the Batch scripts. These scripts do most of the file mapping -and is where the parallelization is taking place.

    +and is where the parallelization is taking place. They are located in the file +Swift_Montage_Batch.swift

    mBackgroundBatch
    @@ -1101,7 +1120,7 @@

    Modified: SwiftApps/Montage/docs/API.txt =================================================================== --- SwiftApps/Montage/docs/API.txt 2011-06-09 19:02:18 UTC (rev 4596) +++ SwiftApps/Montage/docs/API.txt 2011-06-09 21:36:04 UTC (rev 4597) @@ -10,6 +10,9 @@ implements the site execution model to allow for efficient use of available resources for the users application. +NOTE: Both the Montage binaries as well as the Swift binaries must be included +in your PATH environment variable for the wrappers to function properly. + [[X1]] Swift Montage API @@ -17,7 +20,8 @@ Types ~~~~~ -These are all the Types that are declared for Swift +These are all the Types that are declared for Swift. They are located in the +file Swift_Montage_types.swift. .Image ---- @@ -86,10 +90,12 @@ App Procedures ~~~~~~~~~~~~~~ -These are all the app procedures for Swift Montage. Currently the options to -the Montage functions are hard coded and the user cannot choose which options -to run. +These are all the app procedures for Swift Montage. They are located in the +file Swift_Montage_Apps.swift +NOTE: Currently the options to the Montage functions are hard coded and the +user cannot choose which options to run. + .mAdd ---- app ( Image mos ) mAdd( Image imgs[], Table img_tbl, MosaicData hdr ) @@ -250,7 +256,8 @@ Batch Wrappers ~~~~~~~~~~~~~~ These are the Batch scripts. These scripts do most of the file mapping -and is where the parallelization is taking place. +and is where the parallelization is taking place. They are located in the file +Swift_Montage_Batch.swift .mBackgroundBatch ---- From jonmon at ci.uchicago.edu Fri Jun 10 17:54:17 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Fri, 10 Jun 2011 17:54:17 -0500 (CDT) Subject: [Swift-commit] r4598 - SwiftApps/Montage/scripts Message-ID: <20110610225417.BA5659CCC5@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-10 17:54:17 -0500 (Fri, 10 Jun 2011) New Revision: 4598 Added: SwiftApps/Montage/scripts/copy_image.sh SwiftApps/Montage/scripts/mDiffFit_wrap.sh Modified: SwiftApps/Montage/scripts/Background_list.py SwiftApps/Montage/scripts/Swift_Montage_Apps.swift SwiftApps/Montage/scripts/Swift_Montage_Batch.swift SwiftApps/Montage/scripts/montage.swift Log: reverted back to not staging out the area files and calling mOverlaps on the projected images. For some reason when calling mOverlaps on the raw data the image became really distorted. Not sure why. Added mDiffFit_wrap.sh to allow this to run Modified: SwiftApps/Montage/scripts/Background_list.py =================================================================== --- SwiftApps/Montage/scripts/Background_list.py 2011-06-09 21:36:04 UTC (rev 4597) +++ SwiftApps/Montage/scripts/Background_list.py 2011-06-10 22:54:17 UTC (rev 4598) @@ -6,7 +6,8 @@ file_tbl_1 = open( args[1], 'r' ); file_tbl_o = open( args[3], 'w' ); -i = 0 +i = 0; +not_broke = True; for line_tbl_1 in file_tbl_1: @@ -20,15 +21,27 @@ l2 = line_tbl_2.split(); - if l2[0] == l1[0]: - str_out = "["+str(i)+"].fname = "+l1[len(l1) - 1]+"\n"; - str_out += "["+str(i)+"].a = "+l2[1]+"\n"; - str_out += "["+str(i)+"].b = "+l2[2]+"\n"; - str_out += "["+str(i)+"].c = "+l2[3]+"\n"; - file_tbl_o.write( str_out ); - i+=1; - break; + if l2[0] != "|" and l2[0] != "\\datatype": + if int(l2[0]) == int(l1[0]): + str_out = "["+str(i)+"].fname = "+l1[len(l1) - 1]+"\n"; + str_out += "["+str(i)+"].a = "+l2[1]+"\n"; + str_out += "["+str(i)+"].b = "+l2[2]+"\n"; + str_out += "["+str(i)+"].c = "+l2[3]+"\n"; + file_tbl_o.write( str_out ); + i = int(i); + i+=1; + not_broke=False; + break; + + if not_broke: + str_out = "["+str(i)+"].fname = "+l1[len(l1) - 1]+"\n"; + str_out += "["+str(i)+"].a = 0\n"; + str_out += "["+str(i)+"].b = 0\n"; + str_out += "["+str(i)+"].c = 0\n"; + file_tbl_o.write( str_out ); + i = int(i); + i+=1; file_tbl_2.close(); file_tbl_1.close(); Modified: SwiftApps/Montage/scripts/Swift_Montage_Apps.swift =================================================================== --- SwiftApps/Montage/scripts/Swift_Montage_Apps.swift 2011-06-09 21:36:04 UTC (rev 4597) +++ SwiftApps/Montage/scripts/Swift_Montage_Apps.swift 2011-06-10 22:54:17 UTC (rev 4598) @@ -4,9 +4,9 @@ } -app ( Image bg_img ) mBackground( Image img, Image area_img, float a, float b, float c ) +app ( Image bg_img ) mBackground( Image img, float a, float b, float c ) { - mBackground @img @bg_img a b c; + mBackground "-n" @img @bg_img a b c; } @@ -22,21 +22,24 @@ } -app ( Image diff_img ) mDiff( Image proj_img_1, Image area_img_1, Image proj_img_2, Image area_img_2, MosaicData hdr ) +app ( Image diff_img ) mDiff( Image proj_img_1, Image proj_img_2, MosaicData hdr ) { - mDiff at proj_img_1 @proj_img_2 @diff_img @hdr; +// mDiff "-n" @proj_img_1 @proj_img_2 @diff_img @hdr; + mDiff_wrap "-n" @proj_img_1 @proj_img_2 @diff_img @hdr; } -app ( Image diff_img, Status stat ) mDiffFit( Image img_1, Image area_img_1, Image img_2, Image area_img_2, MosaicData hdr ) +app ( Image diff_img, Status stat ) mDiffFit( Image img_1, Image img_2, MosaicData hdr ) { - mDiffFit "-s" @stat @img_1 @img_2 @diff_img @hdr; +// mDiffFit "-n" "-s" @stat @img_1 @img_2 @diff_img @hdr; + mDiffFit_wrap "-n" "-s" @stat @img_1 @img_2 @diff_img @hdr; } app ( Status stat ) mFitplane( Image diff_img ) { - mFitplane"-s" @stat @diff_img; +// mFitplane "-s" @stat @diff_img; + mFitplane_wrap "-s" @stat @diff_img; } @@ -70,7 +73,7 @@ } -app ( Image proj_img, Image area_img ) mProject( Image raw_img, MosaicData hdr ) +app ( Image proj_img ) mProject( Image raw_img, MosaicData hdr ) { mProject "-X" @raw_img @proj_img @hdr; } Modified: SwiftApps/Montage/scripts/Swift_Montage_Batch.swift =================================================================== --- SwiftApps/Montage/scripts/Swift_Montage_Batch.swift 2011-06-09 21:36:04 UTC (rev 4597) +++ SwiftApps/Montage/scripts/Swift_Montage_Batch.swift 2011-06-10 22:54:17 UTC (rev 4598) @@ -7,13 +7,12 @@ foreach background_entry, i in back_struct { Image proj_img ; - Image area_img ; Image corr_img ; float a = background_entry.a; float b = background_entry.b; float c = background_entry.c; - corr_img = mBackground( proj_img, area_img, a, b, c ); + corr_img = mBackground( proj_img, a, b, c ); corr_imgs[ i ] = corr_img; } @@ -28,11 +27,9 @@ { Image img_1 ; Image img_2 ; - Image area_img_1 ; - Image area_img_2 ; Image diff_img ; - diff_img = mDiff( img_1, area_img_1, img_2, area_img_2, hdr ); + diff_img = mDiff( img_1, img_2, hdr ); diff_imgs[ i ] = diff_img; } @@ -40,26 +37,23 @@ ( Image diff_imgs[], Table fits_tbl ) mDiffFitBatch( string src_dir, string dest_dir, string files[], Table diff_tbl, MosaicData hdr ) -//( Image diff_imgs[], Table fits_tbl ) mDiffFitBatch( string src_dir, string dest_dir, Table diff_tbl, MosaicData hdr ) { DiffStruct diffs[] ; Status stats[]; Table status_tbl = create_status_table( diff_tbl ); - + foreach d_entry, i in diffs { - Image img_1 ; - Image img_2 ; - Image area_img_1 ; - Image area_img_2 ; + Image img_1 ; + Image img_2 ; Image diff_img ; - Status stat ; + Status stat ; + + ( diff_img, stat ) = mDiffFit( img_1, img_2, hdr ); - ( diff_img, stat ) = mDiffFit( img_1, area_img_1, img_2, area_img_2, hdr ); - - diff_imgs[ i ] = diff_img; + diff_imgs[ i ] = diff_img; stats[ i ] = stat; } fits_tbl = mConcatFit( status_tbl, stats ); @@ -81,17 +75,14 @@ } -( Image proj_imgs[], Image area_imgs[] ) mProjectBatch( Image raw_imgs[], MosaicData hdr ) +( Image proj_imgs[] ) mProjectBatch( Image raw_imgs[], MosaicData hdr ) { foreach img, i in raw_imgs { Image proj_img ; - Image area_img ; -// proj_img = mProject( img, hdr ); + proj_img = mProject( img, hdr ); // proj_img = mProjectPP( img, hdr ); - ( proj_img, area_img ) = mProject( img, hdr ); proj_imgs[ i ] = proj_img; - area_imgs[ i ] = area_img; } } Added: SwiftApps/Montage/scripts/copy_image.sh =================================================================== --- SwiftApps/Montage/scripts/copy_image.sh (rev 0) +++ SwiftApps/Montage/scripts/copy_image.sh 2011-06-10 22:54:17 UTC (rev 4598) @@ -0,0 +1,3 @@ +#!/bin/bash + +cp $2 $1 \ No newline at end of file Property changes on: SwiftApps/Montage/scripts/copy_image.sh ___________________________________________________________________ Added: svn:executable + * Added: SwiftApps/Montage/scripts/mDiffFit_wrap.sh =================================================================== --- SwiftApps/Montage/scripts/mDiffFit_wrap.sh (rev 0) +++ SwiftApps/Montage/scripts/mDiffFit_wrap.sh 2011-06-10 22:54:17 UTC (rev 4598) @@ -0,0 +1,11 @@ +#!/bin/bash + +mDiffFit $1 $2 $3 $4 $5 $6 $7 + +mkdir -p `dirname $3` +touch $3 + +mkdir -p `dirname $6` +touch $6 + +exit 0 Property changes on: SwiftApps/Montage/scripts/mDiffFit_wrap.sh ___________________________________________________________________ Added: svn:executable + * Modified: SwiftApps/Montage/scripts/montage.swift =================================================================== --- SwiftApps/Montage/scripts/montage.swift 2011-06-09 21:36:04 UTC (rev 4597) +++ SwiftApps/Montage/scripts/montage.swift 2011-06-10 22:54:17 UTC (rev 4598) @@ -12,18 +12,19 @@ Image corrected_mos <"final/corrected.fits">; JPEG corrected_jpg_img <"final/corrected.jpg">; Image projected_images[]; -Image projected_areas[]; Image difference_images[]; Image corrected_images[]; Image raw_image_files[] ; -difference_tbl = mOverlaps( raw_images_tbl ); +//difference_tbl = mOverlaps( raw_images_tbl ); -( projected_images, projected_areas ) = mProjectBatch( raw_image_files, header ); +projected_images = mProjectBatch( raw_image_files, header ); images_tbl = mImgtbl( projected_images ); +difference_tbl = mOverlaps( images_tbl ); + ( difference_images, fits_images_tbl ) = mDiffFitBatch( "proj_dir", "diff_dir", @filenames(projected_images), difference_tbl, header ); corrections_tbl = mBgModel( images_tbl, fits_images_tbl ); From jonmon at ci.uchicago.edu Fri Jun 10 20:03:26 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Fri, 10 Jun 2011 20:03:26 -0500 (CDT) Subject: [Swift-commit] r4599 - SwiftApps/Montage/scripts Message-ID: <20110611010326.224189CCC5@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-10 20:03:25 -0500 (Fri, 10 Jun 2011) New Revision: 4599 Modified: SwiftApps/Montage/scripts/Swift_Montage_Apps.swift Log: A minor change to the parameters for mJPEG Modified: SwiftApps/Montage/scripts/Swift_Montage_Apps.swift =================================================================== --- SwiftApps/Montage/scripts/Swift_Montage_Apps.swift 2011-06-10 22:54:17 UTC (rev 4598) +++ SwiftApps/Montage/scripts/Swift_Montage_Apps.swift 2011-06-11 01:03:25 UTC (rev 4599) @@ -57,7 +57,7 @@ app ( JPEG mos_img_jpg ) mJPEG( Image mos_img ) { - mJPEG "-gray" @mos_img "0s" "max" "gaussian-log" "-out" @mos_img_jpg; + mJPEG "-gray" @mos_img "20%" "99.98%" "loglog" "-out" @mos_img_jpg; } From hategan at ci.uchicago.edu Fri Jun 10 20:57:49 2011 From: hategan at ci.uchicago.edu (hategan at ci.uchicago.edu) Date: Fri, 10 Jun 2011 20:57:49 -0500 (CDT) Subject: [Swift-commit] r4600 - provider-wonky/src/org/globus/cog/abstraction/impl/file/wonky Message-ID: <20110611015749.69F799CCC5@svn.ci.uchicago.edu> Author: hategan Date: 2011-06-10 20:57:49 -0500 (Fri, 10 Jun 2011) New Revision: 4600 Modified: provider-wonky/src/org/globus/cog/abstraction/impl/file/wonky/FileResourceImpl.java Log: updated wonky provider Modified: provider-wonky/src/org/globus/cog/abstraction/impl/file/wonky/FileResourceImpl.java =================================================================== --- provider-wonky/src/org/globus/cog/abstraction/impl/file/wonky/FileResourceImpl.java 2011-06-11 01:03:25 UTC (rev 4599) +++ provider-wonky/src/org/globus/cog/abstraction/impl/file/wonky/FileResourceImpl.java 2011-06-11 01:57:49 UTC (rev 4600) @@ -28,6 +28,7 @@ import org.globus.cog.abstraction.impl.file.IllegalHostException; import org.globus.cog.abstraction.impl.file.PermissionsImpl; import org.globus.cog.abstraction.interfaces.ExecutableObject; +import org.globus.cog.abstraction.interfaces.FileFragment; import org.globus.cog.abstraction.interfaces.FileResource; import org.globus.cog.abstraction.interfaces.GridFile; import org.globus.cog.abstraction.interfaces.Permissions; @@ -208,22 +209,17 @@ } } - public void getFile(String remoteFileName, String localFileName) - throws FileResourceException { - getFile(remoteFileName, localFileName, null); - } - /** copy a file */ - public void getFile(String remoteFileName, String localFileName, + public void getFile(FileFragment remote, FileFragment local, ProgressMonitor progressMonitor) throws FileResourceException { try { - File src = resolve(remoteFileName); + File src = resolve(remote.getFile()); if (!src.exists()) { throw new FileNotFoundException("File not found: " + src.getAbsolutePath()); } - File dst = resolve(localFileName); + File dst = resolve(local.getFile()); // silently ignore requests for which source == destination if (dst.getCanonicalPath().equals(src.getCanonicalPath())) { return; @@ -248,17 +244,11 @@ } } - public void putFile(String localFileName, String remoteFileName, + public void putFile(FileFragment local, FileFragment remote, ProgressMonitor progressMonitor) throws FileResourceException { - getFile(localFileName, remoteFileName, progressMonitor); + getFile(local, remote, progressMonitor); } - /** copy a file */ - public void putFile(String localFileName, String remoteFileName) - throws FileResourceException { - getFile(localFileName, remoteFileName); - } - /** copy a directory */ public void getDirectory(String remoteDirName, String localDirName) throws FileResourceException { @@ -396,4 +386,13 @@ return gridFile; } + @Override + public boolean supportsPartialTransfers() { + return false; + } + + @Override + public boolean supportsThirdPartyTransfers() { + return false; + } } From jonmon at ci.uchicago.edu Sat Jun 11 22:12:34 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Sat, 11 Jun 2011 22:12:34 -0500 (CDT) Subject: [Swift-commit] r4601 - trunk/docs/userguide Message-ID: <20110612031234.4430A9CFDF@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-11 22:12:31 -0500 (Sat, 11 Jun 2011) New Revision: 4601 Modified: trunk/docs/userguide/app_procedures trunk/docs/userguide/mappers Log: Update the import section inf the mappers file for the userguide. Also fixed a type for the readData fuction. Modified: trunk/docs/userguide/app_procedures =================================================================== --- trunk/docs/userguide/app_procedures 2011-06-11 01:57:49 UTC (rev 4600) +++ trunk/docs/userguide/app_procedures 2011-06-12 03:12:31 UTC (rev 4601) @@ -403,9 +403,9 @@ the same order as the header row and separated by whitespace. (since Swift 0.4) -readdata2 +readData2 ~~~~~~~~~ -readdata2 will read data from a specified file, like readdata, but +readData2 will read data from a specified file, like readdata, but using a different file format more closely related to that used by the ext mapper. Modified: trunk/docs/userguide/mappers =================================================================== --- trunk/docs/userguide/mappers 2011-06-11 01:57:49 UTC (rev 4600) +++ trunk/docs/userguide/mappers 2011-06-12 03:12:31 UTC (rev 4601) @@ -18,7 +18,7 @@ "/home/yongzh/data/", then the dataset might be declared as follows: ---- -imagefile f1 +imagefile f1 ---- The above example declares a dataset called f1, which uses a single file @@ -28,7 +28,7 @@ single_file_mapper is frequently used: ---- -binaryfile f1<"/home/yongzh/data/file1.bin"> +binaryfile f1<"/home/yongzh/data/file1.bin"> ---- Swift comes with a number of mappers that handle common mapping @@ -66,7 +66,7 @@ Declaration statements have the general form: ---- -typename variablename ( | = initialValue ) ; +typename variablename ( | = initialValue ) ; ---- The format of the mapping expression is defined in the Mappers section. @@ -84,7 +84,7 @@ assigned. Assignment statements have the general form: ---- -variable = value; +variable = value; ---- where value can be either an expression or a procedure call that returns @@ -106,7 +106,7 @@ function name, and outputs are specified to the left. For example: ---- -(type3 out1, type4 out2) myproc (type1 in1, type2 in2) +(type3 out1, type4 out2) myproc (type1 in1, type2 in2) ---- The above example declares a procedure called myproc, which has two @@ -121,18 +121,18 @@ passing. For example, if myproc1 is defined as: ---- -(binaryfile bf) myproc1 (int i, string s="foo") +(binaryfile bf) myproc1 (int i, string s="foo") ---- Then that procedure can be called like this, omitting the optional ---- parameter s: -binaryfile mybf = myproc1(1); +binaryfile mybf = myproc1(1); ---- or like this supplying a value for the optional parameter s: ---- -binaryfile mybf = myproc1 (1, s="bar"); +binaryfile mybf = myproc1 (1, s="bar"); ---- Atomic procedures @@ -143,9 +143,9 @@ Atomic procedures are defined with the app keyword: ---- -app (binaryfile bf) myproc (int i, string s="foo") { - myapp i s @filename(bf); -} +app (binaryfile bf) myproc (int i, string s="foo") { + myapp i s @filename(bf); +} ---- which specifies that myproc invokes an executable called myapp, @@ -158,11 +158,11 @@ A compound procedure contains a set of SwiftScript statements: ---- -(type2 b) foo_bar (type1 a) { - type3 c; - c = foo(a); // c holds the result of foo - b = bar(c); // c is an input to bar -} +(type2 b) foo_bar (type1 a) { + type3 c; + c = foo(a); // c holds the result of foo + b = bar(c); // c is an input to bar +} ---- Control Constructs @@ -178,19 +178,19 @@ element in an array. For example: ---- -check_order (file a[]) { - foreach f in a { - compute(f); - } -} +check_order (file a[]) { + foreach f in a { + compute(f); + } +} ---- foreach statements have the general form: ---- -foreach controlvariable (,index) in expression { - statements -} +foreach controlvariable (,index) in expression { + statements +} ---- The block of statements is evaluated once for each element in @@ -206,11 +206,11 @@ the form: ---- -if(predicate) { - statements -} else { - statements -} +if(predicate) { + statements +} else { + statements +} ---- where predicate is a boolean expression. @@ -224,15 +224,15 @@ statements take the general form: ---- -switch(controlExpression) { - case n1: - statements2 - case n2: - statements2 - [...] - default: - statements -} +switch(controlExpression) { + case n1: + statements2 + case n2: + statements2 + [...] + default: + statements +} ---- The control expression is evaluated, the resulting numerical value used @@ -254,9 +254,9 @@ The general form is: ---- -iterate var { - statements; -} until (terminationExpression); +iterate var { + statements; +} until (terminationExpression); ---- with the variable var starting at 0 and increasing by one in each @@ -300,18 +300,39 @@ For example, a SwiftScript program might contain this: ---- -import defs; -file f; +import "defs"; +file f; ---- -which would import the content of defs.swift in the current directory: +which would import the content of defs.swift: ---- -type file; +type file; ---- -Imported files are read from the current working directory. +Imported files are read from two places. They are either read from +the path that is specified from the import command, such as: +---- +import "definitions/file/defs"; +---- +or they are read from the environment variable SWIFT_LIB. This +environment variable is used just like the PATH environment +variable. For example, if the command below was issued to the bash +shell: +---- +export SWIFT_LIB=${HOME}/Swift/defs:${HOME}/Swift/functions +---- +then the import command will check for the file defs.swift in both +"$\{HOME}/Swift/defs" and "$\{HOME}/Swift/functions" first before trying +the path that was specified in the import command. + +Other valid imports: +---- +import "../functions/func" +import "/home/user/Swift/definitions/defs" +---- + There is no requirement that a module is imported only once. If a module is imported multiple times, for example in different files, then Swift will only process the imports once. @@ -342,7 +363,7 @@ |f[0]|INVALID |f.bar|INVALID |======================= - + [options="header, autowidth"] |================= |parameter|meaning @@ -351,12 +372,12 @@ Example: ---- -file f ; +file f ; ---- There is a simplified syntax for this mapper: ---- -file f <"plot_outfile_param">; +file f <"plot_outfile_param">; ---- The simple mapper @@ -377,8 +398,8 @@ |==================== ---- -type file; -file f ; +type file; +file f ; ---- The above maps all filenames that start with foo and have an extension @@ -390,17 +411,17 @@ |f|foo.txt |================= ---- -type messagefile; - -(messagefile t) greeting(string m) {. - app { - echo m stdout=@filename(t); - } -} - -messagefile outfile ; - -outfile = greeting("hi"); +type messagefile; + +(messagefile t) greeting(string m) {. + app { + echo m stdout=@filename(t); + } +} + +messagefile outfile ; + +outfile = greeting("hi"); ---- This will output the string 'hi' to the file foo.txt. @@ -409,19 +430,19 @@ index into the filename between the prefix and suffix. ---- -type messagefile; - -(messagefile t) greeting(string m) { - app { - echo m stdout=@filename(t); - } -} +type messagefile; -messagefile outfile[] ; - -outfile[0] = greeting("hello"); -outfile[1] = greeting("middle"); -outfile[2] = greeting("goodbye"); +(messagefile t) greeting(string m) { + app { + echo m stdout=@filename(t); + } +} + +messagefile outfile[] ; + +outfile[0] = greeting("hello"); +outfile[1] = greeting("middle"); +outfile[2] = greeting("goodbye"); ---- [options="header, autowidth"] @@ -431,28 +452,28 @@ |outfile[1]|baz0001.txt |outfile[2]|baz0002.txt |======================= - + simple_mapper can be used to map structures. It will map the name of the structure member into the filename, between the prefix and the suffix. ---- -type messagefile; - -type mystruct { - messagefile left; - messagefile right; -}; - -(messagefile t) greeting(string m) { - app { - echo m stdout=@filename(t); - } -} - -mystruct out ; - -out.left = greeting("hello"); -out.right = greeting("goodbye"); +type messagefile; + +type mystruct { + messagefile left; + messagefile right; +}; + +(messagefile t) greeting(string m) { + app { + echo m stdout=@filename(t); + } +} + +mystruct out ; + +out.left = greeting("hello"); +out.right = greeting("goodbye"); ---- This will output the string "hello" into the file qux.left.txt and the @@ -464,7 +485,7 @@ |out.left|quxleft.txt |out.right|quxright.txt |======================= - + concurrent mapper ~~~~~~~~~~~~~~~~~ concurrent_mapper is almost the same as the simple mapper, except that @@ -486,8 +507,8 @@ Example: ---- -file f1; -file f2 ; +file f1; +file f2 ; ---- The above example would use concurrent mapper for f1 and f2, and generate f2 filename with prefix "foo" and extension ".txt" @@ -516,7 +537,7 @@ Example: ---- -file texts[] ; +file texts[] ; ---- The above example would map all filenames that start with "foo" and @@ -531,9 +552,9 @@ |texts[1]|foo1.txt |texts[2]|foo__1.txt |================= - + fixed array mapper ~~~~~~~~~~~~~~~~~~ The fixed_array_mapper maps from a string that contains a list of @@ -549,8 +570,8 @@ Example: ---- -file texts[] ; ----- +file texts[] ; +---- would cause a mapping like this: @@ -574,9 +595,9 @@ Example: ---- -string s[] = [ "a.txt", "b.txt", "c.txt" ]; - -file f[] ; +string s[] = [ "a.txt", "b.txt", "c.txt" ]; + +file f[] ; ---- This will establish the mapping: @@ -609,11 +630,11 @@ Example: ---- -string s = "picture.gif"; -file f ; +string s = "picture.gif"; +file f ; ---- This example transforms a string ending gif into one ending jpg and @@ -623,7 +644,7 @@ |=========== |Swift variable|Filename |f|picture.jpg -|============= +|============= csv mapper @@ -635,11 +656,11 @@ elements like this: ---- -type student { - file name; - file age; - file GPA; -} +type student { + file name; + file age; + file GPA; +} ---- If the file does not contain a header with column info, then the column @@ -658,7 +679,7 @@ Example: ---- -student stus[] ; +student stus[] ; ---- The above example would read a list of student info from file @@ -686,7 +707,7 @@ |stus[2].name|q |stus[2].age|r |stus[2].gpa|s -|========= +|========= external mapper ~~~~~~~~~~~~~~~ @@ -715,11 +736,11 @@ echo "[0] foo" echo "[1] bar" ---- - + then a mapping statement: ---- -student stus[] ; +student stus[] ; ---- would map From hategan at ci.uchicago.edu Sun Jun 12 16:48:15 2011 From: hategan at ci.uchicago.edu (hategan at ci.uchicago.edu) Date: Sun, 12 Jun 2011 16:48:15 -0500 (CDT) Subject: [Swift-commit] r4602 - provider-wonky/src/org/globus/cog/abstraction/impl/file/wonky Message-ID: <20110612214815.43C429CCA5@svn.ci.uchicago.edu> Author: hategan Date: 2011-06-12 16:48:15 -0500 (Sun, 12 Jun 2011) New Revision: 4602 Modified: provider-wonky/src/org/globus/cog/abstraction/impl/file/wonky/FileResourceImpl.java Log: make sure resource has a protocol Modified: provider-wonky/src/org/globus/cog/abstraction/impl/file/wonky/FileResourceImpl.java =================================================================== --- provider-wonky/src/org/globus/cog/abstraction/impl/file/wonky/FileResourceImpl.java 2011-06-12 03:12:31 UTC (rev 4601) +++ provider-wonky/src/org/globus/cog/abstraction/impl/file/wonky/FileResourceImpl.java 2011-06-12 21:48:15 UTC (rev 4602) @@ -29,7 +29,6 @@ import org.globus.cog.abstraction.impl.file.PermissionsImpl; import org.globus.cog.abstraction.interfaces.ExecutableObject; import org.globus.cog.abstraction.interfaces.FileFragment; -import org.globus.cog.abstraction.interfaces.FileResource; import org.globus.cog.abstraction.interfaces.GridFile; import org.globus.cog.abstraction.interfaces.Permissions; import org.globus.cog.abstraction.interfaces.ProgressMonitor; @@ -48,11 +47,11 @@ private static Object mkdirsLock = new Object(); public FileResourceImpl() { - super(); + this(null); } public FileResourceImpl(String name) { - super(name, FileResource.Local, null, null); + super(name, "local", null, null); } /** set user's home directory as the current directory */ From wozniak at ci.uchicago.edu Mon Jun 13 14:45:46 2011 From: wozniak at ci.uchicago.edu (wozniak at ci.uchicago.edu) Date: Mon, 13 Jun 2011 14:45:46 -0500 (CDT) Subject: [Swift-commit] r4603 - trunk/libexec/log-processing Message-ID: <20110613194546.6B40F9CCB3@svn.ci.uchicago.edu> Author: wozniak Date: 2011-06-13 14:45:43 -0500 (Mon, 13 Jun 2011) New Revision: 4603 Modified: trunk/libexec/log-processing/extract-times.pl Log: Add note Modified: trunk/libexec/log-processing/extract-times.pl =================================================================== --- trunk/libexec/log-processing/extract-times.pl 2011-06-12 21:48:15 UTC (rev 4602) +++ trunk/libexec/log-processing/extract-times.pl 2011-06-13 19:45:43 UTC (rev 4603) @@ -12,6 +12,7 @@ BEGIN { + # Map from Cpu id to job start time on that Cpu %cpus = (); } From wozniak at ci.uchicago.edu Mon Jun 13 14:46:11 2011 From: wozniak at ci.uchicago.edu (wozniak at ci.uchicago.edu) Date: Mon, 13 Jun 2011 14:46:11 -0500 (CDT) Subject: [Swift-commit] r4604 - trunk/libexec/log-processing Message-ID: <20110613194611.0E5039CCB3@svn.ci.uchicago.edu> Author: wozniak Date: 2011-06-13 14:46:10 -0500 (Mon, 13 Jun 2011) New Revision: 4604 Modified: trunk/libexec/log-processing/buckets.pl Log: Better variable name Modified: trunk/libexec/log-processing/buckets.pl =================================================================== --- trunk/libexec/log-processing/buckets.pl 2011-06-13 19:45:43 UTC (rev 4603) +++ trunk/libexec/log-processing/buckets.pl 2011-06-13 19:46:10 UTC (rev 4604) @@ -28,7 +28,7 @@ open FILE, "<", $file or die "could not open: $file\n"; -my %b = (); +my %bucket = (); while () { # Round up to nearest bucket @@ -36,18 +36,18 @@ while (($v % $width) != 0) { $v++; } - if (exists $b{$v}) { - $b{$v} = $b{$v} + 1; + if (exists $bucket{$v}) { + $bucket{$v} = $bucket{$v} + 1; } else { - $b{$v} = 1; + $bucket{$v} = 1; } } - at s = sort { $a <=> $b } keys %b; + at s = sort { $a <=> $b } keys %bucket; for (@s) { - print "$_ $b{$_}\n"; + print "$_ $bucket{$_}\n"; } print "\n"; From wozniak at ci.uchicago.edu Mon Jun 13 14:46:32 2011 From: wozniak at ci.uchicago.edu (wozniak at ci.uchicago.edu) Date: Mon, 13 Jun 2011 14:46:32 -0500 (CDT) Subject: [Swift-commit] r4605 - trunk/libexec/log-processing Message-ID: <20110613194632.687759CCB3@svn.ci.uchicago.edu> Author: wozniak Date: 2011-06-13 14:46:32 -0500 (Mon, 13 Jun 2011) New Revision: 4605 Modified: trunk/libexec/log-processing/ Log: Ignore asciidoc output Property changes on: trunk/libexec/log-processing ___________________________________________________________________ Added: svn:ignore + README.html From jonmon at ci.uchicago.edu Mon Jun 13 15:08:54 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Mon, 13 Jun 2011 15:08:54 -0500 (CDT) Subject: [Swift-commit] r4606 - SwiftApps/Montage/docs Message-ID: <20110613200854.BE7DB9CCB3@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-13 15:08:54 -0500 (Mon, 13 Jun 2011) New Revision: 4606 Modified: SwiftApps/Montage/docs/API.html SwiftApps/Montage/docs/API.txt Log: updates to the documentation. Removed the staging in/out of the area files. Modified: SwiftApps/Montage/docs/API.html =================================================================== --- SwiftApps/Montage/docs/API.html 2011-06-13 19:46:32 UTC (rev 4605) +++ SwiftApps/Montage/docs/API.html 2011-06-13 20:08:54 UTC (rev 4606) @@ -839,22 +839,21 @@
    mBackground
    -
    app ( Image bg_img ) mBackground( Image img, Image area_img, float a, float b, float c )
    +
    app ( Image bg_img ) mBackground( Image img, float a, float b, float c )

    This app procedure will call the mBackground function from the Montage -toolkit. This procedure takes in a single image along with the area image file that has -been generated by either mProject or the faster mProjectPP along with the +toolkit. This procedure takes in a single image along with the three coefficients. The procedure then output the background rectified image after the coefficients have been applied.

    mBgModel
    -
    app ( Table corr_tbl ) mBgModel( Table img_tbl, Table fits_tbl )
    +
    app ( Table rect_tbl ) mBgModel( Table img_tbl, Table fits_tbl )

    This app procedure will call the mBgModel function from the Montage toolkit. This procedure takes in an image table that represents the list of images that will be added into a mosaic and a table of the information that is required to -fit them together. The procedure will then output a corrections table of the +fit them together. The procedure will then output a rectification table of the coefficients that must be applied to the images.

    mConcatFit
    @@ -869,16 +868,15 @@
    mDiff
    -
    app ( Image diff_img ) mDiff( Image proj_img_1, Image area_img_1, Image proj_img_2, Image area_img_2, MosaicData hdr )
    +
    app ( Image diff_img ) mDiff( Image proj_img_1, Image proj_img_2, MosaicData hdr )

    This app procedure will call the mDiff function from the Montage toolkit. This -procedure takes in two images along with their associated area image files and -the FITS header file for the mosaic. The procedure will then output a +procedure takes in two images and the FITS header file for the mosaic. The procedure will then output a difference image representing the information of where the two images overlap.

    mDiffFit
    -
    app ( Image diff_img, Status stat ) mDiffFit( Image img_1, Image area_img_1, Image img_2, Image area_img_2, MosaicData hdr )
    +
    app ( Image diff_img, Status stat ) mDiffFit( Image img_1, Image img_2, MosaicData hdr )

    This app procedure will call the mDiffFit function from the Montage toolkit. The mDiffFit function in Montage is the combination of the mDiff and @@ -930,12 +928,11 @@

    mProjectPP
    -
    app ( Image proj_img, Image area_img ) mProjectPP( Image raw_img, MosaicData hdr )
    +
    app ( Image proj_img ) mProjectPP( Image raw_img, MosaicData hdr )

    This app procedure will call the mProjectPP function from the Montage toolkit. This procedure takes in as input a FITS image file and the FITS header file -that for the mosaic. The output is the projected image and the area image file -associated with the projected image.

    +that for the mosaic. The output is the projected image.

    - +
    @@ -950,12 +947,11 @@
    mProject
    -
    app ( Image proj_img, Image area_img ) mProject( Image raw_img, MosaicData hdr )
    +
    app ( Image proj_img ) mProject( Image raw_img, MosaicData hdr )

    This app procedure will call the mProject function from the Montage toolkit. This procedure takes in as input a FITS image file and the FITS header file -that for the mosaic. The output is the projected image and the area image file -associated with the projected image.

    +that for the mosaic. The output is the projected image.

    - +
    @@ -976,7 +972,7 @@
    Backgound_list
    -
    app ( Table back_tbl ) Background_list( Table imgs_tbl, Table corrs_tbl )
    +
    app ( Table back_tbl ) Background_list( Table imgs_tbl, Table rect_tbl )

    This app procedure will call the Background_list python script that is included in the scripts directory for the Swift Montage wrappers. This procedure takes in as input an image table of the @@ -1003,9 +999,10 @@

    mBackgroundBatch
    -
    ( Image corr_imgs[] ) mBackgroundBatch( Image bg_imgs[], Table img_tbl, Table corr_tbl )
    +
    ( Image rect_imgs[] ) mBackgroundBatch( string dest_dir, Image proj_imgs[], Table img_tbl, Table rect_tbl )
    -

    This batch swift script takes in a list of images that will be combined into a +

    This batch swift script takes in as input a destination directory for the +rectified images, a list of images that will be combined into a mosaic, an image table representing the images for the mosaic, and a table of the coefficients that must be applied to each image. The script will then output a list of the images after the coefficients have been applied. The @@ -1035,8 +1032,7 @@

    Warning The images that are in the source directory must be projected images -and the area files for these images must also reside in the source directory.The images that are in the source directory must be projected images.
    @@ -1050,11 +1046,13 @@
    mDiffFitBatch
    -
    ( Image diff_imgs[], Table fits_tbl ) mDiffFitBatch( string src_dir, string dest_dir, string files[], Table diff_tbl, MosaicData hdr )
    +
    ( Image diff_imgs[], Table fits_tbl ) mDiffFitBatch( string src_dir, string dest_dir, string stat_dir,
    +                                                     string files[], Table diff_tbl, MosaicData hdr )

    This batch script takes in as input a source directory of where the images to calculate overlaps are located, a destination directory of where to store -these difference images, a list of the file names for the images that will be +these difference images, a status directory of where to store the status files +for each image, a list of the file names for the images that will be combined into the mosaic, a difference table that contains which images overlap with each other and the FITS header file for the mosaic. This script will then output a list of difference images and a table of information on how to fit @@ -1065,8 +1063,7 @@

    Warning The images that are in the source directory must be projected images -and the area files for these images must also reside in the source directory.The images that are in the source directory must be projected images.
    @@ -1097,13 +1094,13 @@
    mProjectBatch
    -
    ( Image proj_imgs[], Image area_imgs[] ) mProjectBatch( Image raw_imgs[], MosaicData hdr )
    +
    ( Image proj_imgs[] ) mProjectBatch( string dest_dir, Image raw_imgs[], MosaicData hdr )
    -

    This batch script takes in list of raw image files and the FITS header file +

    This batch script takes in as input the destination directory for the +projected images, a list of raw image files and the FITS header file and projects each image. When projecting each image the function will decide if it is possible to use the fast image projetion algorithm or to just use -standard projection. Also, an area image file is generated for each projected -image that is used in later functions.

    +standard projection.

    - +
    @@ -1120,7 +1117,7 @@

    Modified: SwiftApps/Montage/docs/API.txt =================================================================== --- SwiftApps/Montage/docs/API.txt 2011-06-13 19:46:32 UTC (rev 4605) +++ SwiftApps/Montage/docs/API.txt 2011-06-13 20:08:54 UTC (rev 4606) @@ -109,22 +109,21 @@ .mBackground ---- -app ( Image bg_img ) mBackground( Image img, Image area_img, float a, float b, float c ) +app ( Image bg_img ) mBackground( Image img, float a, float b, float c ) ---- This app procedure will call the mBackground function from the Montage -toolkit. This procedure takes in a single image along with the area image file that has -been generated by either mProject or the faster mProjectPP along with the +toolkit. This procedure takes in a single image along with the three coefficients. The procedure then output the background rectified image after the coefficients have been applied. .mBgModel ---- -app ( Table corr_tbl ) mBgModel( Table img_tbl, Table fits_tbl ) +app ( Table rect_tbl ) mBgModel( Table img_tbl, Table fits_tbl ) ---- This app procedure will call the mBgModel function from the Montage toolkit. This procedure takes in an image table that represents the list of images that will be added into a mosaic and a table of the information that is required to -fit them together. The procedure will then output a corrections table of the +fit them together. The procedure will then output a rectification table of the coefficients that must be applied to the images. .mConcatFit @@ -139,16 +138,15 @@ .mDiff ---- -app ( Image diff_img ) mDiff( Image proj_img_1, Image area_img_1, Image proj_img_2, Image area_img_2, MosaicData hdr ) +app ( Image diff_img ) mDiff( Image proj_img_1, Image proj_img_2, MosaicData hdr ) ---- This app procedure will call the mDiff function from the Montage toolkit. This -procedure takes in two images along with their associated area image files and -the FITS header file for the mosaic. The procedure will then output a +procedure takes in two images and the FITS header file for the mosaic. The procedure will then output a difference image representing the information of where the two images overlap. .mDiffFit ---- -app ( Image diff_img, Status stat ) mDiffFit( Image img_1, Image area_img_1, Image img_2, Image area_img_2, MosaicData hdr ) +app ( Image diff_img, Status stat ) mDiffFit( Image img_1, Image img_2, MosaicData hdr ) ---- This app procedure will call the mDiffFit function from the Montage toolkit. The mDiffFit function in Montage is the combination of the mDiff and @@ -200,12 +198,11 @@ .mProjectPP ---- -app ( Image proj_img, Image area_img ) mProjectPP( Image raw_img, MosaicData hdr ) +app ( Image proj_img ) mProjectPP( Image raw_img, MosaicData hdr ) ---- This app procedure will call the mProjectPP function from the Montage toolkit. This procedure takes in as input a FITS image file and the FITS header file -that for the mosaic. The output is the projected image and the area image file -associated with the projected image. +that for the mosaic. The output is the projected image. NOTE: The mProjectPP app procedure is a "special case" version of mProject and can be used only where the input and output images have tangent-plane @@ -214,12 +211,11 @@ .mProject ---- -app ( Image proj_img, Image area_img ) mProject( Image raw_img, MosaicData hdr ) +app ( Image proj_img ) mProject( Image raw_img, MosaicData hdr ) ---- This app procedure will call the mProject function from the Montage toolkit. This procedure takes in as input a FITS image file and the FITS header file -that for the mosaic. The output is the projected image and the area image file -associated with the projected image. +that for the mosaic. The output is the projected image. NOTE: The mProject app procedure is for general projection. There are some cases in which the faster mProjectPP procedure should be used. @@ -234,7 +230,7 @@ .Backgound_list ---- -app ( Table back_tbl ) Background_list( Table imgs_tbl, Table corrs_tbl ) +app ( Table back_tbl ) Background_list( Table imgs_tbl, Table rect_tbl ) ---- This app procedure will call the Background_list python script that is included in the scripts directory for the Swift Montage wrappers. This procedure takes in as input an image table of the @@ -261,9 +257,10 @@ .mBackgroundBatch ---- -( Image corr_imgs[] ) mBackgroundBatch( Image bg_imgs[], Table img_tbl, Table corr_tbl ) +( Image rect_imgs[] ) mBackgroundBatch( string dest_dir, Image proj_imgs[], Table img_tbl, Table rect_tbl ) ---- -This batch swift script takes in a list of images that will be combined into a +This batch swift script takes in as input a destination directory for the +rectified images, a list of images that will be combined into a mosaic, an image table representing the images for the mosaic, and a table of the coefficients that must be applied to each image. The script will then output a list of the images after the coefficients have been applied. The @@ -283,26 +280,26 @@ output the difference images. The calculation each difference image are done in parallel. -WARNING: The images that are in the source directory must be projected images -and the area files for these images must also reside in the source directory. +WARNING: The images that are in the source directory must be projected images. NOTE: mDiffBatch calls the mDiff app procedure. .mDiffFitBatch ---- -( Image diff_imgs[], Table fits_tbl ) mDiffFitBatch( string src_dir, string dest_dir, string files[], Table diff_tbl, MosaicData hdr ) +( Image diff_imgs[], Table fits_tbl ) mDiffFitBatch( string src_dir, string dest_dir, string stat_dir, + string files[], Table diff_tbl, MosaicData hdr ) ---- This batch script takes in as input a source directory of where the images to calculate overlaps are located, a destination directory of where to store -these difference images, a list of the file names for the images that will be +these difference images, a status directory of where to store the status files +for each image, a list of the file names for the images that will be combined into the mosaic, a difference table that contains which images overlap with each other and the FITS header file for the mosaic. This script will then output a list of difference images and a table of information on how to fit the images together. The calculation of each difference image and the fitting table is done in parallel. -WARNING: The images that are in the source directory must be projected images -and the area files for these images must also reside in the source directory. +WARNING: The images that are in the source directory must be projected images. NOTE: mDiffFitBatch calls the mDiffFit app procedure. @@ -319,13 +316,13 @@ .mProjectBatch ---- -( Image proj_imgs[], Image area_imgs[] ) mProjectBatch( Image raw_imgs[], MosaicData hdr ) +( Image proj_imgs[] ) mProjectBatch( string dest_dir, Image raw_imgs[], MosaicData hdr ) ---- -This batch script takes in list of raw image files and the FITS header file +This batch script takes in as input the destination directory for the +projected images, a list of raw image files and the FITS header file and projects each image. When projecting each image the function will decide if it is possible to use the fast image projetion algorithm or to just use -standard projection. Also, an area image file is generated for each projected -image that is used in later functions. +standard projection. NOTE: mProjectBatch calls the faster mProjectPP app procedure if the image allows it. If mProjectPP cannot be used then the app procedure mProject is called. From jonmon at ci.uchicago.edu Mon Jun 13 15:32:20 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Mon, 13 Jun 2011 15:32:20 -0500 (CDT) Subject: [Swift-commit] r4607 - SwiftApps/Montage/scripts Message-ID: <20110613203220.0A2649CCA5@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-13 15:32:19 -0500 (Mon, 13 Jun 2011) New Revision: 4607 Modified: SwiftApps/Montage/scripts/Swift_Montage_Batch.swift Log: added parameter to the batch fucntions so that they all have to be given the appropriate source, destination, and status directory Modified: SwiftApps/Montage/scripts/Swift_Montage_Batch.swift =================================================================== --- SwiftApps/Montage/scripts/Swift_Montage_Batch.swift 2011-06-13 20:08:54 UTC (rev 4606) +++ SwiftApps/Montage/scripts/Swift_Montage_Batch.swift 2011-06-13 20:32:19 UTC (rev 4607) @@ -1,4 +1,4 @@ -( Image corr_imgs[] ) mBackgroundBatch( Image bg_imgs[], Table img_tbl, Table corr_tbl ) +( Image corr_imgs[] ) mBackgroundBatch( string dest, Image bg_imgs[], Table img_tbl, Table corr_tbl ) { Table back_list = Background_list( img_tbl, corr_tbl ); @@ -7,7 +7,7 @@ foreach background_entry, i in back_struct { Image proj_img ; - Image corr_img ; + Image corr_img ; float a = background_entry.a; float b = background_entry.b; @@ -36,7 +36,7 @@ } -( Image diff_imgs[], Table fits_tbl ) mDiffFitBatch( string src_dir, string dest_dir, string files[], Table diff_tbl, MosaicData hdr ) +( Image diff_imgs[], Table fits_tbl ) mDiffFitBatch( string src_dir, string dest_dir, string stat_dir, string files[], Table diff_tbl, MosaicData hdr ) { DiffStruct diffs[] ; Status stats[]; @@ -49,7 +49,7 @@ Image img_2 ; Image diff_img ; - Status stat ; + Status stat ; ( diff_img, stat ) = mDiffFit( img_1, img_2, hdr ); @@ -75,11 +75,11 @@ } -( Image proj_imgs[] ) mProjectBatch( Image raw_imgs[], MosaicData hdr ) +( Image proj_imgs[] ) mProjectBatch( string dest, Image raw_imgs[], MosaicData hdr ) { foreach img, i in raw_imgs { - Image proj_img ; + Image proj_img ; proj_img = mProject( img, hdr ); // proj_img = mProjectPP( img, hdr ); From wozniak at ci.uchicago.edu Mon Jun 13 15:52:27 2011 From: wozniak at ci.uchicago.edu (wozniak at ci.uchicago.edu) Date: Mon, 13 Jun 2011 15:52:27 -0500 (CDT) Subject: [Swift-commit] r4608 - trunk/libexec/log-processing Message-ID: <20110613205227.17D369CCA5@svn.ci.uchicago.edu> Author: wozniak Date: 2011-06-13 15:52:26 -0500 (Mon, 13 Jun 2011) New Revision: 4608 Modified: trunk/libexec/log-processing/README.txt Log: Add log4j.properties lines Modified: trunk/libexec/log-processing/README.txt =================================================================== --- trunk/libexec/log-processing/README.txt 2011-06-13 20:32:19 UTC (rev 4607) +++ trunk/libexec/log-processing/README.txt 2011-06-13 20:52:26 UTC (rev 4608) @@ -11,6 +11,8 @@ Make sure log4.properties contains: -------------------------------------- log4j.logger.swift=DEBUG +log4j.logger.org.globus.cog.abstraction.coaster.service.job.manager.Cpu=DEBUG +log4j.logger.org.globus.cog.abstraction.coaster.service.job.manager.Block=DEBUG -------------------------------------- Normalize event times in the log to the run start time From jonmon at ci.uchicago.edu Mon Jun 13 16:57:15 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Mon, 13 Jun 2011 16:57:15 -0500 (CDT) Subject: [Swift-commit] r4609 - trunk/etc Message-ID: <20110613215715.8DD3F9CCB3@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-13 16:57:15 -0500 (Mon, 13 Jun 2011) New Revision: 4609 Modified: trunk/etc/log4j.properties Log: Added line to set the Block class in the coaster service to debug Modified: trunk/etc/log4j.properties =================================================================== --- trunk/etc/log4j.properties 2011-06-13 20:52:26 UTC (rev 4608) +++ trunk/etc/log4j.properties 2011-06-13 21:57:15 UTC (rev 4609) @@ -28,6 +28,7 @@ log4j.logger.org.griphyn.vdl.toolkit.VDLt2VDLx=DEBUG log4j.logger.org.globus.cog.abstraction.coaster.service.job.manager.Cpu=DEBUG +log4j.logger.org.globus.cog.abstraction.coaster.service.job.manager.Block=DEBUG # Special functionality: suppresses auto-deletion of PBS submit file From jonmon at ci.uchicago.edu Mon Jun 13 20:44:13 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Mon, 13 Jun 2011 20:44:13 -0500 (CDT) Subject: [Swift-commit] r4610 - trunk/libexec/log-processing Message-ID: <20110614014413.1D4E79CCB3@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-13 20:44:12 -0500 (Mon, 13 Jun 2011) New Revision: 4610 Modified: trunk/libexec/log-processing/README.txt Log: minor change to the readme to use the pearl script to normalize the log Modified: trunk/libexec/log-processing/README.txt =================================================================== --- trunk/libexec/log-processing/README.txt 2011-06-13 21:57:15 UTC (rev 4609) +++ trunk/libexec/log-processing/README.txt 2011-06-14 01:44:12 UTC (rev 4610) @@ -21,7 +21,7 @@ * Generate the log, assuming the log is titled +swift-run.log+ ------------------------------------------ -make -f libexec/log-processing/makefile.implicit swift-run.plot.norm +./normalize-log.pl file.contains.start.time swift-run.log > swift-run.norm ------------------------------------------ Make a basic load plot from Coasters Cpu log lines From hategan at ci.uchicago.edu Mon Jun 13 21:16:03 2011 From: hategan at ci.uchicago.edu (hategan at ci.uchicago.edu) Date: Mon, 13 Jun 2011 21:16:03 -0500 (CDT) Subject: [Swift-commit] r4611 - trunk/src/org/griphyn/vdl/mapping/file Message-ID: <20110614021603.AAE649CCB3@svn.ci.uchicago.edu> Author: hategan Date: 2011-06-13 21:16:03 -0500 (Mon, 13 Jun 2011) New Revision: 4611 Modified: trunk/src/org/griphyn/vdl/mapping/file/ArrayFileMapper.java Log: generics Modified: trunk/src/org/griphyn/vdl/mapping/file/ArrayFileMapper.java =================================================================== --- trunk/src/org/griphyn/vdl/mapping/file/ArrayFileMapper.java 2011-06-14 01:44:12 UTC (rev 4610) +++ trunk/src/org/griphyn/vdl/mapping/file/ArrayFileMapper.java 2011-06-14 02:16:03 UTC (rev 4611) @@ -18,8 +18,8 @@ public class ArrayFileMapper extends AbstractMapper { public static final MappingParam PARAM_FILES = new MappingParam("files"); - public Collection existing() { - List l = new ArrayList(); + public Collection existing() { + List l = new ArrayList(); DSHandle dn = (DSHandle) PARAM_FILES.getRawValue(this); if (dn == null) { throw new RuntimeException("Missing 'files' mapper attribute"); From hategan at ci.uchicago.edu Mon Jun 13 21:17:30 2011 From: hategan at ci.uchicago.edu (hategan at ci.uchicago.edu) Date: Mon, 13 Jun 2011 21:17:30 -0500 (CDT) Subject: [Swift-commit] r4612 - in trunk: libexec src/org/griphyn/vdl/karajan/lib Message-ID: <20110614021730.714B49CCB3@svn.ci.uchicago.edu> Author: hategan Date: 2011-06-13 21:17:30 -0500 (Mon, 13 Jun 2011) New Revision: 4612 Modified: trunk/libexec/vdl-int.k trunk/src/org/griphyn/vdl/karajan/lib/UnwrapClosedList.java Log: fixed arguments when wrapper arguments are passed through files Modified: trunk/libexec/vdl-int.k =================================================================== --- trunk/libexec/vdl-int.k 2011-06-14 02:16:03 UTC (rev 4611) +++ trunk/libexec/vdl-int.k 2011-06-14 02:17:30 UTC (rev 4612) @@ -444,9 +444,7 @@ "-k ", kickstart, nl(), "-cdmfile ", cdm:file(), nl(), "-status ", statusMode, nl(), - "-a ", each(unwrapClosedList(arguments)), nl()) - for(a, unwrapClosedList(arguments) - sys:file:write(wrapfile, append = true, a, nl()) + for(a, unwrapClosedList(arguments), "-a ", a, nl()) ) ) ) Modified: trunk/src/org/griphyn/vdl/karajan/lib/UnwrapClosedList.java =================================================================== --- trunk/src/org/griphyn/vdl/karajan/lib/UnwrapClosedList.java 2011-06-14 02:16:03 UTC (rev 4611) +++ trunk/src/org/griphyn/vdl/karajan/lib/UnwrapClosedList.java 2011-06-14 02:17:30 UTC (rev 4612) @@ -3,17 +3,14 @@ */ package org.griphyn.vdl.karajan.lib; +import java.util.ArrayList; import java.util.List; import org.apache.log4j.Logger; import org.globus.cog.karajan.arguments.Arg; import org.globus.cog.karajan.stack.VariableStack; import org.globus.cog.karajan.workflow.ExecutionException; -import org.globus.cog.karajan.workflow.futures.FutureNotYetAvailable; import org.griphyn.vdl.mapping.DSHandle; -import org.griphyn.vdl.mapping.HandleOpenException; -import org.griphyn.vdl.mapping.InvalidPathException; -import org.griphyn.vdl.mapping.Path; public class UnwrapClosedList extends VDLFunction { public static final Logger logger = Logger.getLogger(UnwrapClosedList.class); @@ -24,18 +21,14 @@ setArguments(UnwrapClosedList.class, new Arg[] { PA_LIST }); } - /** - * Takes a supplied variable and path, and returns the unique value at that - * path. Path can contain wildcards, in which case an array is returned. - */ public Object function(VariableStack stack) throws ExecutionException { @SuppressWarnings("unchecked") List l = (List) PA_LIST.getValue(stack); - Object[] r = new Object[l.size()]; + List r = new ArrayList(l.size()); - for (int i = 0; i < r.length; i++) { - r[i] = l.get(i).getValue(); + for (DSHandle h : l) { + r.add(h.getValue()); } return r; From jonmon at ci.uchicago.edu Tue Jun 14 14:31:01 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Tue, 14 Jun 2011 14:31:01 -0500 (CDT) Subject: [Swift-commit] r4614 - SwiftApps/Montage/scripts Message-ID: <20110614193101.5F1709CCA5@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-14 14:31:00 -0500 (Tue, 14 Jun 2011) New Revision: 4614 Modified: SwiftApps/Montage/scripts/Swift_Montage_Batch.swift Log: renaming of some variables in the batch scripts. Added stat_dir variable to the interface of mFitBatch Modified: SwiftApps/Montage/scripts/Swift_Montage_Batch.swift =================================================================== --- SwiftApps/Montage/scripts/Swift_Montage_Batch.swift 2011-06-14 14:02:14 UTC (rev 4613) +++ SwiftApps/Montage/scripts/Swift_Montage_Batch.swift 2011-06-14 19:31:00 UTC (rev 4614) @@ -1,20 +1,20 @@ -( Image corr_imgs[] ) mBackgroundBatch( string dest, Image bg_imgs[], Table img_tbl, Table corr_tbl ) +( Image rect_imgs[] ) mBackgroundBatch( string dest, Image imgs[], Table img_tbl, Table rect_tbl ) { - Table back_list = Background_list( img_tbl, corr_tbl ); + Table back_list = Background_list( img_tbl, rect_tbl ); BackgroundStruct back_struct[] = readData2( back_list ); foreach background_entry, i in back_struct { - Image proj_img ; - Image corr_img ; + Image orig_img ; + Image rect_img ; float a = background_entry.a; float b = background_entry.b; float c = background_entry.c; - corr_img = mBackground( proj_img, a, b, c ); + rect_img = mBackground( orig_img, a, b, c ); - corr_imgs[ i ] = corr_img; + rect_imgs[ i ] = rect_img; } } @@ -60,9 +60,9 @@ } -( Table fits_tbl ) mFitBatch( Image diff_imgs[], Table diff_tbl ) +( Table fits_tbl ) mFitBatch( string stat_dir, Image diff_imgs[], Table diff_tbl ) { - Status stats[] ; + Status stats[] ; Table status_tbl = create_status_table( diff_tbl ); From jonmon at ci.uchicago.edu Tue Jun 14 14:38:09 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Tue, 14 Jun 2011 14:38:09 -0500 (CDT) Subject: [Swift-commit] r4615 - SwiftApps/Montage/docs Message-ID: <20110614193809.5F1769CCA5@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-14 14:38:09 -0500 (Tue, 14 Jun 2011) New Revision: 4615 Modified: SwiftApps/Montage/docs/API.html SwiftApps/Montage/docs/API.txt Log: update to the Swift Montage docs to reflect to the interface for mFitBatch Modified: SwiftApps/Montage/docs/API.html =================================================================== --- SwiftApps/Montage/docs/API.html 2011-06-14 19:31:00 UTC (rev 4614) +++ SwiftApps/Montage/docs/API.html 2011-06-14 19:38:09 UTC (rev 4615) @@ -1077,9 +1077,10 @@
    mFitBatch
    -
    ( Table fits_tbl ) mFitBatch( Image diff_imgs[], Table diff_tbl )
    +
    ( Table fits_tbl ) mFitBatch( string stat_dir, Image diff_imgs[], Table diff_tbl )
    -

    This batch script takes in as input the list of difference images that has +

    This batch script takes in as input a directory for which the status files +will be put in, the list of difference images that has been generated and the table that contains which images overlap with each other. The script then generates a table containing describing how to fit the two overalpping images together.

    @@ -1117,7 +1118,7 @@

    Modified: SwiftApps/Montage/docs/API.txt =================================================================== --- SwiftApps/Montage/docs/API.txt 2011-06-14 19:31:00 UTC (rev 4614) +++ SwiftApps/Montage/docs/API.txt 2011-06-14 19:38:09 UTC (rev 4615) @@ -305,9 +305,10 @@ .mFitBatch ---- -( Table fits_tbl ) mFitBatch( Image diff_imgs[], Table diff_tbl ) +( Table fits_tbl ) mFitBatch( string stat_dir, Image diff_imgs[], Table diff_tbl ) ---- -This batch script takes in as input the list of difference images that has +This batch script takes in as input a directory for which the status files +will be put in, the list of difference images that has been generated and the table that contains which images overlap with each other. The script then generates a table containing describing how to fit the two overalpping images together. From hategan at ci.uchicago.edu Tue Jun 14 20:00:38 2011 From: hategan at ci.uchicago.edu (hategan at ci.uchicago.edu) Date: Tue, 14 Jun 2011 20:00:38 -0500 (CDT) Subject: [Swift-commit] r4616 - trunk/libexec Message-ID: <20110615010038.154EF9CCA5@svn.ci.uchicago.edu> Author: hategan Date: 2011-06-14 20:00:37 -0500 (Tue, 14 Jun 2011) New Revision: 4616 Modified: trunk/libexec/vdl-int.k Log: fixed wrapper.parameter.mode=args Modified: trunk/libexec/vdl-int.k =================================================================== --- trunk/libexec/vdl-int.k 2011-06-14 19:38:09 UTC (rev 4615) +++ trunk/libexec/vdl-int.k 2011-06-15 01:00:37 UTC (rev 4616) @@ -504,7 +504,7 @@ "-k", kickstart, "-cdmfile", cdm:file(), "-status", statusMode, - "-a", maybe(unwrapClosedList(arguments)) + "-a", maybe(each(unwrapClosedList(arguments))) ) directory=wfdir redirect=false @@ -586,7 +586,7 @@ exception( concat( "Exception in {tr}:", nl(), - maybe("Arguments: {arguments}", nl()), + maybe("Arguments: ", unwrapClosedList(arguments), nl()), "Host: {rhost}", nl(), "Directory: {tmpdir}", "{outs}", nl(), From hategan at ci.uchicago.edu Wed Jun 15 15:39:33 2011 From: hategan at ci.uchicago.edu (hategan at ci.uchicago.edu) Date: Wed, 15 Jun 2011 15:39:33 -0500 (CDT) Subject: [Swift-commit] r4618 - trunk/libexec Message-ID: <20110615203933.6A1FC9CFE1@svn.ci.uchicago.edu> Author: hategan Date: 2011-06-15 15:39:33 -0500 (Wed, 15 Jun 2011) New Revision: 4618 Modified: trunk/libexec/scheduler.xml Log: include aliases in list of available handlers Modified: trunk/libexec/scheduler.xml =================================================================== --- trunk/libexec/scheduler.xml 2011-06-15 01:47:31 UTC (rev 4617) +++ trunk/libexec/scheduler.xml 2011-06-15 20:39:33 UTC (rev 4618) @@ -45,8 +45,8 @@ - - + + From hategan at ci.uchicago.edu Thu Jun 16 17:56:36 2011 From: hategan at ci.uchicago.edu (hategan at ci.uchicago.edu) Date: Thu, 16 Jun 2011 17:56:36 -0500 (CDT) Subject: [Swift-commit] r4626 - trunk/src/org/griphyn/vdl/karajan Message-ID: <20110616225636.DD56B9CCAC@svn.ci.uchicago.edu> Author: hategan Date: 2011-06-16 17:56:36 -0500 (Thu, 16 Jun 2011) New Revision: 4626 Modified: trunk/src/org/griphyn/vdl/karajan/ArrayIndexFutureList.java trunk/src/org/griphyn/vdl/karajan/DSHandleFutureWrapper.java Log: fixed potential deadlock Modified: trunk/src/org/griphyn/vdl/karajan/ArrayIndexFutureList.java =================================================================== --- trunk/src/org/griphyn/vdl/karajan/ArrayIndexFutureList.java 2011-06-16 21:30:08 UTC (rev 4625) +++ trunk/src/org/griphyn/vdl/karajan/ArrayIndexFutureList.java 2011-06-16 22:56:36 UTC (rev 4626) @@ -5,11 +5,9 @@ import java.util.ArrayList; import java.util.HashSet; -import java.util.Iterator; import java.util.Map; import java.util.Set; -import org.globus.cog.karajan.stack.VariableNotFoundException; import org.globus.cog.karajan.stack.VariableStack; import org.globus.cog.karajan.workflow.events.EventTargetPair; import org.globus.cog.karajan.workflow.futures.FutureEvaluationException; @@ -71,12 +69,14 @@ return new FuturePairIterator(this, stack); } - public synchronized void close() { - closed = true; - Set allkeys = new HashSet(values.keySet()); - allkeys.removeAll(keys); - // remaining keys must be added - keys.addAll(allkeys); + public void close() { + synchronized(this) { + closed = true; + Set allkeys = new HashSet(values.keySet()); + allkeys.removeAll(keys); + // remaining keys must be added + keys.addAll(allkeys); + } notifyListeners(); } @@ -88,16 +88,20 @@ return this; } - public synchronized void addModificationAction(FutureListener target, + public void addModificationAction(FutureListener target, VariableStack stack) { - if (listeners == null) { - listeners = new ArrayList(); + synchronized(this) { + if (listeners == null) { + listeners = new ArrayList(); + } + + listeners.add(new ListenerStackPair(target, stack)); + if (!closed) { + return; + } } - - listeners.add(new ListenerStackPair(target, stack)); - if (closed) { - notifyListeners(); - } + // closed + notifyListeners(); } private void notifyListeners() { Modified: trunk/src/org/griphyn/vdl/karajan/DSHandleFutureWrapper.java =================================================================== --- trunk/src/org/griphyn/vdl/karajan/DSHandleFutureWrapper.java 2011-06-16 21:30:08 UTC (rev 4625) +++ trunk/src/org/griphyn/vdl/karajan/DSHandleFutureWrapper.java 2011-06-16 22:56:36 UTC (rev 4626) @@ -6,7 +6,6 @@ import java.util.LinkedList; import java.util.List; -import org.globus.cog.karajan.stack.VariableNotFoundException; import org.globus.cog.karajan.stack.VariableStack; import org.globus.cog.karajan.workflow.events.EventTargetPair; import org.globus.cog.karajan.workflow.futures.Future; @@ -43,7 +42,7 @@ } } - public synchronized void addModificationAction(FutureListener target, VariableStack stack) { + public void addModificationAction(FutureListener target, VariableStack stack) { /** * TODO So, the strategy is the following: getValue() or something else * throws a future exception; then some entity catches that and calls @@ -52,14 +51,18 @@ * check if the future was closed or modified at the time of the call of * this method and call notifyListeners(). */ - if (listeners == null) { - listeners = new LinkedList(); - } - listeners.add(new ListenerStackPair(target, stack)); - WaitingThreadsMonitor.addThread(stack); - if (handle.isClosed()) { - notifyListeners(); - } + synchronized(this) { + if (listeners == null) { + listeners = new LinkedList(); + } + listeners.add(new ListenerStackPair(target, stack)); + WaitingThreadsMonitor.addThread(stack); + if (!handle.isClosed()) { + return; + } + } + // handle.isClosed(); + notifyListeners(); } private void notifyListeners() { From jonmon at ci.uchicago.edu Thu Jun 16 21:19:14 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Thu, 16 Jun 2011 21:19:14 -0500 (CDT) Subject: [Swift-commit] r4627 - SwiftApps/Montage/docs Message-ID: <20110617021914.13D869CCAC@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-16 21:19:13 -0500 (Thu, 16 Jun 2011) New Revision: 4627 Modified: SwiftApps/Montage/docs/API.html SwiftApps/Montage/docs/API.pdf SwiftApps/Montage/docs/API.txt Log: minor edit Modified: SwiftApps/Montage/docs/API.html =================================================================== --- SwiftApps/Montage/docs/API.html 2011-06-16 22:56:36 UTC (rev 4626) +++ SwiftApps/Montage/docs/API.html 2011-06-17 02:19:13 UTC (rev 4627) @@ -728,7 +728,7 @@

    Swift is a dataflow parallel scripting language. The language allows the user to parallelize a workflow that has been represented as a swiftscript. Swift implements the site execution model to allow for efficient use of available -resources for the users application.

    +resources for the user’s application.

    ">>$HTML + printf "">>$HTML + printf "">>$HTML + printf "">>$HTML + printf "">>$HTML + # printf "\n $TESTCOUNT Tests run\t$TESTSFAILED Tests failed\t$TESTSPASSED Tests succeeded. \n\n">>$HTML + fi +} + # Execute all tests in current GROUP test_group() { @@ -985,15 +923,19 @@ echo -e "\nTest case: $TESTNAME" cp -v $GROUP/$TESTNAME . TESTLINK=$TESTNAME - start_row for (( i=0; $i<$ITERS_LOCAL; i=$i+1 )); do swift_test_case $TESTNAME (( $TESTCOUNT >= $NUMBER_OF_TESTS )) && return (( $SHUTDOWN )) && return done - end_row + end_row done + group_statistics + TESTCOUNT=0 + TESTSPASSED=0 + TESTSFAILED=0 + SCRIPTS=$( echo $GROUP/*.test.sh ) checkfail "Could not list: $GROUP" @@ -1013,8 +955,10 @@ done end_row done + } + if [[ $WORK == "" ]] then WORK=$TOPDIR/work @@ -1046,12 +990,16 @@ make_sites_sed +# Here the report starts. +# Call to function header() header -start_test_results +if [ $TEXTREPORT == 1 ]; then + printf "Test Results\n\n">>$REPORT +else + start_test_results +fi cd $TOPDIR - start_group "Build" - TESTLINK= EXITONFAILURE=true if [ "$SKIP_CHECKOUT" != "1" ]; then @@ -1121,8 +1069,6 @@ (( $SHUTDOWN )) && break done -footer - exit 0 # Local Variables: From achavez at ci.uchicago.edu Thu Jun 16 10:41:52 2011 From: achavez at ci.uchicago.edu (achavez at ci.uchicago.edu) Date: Thu, 16 Jun 2011 10:41:52 -0500 (CDT) Subject: [Swift-commit] r4620 - trunk/tests Message-ID: <20110616154152.191F49CCA3@svn.ci.uchicago.edu> Author: achavez Date: 2011-06-16 10:41:51 -0500 (Thu, 16 Jun 2011) New Revision: 4620 Added: trunk/tests/README Removed: trunk/tests/README Log: The content of README were moved to USAGENOTES, README now provides instructions on how to properly build USAGENOTES with asciidoc. Deleted: trunk/tests/README =================================================================== --- trunk/tests/README 2011-06-16 15:36:31 UTC (rev 4619) +++ trunk/tests/README 2011-06-16 15:41:51 UTC (rev 4620) @@ -1,15 +0,0 @@ -suite.sh: - See suite.sh for usage - -run-suite.sh: - wrapper for suite.sh - env variables set may be customized by user - -meta.sh: - wrapper for run-suite.sh - used to execute run-suite/suite.sh from a remote site using ssh - example usage: - meta.sh login.pads.ci.uchicago.edu /home/skenny/swift_runs/tests sites/pads-pbs-coasters.sh - - - Added: trunk/tests/README =================================================================== --- trunk/tests/README (rev 0) +++ trunk/tests/README 2011-06-16 15:41:51 UTC (rev 4620) @@ -0,0 +1,7 @@ +USAGENOTES contains instructions on how to operate the test suite. +It is an asciidoc document, in order to properly build it run the following command: +$ asciidoc -a toc USAGENOTES +It will generate an HTML file called USAGENOTES. + +Warning: +asciidoc must be installed. From achavez at ci.uchicago.edu Thu Jun 16 11:47:15 2011 From: achavez at ci.uchicago.edu (achavez at ci.uchicago.edu) Date: Thu, 16 Jun 2011 11:47:15 -0500 (CDT) Subject: [Swift-commit] r4621 - trunk/tests Message-ID: <20110616164715.CE3469CCAC@svn.ci.uchicago.edu> Author: achavez Date: 2011-06-16 11:47:15 -0500 (Thu, 16 Jun 2011) New Revision: 4621 Added: trunk/tests/USAGENOTES.txt Log: USAGENOTES asciidoc file, contains instructions on how to run suite.sh Added: trunk/tests/USAGENOTES.txt =================================================================== --- trunk/tests/USAGENOTES.txt (rev 0) +++ trunk/tests/USAGENOTES.txt 2011-06-16 16:47:15 UTC (rev 4621) @@ -0,0 +1,259 @@ +Swift Test Suite Usage Notes +============================= +:Author Initials: swift-devel +:website: http://www.ci.uchicago.edu/swift/main/ + +The script will (optionally) checkout Swift, run several tests in a +subdirectory called *run-_DATE_*, and generate useful HTML output and +*tests.log*. Tests are grouped into test *GROUPs*. + +.Usage: +****************************************** + suite.sh * +****************************************** + +1. Primary Usage Mode +--------------------- +.Options: +[width="30%",cols="s,15",options="header"] +|============================================== +|Options | Output +|-a | Do not run ant dist. +|-c | Do not remove dist (clean) +|-f | Generate plain text output file. +|-h | This table. +|-k | Skip first N tests. +|-n | Run N tests and quit. +|-p | Do not build the package. +|-s | Do not do a fresh svn checkout. +|-t | Tree mode (alias: -a,-c,-g,-p,-s) +|-x | Do not continue after a failure. +|-v | Verbose (set -x, HTML comments). +|-o output| Location for cog and output. +| | GROUP argument. +|============================================== +Assuming your code is in *_/tmp/cog_*, where you +have the conventional *_cog/modules/swift_* configuration, +and you have done an *ant dist*, you can run +********************************************************* + suite.sh -t -o /tmp $PWD/tests/groups/group-all-local.sh +********************************************************* +or *cd* into */tmp* and run +************************************************************** + suite.sh -t cog/modules/swift/tests/groups/group-all-local.sh +************************************************************** +The *-t* option is "Tree mode"- as in, "test my existing source tree" + +Run *suite.sh -h* for quick help +When something goes wrong, find and check *tests.log* or use *-v* + +The script generates by default an HTML report, use *-f* to change +the output to plain text. + +2. Swift Location +----------------- +The *TOPDIR* (*PWD* by default) is set with the *-o* option. Code is checked out into this directory or must already exist there. +The variables *COG_VERSION* and *SWIFT_VERSION* must be set for code checkout. + +.e.g. +********************************************************************* + COG_VERSION=branches/4.1.8, SWIFT_VERSION=branches/release-0.92 +********************************************************************* + +Swift is compiled and installed in its source tree. +The run is executed in *RUNDIR* (*TOPDIR/RUNDIRBASE*) +The build test is started in *TOPDIR*. +Everything for a Swift test is written in its *RUNDIR* +The temporary output always goes to *OUTPUT* (*TOPDIR/exec.out*) + +3. Helper Scripts +----------------- +Each *.swift* test may be accompanied by a: + +- *.setup.sh* +- *.check.sh* +- *.clean.sh* +- *.timeout specifier.* + +The scripts may setup and inspect files in *RUNDIR* +including *exec.out* which must be accessed in *stdout.txt* +because the currently running tested process writes to +*exec.out*; *stdout.txt* is a copy. + +The *GROUP* scripts can read the *GROUP* variable. The timeout number in the *\*.timeout* file overrides the default timeout. + +4. Test Structure +----------------- + +Tests are *GROUPed* into directories. Each *GROUP* directory has: + +1. a list of *.swift* tests (plus *.sh* scripts). +2. optionally a *sites.template.xml*. +3. optionally a *tc.template.data*. +4. optionally a *fs.template.data*. +5. optionally a *swift.properties*. +6. optionally a *title.txt*. +7. preferably a *README.txt*. +8. optionally a *.timeout*. + +**************************************************************************************************** +Template files are lightly processed by *sed* before use. Missing files will be pulled from *_swift/etc_* +**************************************************************************************************** + +5. What Tests are Run +--------------------- +Each *.swift* file is a test; *suite.sh* launches all tests in each *GROUP* in the *GROUPLIST*. + +The *GROUPLIST* is obtained from the *GROUPARG*. + +1. The *GROUPARG* can be an external script in the groups/ subdirectory by the name of *GROUPLISTFILE*. +The *GROUPLISTFILE*: + + a. sets the array. + b. checks any variables needed by *_make_sites_sed()_*. + +2. Or, the *GROUPARG* can just be a directory name that is the name of the singleton *GROUP*. + +*OUTPUT* is the stdout of the current test *stdout.txt* retains _stdout_ from the previous test (for *.clean.sh*) +*output_* +* +*.txt* is the HTML-linked permanent output from a test. + +******************************************* +All timeouts in this script are in seconds +******************************************* + +6. PID Tree +----------- +Background processes are used so that hung Swift jobs can be killed +These are the background processes (*PIDs* are tracked) + +- suite.sh + a. monitor() + b. sleep +- process_exec() + a. bin/swift + b. java + +*PID* management is now pretty good, but you may want to check *ps* +from time to time and keep *xload* running. +Note that Coasters may temporarily prevent Swift from exiting upon +receiving a signal + +(*cf. CoasterService.addLocalHook()*). + +7. Failure Cases +---------------- +Some cases are designed to cause Swift to crash. These +SwiftScripts contain the token *_THIS-SCRIPT-SHOULD-FAIL_* somewhere. + +The response of *suite.sh* to the exit code of these Swift +executions is reversed. + +8. Schedulers +------------- +Environment must contain *PROJECT*, *QUEUE*, and *WORK*. +These variables will be incorporated into the *sites.xml* +via: + +*make_sites_sed()* -> *group_sites_xml()* + +Note that some schedulers restrict your choice of *RUNDIR* + +9. Naming +--------- +Site-specific test groups are in _providers/_. +These are named: + +_providers//_ + +or: + +_providers//_ + +.E.g., +*********************************** + providers/local-pbs/PADS +*********************************** + +10. Adding Tests to Existing Groups +----------------------------------- +Simply add a *.swift* file to a *GROUP* directory. +That script will be launched when the *GROUP* is tested. +Optionally, you may add helper scripts (see above) to setup, +check, and clean up after tests. + +The helper scripts are launched from the *RUNDIR* and have access +to files in *RUNDIR* and environment variables from *suite.sh* +such as *$GROUP*. Thus, you can: + +.Bring in input files: +********************************************************* + cp $GROUP/input-file.txt . +********************************************************* + +.Check output: +********************************************************* + grep TEXT1 exec.out + grep TEXT2 output-file.txt +********************************************************* + +.Clean up (optional): +********************************************************* + rm output-file.txt +********************************************************* + +The results are added to the HTML output, etc., automatically. +The prefix number on each test is simply for sorting + +.E.g., +****************** + ls *.swift +****************** + +11. Adding Test Groups +---------------------- +If no existing group has the sites, tc, etc. that you need to test, +you will need to add a test group. Simply create a new directory. +Add files from *TEST STRUCTURE* if necessary; missing files will be +filled in with defaults. + +12. Improving This Test Suite +----------------------------- +This is a work in progress. Here are some things you can do: + +- Run it! Report problems to swift-devel. +- Fix broken tests. +- Break down test *GROUPs* into smaller, meaningful *GROUPs* ; it would be good to limit *GROUP* sizes to 20 or so tests. +- Current work has focused on the HTML and stdout output, which is intended to be high-level and clean. + +*********************************************************************************** +Using -v results in extremely verbose output. +Some happy medium could be achieved by improving the use of the *LOG* (*tests.log*). +************************************************************************************ + +13. Problems +------------ +If you have a problem: + +- Use *-v* to get the *set -x* output. +- Use *ps -H* to get the *PID* tree. + +14. Warnings +------------ +- *suite.sh* uses *shopt*. + +15. Additional Notes +--------------------- +- *run-suite.sh*: + a. Wrapper for *suite.sh*. + b. Env variables set may be customized by user. + +- *meta.sh*: + a. Wrapper for *run-suite.sh*. + b. used to execute _run-suite/suite.sh_ from a remote site using *ssh*. + +.Example usage: +********************************************************************************************* + meta.sh login.pads.ci.uchicago.edu /home/skenny/swift_runs/tests sites/pads-pbs-coasters.sh +********************************************************************************************* From achavez at ci.uchicago.edu Thu Jun 16 11:52:07 2011 From: achavez at ci.uchicago.edu (achavez at ci.uchicago.edu) Date: Thu, 16 Jun 2011 11:52:07 -0500 (CDT) Subject: [Swift-commit] r4622 - trunk/tests Message-ID: <20110616165207.6FBD69CCAC@svn.ci.uchicago.edu> Author: achavez Date: 2011-06-16 11:52:07 -0500 (Thu, 16 Jun 2011) New Revision: 4622 Added: trunk/tests/README.txt Log: Fixed a typo Added: trunk/tests/README.txt =================================================================== --- trunk/tests/README.txt (rev 0) +++ trunk/tests/README.txt 2011-06-16 16:52:07 UTC (rev 4622) @@ -0,0 +1,7 @@ +USAGENOTES contains instructions on how to operate the test suite. +It is an asciidoc document, in order to properly build it run the following command: +asciidoc -a toc USAGENOTES.txt +It will generate an HTML file called USAGENOTES. + +Warning: +asciidoc must be installed. From achavez at ci.uchicago.edu Thu Jun 16 13:03:24 2011 From: achavez at ci.uchicago.edu (achavez at ci.uchicago.edu) Date: Thu, 16 Jun 2011 13:03:24 -0500 (CDT) Subject: [Swift-commit] r4623 - in trunk/tests/language-behaviour: . foreach Message-ID: <20110616180324.7BD979CCA3@svn.ci.uchicago.edu> Author: achavez Date: 2011-06-16 13:03:24 -0500 (Thu, 16 Jun 2011) New Revision: 4623 Added: trunk/tests/language-behaviour/foreach/ trunk/tests/language-behaviour/foreach/0083-for.one.in trunk/tests/language-behaviour/foreach/0083-for.one.in.out.expected trunk/tests/language-behaviour/foreach/0083-for.swift trunk/tests/language-behaviour/foreach/0083-for.two.in trunk/tests/language-behaviour/foreach/0083-for.two.in.out.expected trunk/tests/language-behaviour/foreach/0084-for.swift trunk/tests/language-behaviour/foreach/050-foreach.blue.out.expected trunk/tests/language-behaviour/foreach/050-foreach.green.out.expected trunk/tests/language-behaviour/foreach/050-foreach.red.out.expected trunk/tests/language-behaviour/foreach/050-foreach.swift trunk/tests/language-behaviour/foreach/051-foreach.blue.out.expected trunk/tests/language-behaviour/foreach/051-foreach.green.out.expected trunk/tests/language-behaviour/foreach/051-foreach.red.out.expected trunk/tests/language-behaviour/foreach/051-foreach.swift trunk/tests/language-behaviour/foreach/052-foreach-index.blue.out.expected trunk/tests/language-behaviour/foreach/052-foreach-index.green.out.expected trunk/tests/language-behaviour/foreach/052-foreach-index.red.out.expected trunk/tests/language-behaviour/foreach/052-foreach-index.swift trunk/tests/language-behaviour/foreach/056-foreach-if.swift trunk/tests/language-behaviour/foreach/057-foreach-twice-range.check.sh trunk/tests/language-behaviour/foreach/057-foreach-twice-range.clean.sh trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0000.out.expected trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0001.out.expected trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0002.out.expected trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0003.out.expected trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0004.out.expected trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0005.out.expected trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0006.out.expected trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0007.out.expected trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0008.out.expected trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0009.out.expected trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0000.out.expected trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0001.out.expected trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0002.out.expected trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0003.out.expected trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0004.out.expected trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0005.out.expected trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0006.out.expected trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0007.out.expected trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0008.out.expected trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0009.out.expected trunk/tests/language-behaviour/foreach/057-foreach-twice-range.setup.sh trunk/tests/language-behaviour/foreach/057-foreach-twice-range.swift trunk/tests/language-behaviour/foreach/058-foreach-twice-string.check.sh trunk/tests/language-behaviour/foreach/058-foreach-twice-string.clean.sh trunk/tests/language-behaviour/foreach/058-foreach-twice-string.first.0000.out.expected trunk/tests/language-behaviour/foreach/058-foreach-twice-string.first.0001.out.expected trunk/tests/language-behaviour/foreach/058-foreach-twice-string.first.0002.out.expected trunk/tests/language-behaviour/foreach/058-foreach-twice-string.second.0000.out.expected trunk/tests/language-behaviour/foreach/058-foreach-twice-string.second.0001.out.expected trunk/tests/language-behaviour/foreach/058-foreach-twice-string.second.0002.out.expected trunk/tests/language-behaviour/foreach/058-foreach-twice-string.setup.sh trunk/tests/language-behaviour/foreach/058-foreach-twice-string.swift trunk/tests/language-behaviour/foreach/085-iterate.swift trunk/tests/language-behaviour/foreach/0851-iterate-using-body-variables.swift trunk/tests/language-behaviour/foreach/title.txt Removed: trunk/tests/language-behaviour/foreach/ Log: Subgroup of tests for iterations Added: trunk/tests/language-behaviour/foreach/0083-for.one.in =================================================================== --- trunk/tests/language-behaviour/foreach/0083-for.one.in (rev 0) +++ trunk/tests/language-behaviour/foreach/0083-for.one.in 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1 @@ +LLLL Added: trunk/tests/language-behaviour/foreach/0083-for.one.in.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/0083-for.one.in.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/0083-for.one.in.out.expected 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1 @@ +./0083-for.one.in Added: trunk/tests/language-behaviour/foreach/0083-for.swift =================================================================== --- trunk/tests/language-behaviour/foreach/0083-for.swift (rev 0) +++ trunk/tests/language-behaviour/foreach/0083-for.swift 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1,17 @@ +type file; + + +(file t) echo(string m) { + app { + echo m stdout=@filename(t); + } +} + + +file f1[] ; + +foreach i1 in f1 { + string fn = @filename(i1); + file o ; + o = echo(fn); +} Added: trunk/tests/language-behaviour/foreach/0083-for.two.in =================================================================== --- trunk/tests/language-behaviour/foreach/0083-for.two.in (rev 0) +++ trunk/tests/language-behaviour/foreach/0083-for.two.in 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1 @@ +RRRR Added: trunk/tests/language-behaviour/foreach/0083-for.two.in.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/0083-for.two.in.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/0083-for.two.in.out.expected 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1 @@ +./0083-for.two.in Added: trunk/tests/language-behaviour/foreach/0084-for.swift =================================================================== --- trunk/tests/language-behaviour/foreach/0084-for.swift (rev 0) +++ trunk/tests/language-behaviour/foreach/0084-for.swift 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1,14 @@ +type file; + + +(file t) echo(string m) { + app { + echo m stdout=@filename(t); + } +} + + +file f1[] ; + +foreach i1 in f1 { +} Added: trunk/tests/language-behaviour/foreach/050-foreach.blue.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/050-foreach.blue.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/050-foreach.blue.out.expected 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1 @@ +test Added: trunk/tests/language-behaviour/foreach/050-foreach.green.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/050-foreach.green.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/050-foreach.green.out.expected 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1 @@ +test Added: trunk/tests/language-behaviour/foreach/050-foreach.red.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/050-foreach.red.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/050-foreach.red.out.expected 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1 @@ +test Added: trunk/tests/language-behaviour/foreach/050-foreach.swift =================================================================== --- trunk/tests/language-behaviour/foreach/050-foreach.swift (rev 0) +++ trunk/tests/language-behaviour/foreach/050-foreach.swift 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1,15 @@ +type messagefile {} + +(messagefile t) greeting() { + app { + echo "test" stdout=@filename(t); + } +} + +string array[] = ["red", "green", "blue"]; + +foreach s in array { + messagefile outfile ; + outfile = greeting(); +} + Added: trunk/tests/language-behaviour/foreach/051-foreach.blue.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/051-foreach.blue.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/051-foreach.blue.out.expected 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1 @@ +The filename is: 051-foreach.blue.out and the loop var is: blue Added: trunk/tests/language-behaviour/foreach/051-foreach.green.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/051-foreach.green.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/051-foreach.green.out.expected 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1 @@ +The filename is: 051-foreach.green.out and the loop var is: green Added: trunk/tests/language-behaviour/foreach/051-foreach.red.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/051-foreach.red.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/051-foreach.red.out.expected 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1 @@ +The filename is: 051-foreach.red.out and the loop var is: red Added: trunk/tests/language-behaviour/foreach/051-foreach.swift =================================================================== --- trunk/tests/language-behaviour/foreach/051-foreach.swift (rev 0) +++ trunk/tests/language-behaviour/foreach/051-foreach.swift 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1,20 @@ +type messagefile {} + +(messagefile t) greeting(string l) { + app { + echo @strcat("The filename is: ", @filename(t), + " and the loop var is: ", l) + stdout=@filename(t); + } +} + +string array[] = ["red", "green", "blue"]; + +foreach s in array { + messagefile outfile < + single_file_mapper; + file=@strcat("051-foreach.",s,".out") + >; + outfile = greeting(s); +} + Added: trunk/tests/language-behaviour/foreach/052-foreach-index.blue.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/052-foreach-index.blue.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/052-foreach-index.blue.out.expected 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1 @@ +The filename is: 052-foreach-index.blue.out, the loop var is: blueand the index is: 2 Added: trunk/tests/language-behaviour/foreach/052-foreach-index.green.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/052-foreach-index.green.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/052-foreach-index.green.out.expected 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1 @@ +The filename is: 052-foreach-index.green.out, the loop var is: greenand the index is: 1 Added: trunk/tests/language-behaviour/foreach/052-foreach-index.red.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/052-foreach-index.red.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/052-foreach-index.red.out.expected 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1 @@ +The filename is: 052-foreach-index.red.out, the loop var is: redand the index is: 0 Added: trunk/tests/language-behaviour/foreach/052-foreach-index.swift =================================================================== --- trunk/tests/language-behaviour/foreach/052-foreach-index.swift (rev 0) +++ trunk/tests/language-behaviour/foreach/052-foreach-index.swift 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1,26 @@ +type messagefile {} + +(messagefile t) greeting(int ix, string l) { + app { + echo @strcat("The filename is: ", @filename(t), + ", the loop var is: ", l, + "and the index is: ", ix) + stdout=@filename(t); + } +} + +string array[] = ["red", "green", "blue"]; + +// this highlights a bug, at least after all commits +// that 'index' is being treated as a string, not as +// an integer... + +// try this test earlier on, though +foreach s, index in array { + messagefile outfile < + single_file_mapper; + file=@strcat("052-foreach-index.",s,".out") + >; + outfile = greeting(index, s); +} + Added: trunk/tests/language-behaviour/foreach/056-foreach-if.swift =================================================================== --- trunk/tests/language-behaviour/foreach/056-foreach-if.swift (rev 0) +++ trunk/tests/language-behaviour/foreach/056-foreach-if.swift 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1,26 @@ +type messagefile {} + +(messagefile t) greeting(int ix, string l) { + app { + echo @strcat("The filename is: ", @filename(t), + ", the loop var is: ", l, + "and the index is: ", ix) + stdout=@filename(t); + } +} + +string array[] = ["red", "green", "blue"]; + +// this highlights a bug, at least after all commits +// that 'index' is being treated as a string, not as +// an integer... + +messagefile outfiles[]; + +// try this test earlier on, though +foreach s, index in array { + if( index %% 2 == 1) { + outfiles[index] = greeting(index, s); + } +} + Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.check.sh =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.check.sh (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.check.sh 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1,17 @@ +#!/bin/bash + +set -x + +for count in `seq --format "%04.f" 0 1 9` +do + [ -f "057-foreach-twice-range.first.$count.out" ] || exit 1 + CONTENTS1=$( cat 057-foreach-twice-range.first.$count.out.expected ) + CONTENTS2=$( cat 057-foreach-twice-range.first.$count.out ) + [[ $CONTENTS1 == $CONTENTS2 ]] || exit 1 + [ -f "057-foreach-twice-range.second.$count.out" ] || exit 1 + CONTENTS3=$( cat 057-foreach-twice-range.second.$count.out.expected ) + CONTENTS4=$( cat 057-foreach-twice-range.second.$count.out ) + [[ $CONTENTS3 == $CONTENTS4 ]] || exit 1 +done +exit 0 + Property changes on: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.clean.sh =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.clean.sh (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.clean.sh 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1,7 @@ +#!/bin/bash + +set -x + +rm -v 057-foreach-twice-range.*.out || exit 1 + +exit 0 Property changes on: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.clean.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0000.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0000.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0000.out.expected 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1 @@ +test1-0 Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0001.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0001.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0001.out.expected 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1 @@ +test1-1 Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0002.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0002.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0002.out.expected 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1 @@ +test1-2 Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0003.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0003.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0003.out.expected 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1 @@ +test1-3 Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0004.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0004.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0004.out.expected 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1 @@ +test1-4 Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0005.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0005.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0005.out.expected 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1 @@ +test1-5 Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0006.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0006.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0006.out.expected 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1 @@ +test1-6 Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0007.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0007.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0007.out.expected 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1 @@ +test1-7 Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0008.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0008.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0008.out.expected 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1 @@ +test1-8 Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0009.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0009.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0009.out.expected 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1 @@ +test1-9 Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0000.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0000.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0000.out.expected 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1 @@ +test2-0 Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0001.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0001.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0001.out.expected 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1 @@ +test2-1 Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0002.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0002.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0002.out.expected 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1 @@ +test2-2 Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0003.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0003.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0003.out.expected 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1 @@ +test2-3 Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0004.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0004.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0004.out.expected 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1 @@ +test2-4 Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0005.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0005.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0005.out.expected 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1 @@ +test2-5 Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0006.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0006.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0006.out.expected 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1 @@ +test2-6 Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0007.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0007.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0007.out.expected 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1 @@ +test2-7 Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0008.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0008.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0008.out.expected 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1 @@ +test2-8 Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0009.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0009.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0009.out.expected 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1 @@ +test2-9 Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.setup.sh =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.setup.sh (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.setup.sh 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1,3 @@ +#!/bin/bash + +cp -v $GROUP/057*expected . || exit 1 Property changes on: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.setup.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.swift =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.swift (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.swift 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1,20 @@ +type file; + +app (file o) echo (string msg) +{ + echo msg stdout=@o; +} + +file out[]; +file out2[]; + +foreach a,i in [0:9] { + string s = @strcat("test1-", i); + out[i] = echo(s); +} + +foreach a,i in [0:9] { + string s = @strcat("test2-", i); + out2[i] = echo(s); +} + Added: trunk/tests/language-behaviour/foreach/058-foreach-twice-string.check.sh =================================================================== --- trunk/tests/language-behaviour/foreach/058-foreach-twice-string.check.sh (rev 0) +++ trunk/tests/language-behaviour/foreach/058-foreach-twice-string.check.sh 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1,17 @@ +#!/bin/bash + +set -x + +for count in `seq --format "%04.f" 0 1 2` +do + [ -f "058-foreach-twice-string.first.$count.out" ] || exit 1 + CONTENTS1=$( cat 058-foreach-twice-string.first.$count.out.expected ) + CONTENTS2=$( cat 058-foreach-twice-string.first.$count.out ) + [[ $CONTENTS1 == $CONTENTS2 ]] || exit 1 + [ -f "058-foreach-twice-string.second.$count.out" ] || exit 1 + CONTENTS3=$( cat 058-foreach-twice-string.second.$count.out.expected ) + CONTENTS4=$( cat 058-foreach-twice-string.second.$count.out ) + [[ $CONTENTS3 == $CONTENTS4 ]] || exit 1 +done +exit 0 + Property changes on: trunk/tests/language-behaviour/foreach/058-foreach-twice-string.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/foreach/058-foreach-twice-string.clean.sh =================================================================== --- trunk/tests/language-behaviour/foreach/058-foreach-twice-string.clean.sh (rev 0) +++ trunk/tests/language-behaviour/foreach/058-foreach-twice-string.clean.sh 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1,6 @@ +#!/bin/bash + +set -x + +rm -v 058-foreach-twice-string.*.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/foreach/058-foreach-twice-string.clean.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/foreach/058-foreach-twice-string.first.0000.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/058-foreach-twice-string.first.0000.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/058-foreach-twice-string.first.0000.out.expected 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1 @@ +zero Added: trunk/tests/language-behaviour/foreach/058-foreach-twice-string.first.0001.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/058-foreach-twice-string.first.0001.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/058-foreach-twice-string.first.0001.out.expected 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1 @@ +one Added: trunk/tests/language-behaviour/foreach/058-foreach-twice-string.first.0002.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/058-foreach-twice-string.first.0002.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/058-foreach-twice-string.first.0002.out.expected 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1 @@ +two Added: trunk/tests/language-behaviour/foreach/058-foreach-twice-string.second.0000.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/058-foreach-twice-string.second.0000.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/058-foreach-twice-string.second.0000.out.expected 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1 @@ +zero Added: trunk/tests/language-behaviour/foreach/058-foreach-twice-string.second.0001.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/058-foreach-twice-string.second.0001.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/058-foreach-twice-string.second.0001.out.expected 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1 @@ +one Added: trunk/tests/language-behaviour/foreach/058-foreach-twice-string.second.0002.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/058-foreach-twice-string.second.0002.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/058-foreach-twice-string.second.0002.out.expected 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1 @@ +two Added: trunk/tests/language-behaviour/foreach/058-foreach-twice-string.setup.sh =================================================================== --- trunk/tests/language-behaviour/foreach/058-foreach-twice-string.setup.sh (rev 0) +++ trunk/tests/language-behaviour/foreach/058-foreach-twice-string.setup.sh 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1,3 @@ +#!/bin/bash + +cp -v $GROUP/058*expected . || exit 1 Property changes on: trunk/tests/language-behaviour/foreach/058-foreach-twice-string.setup.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/foreach/058-foreach-twice-string.swift =================================================================== --- trunk/tests/language-behaviour/foreach/058-foreach-twice-string.swift (rev 0) +++ trunk/tests/language-behaviour/foreach/058-foreach-twice-string.swift 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1,19 @@ +type file; + +app (file o) echo (string f) +{ + echo @f stdout=@o; +} + +file out[]; +file out2[]; +string words[] = ["zero", "one", "two"]; + +foreach w,i in words { + out[i] = echo(w); +} + +foreach w,i in words { + out2[i] = echo(w); +} + Copied: trunk/tests/language-behaviour/foreach/085-iterate.swift (from rev 4602, trunk/tests/language-behaviour/085-iterate.swift) =================================================================== --- trunk/tests/language-behaviour/foreach/085-iterate.swift (rev 0) +++ trunk/tests/language-behaviour/foreach/085-iterate.swift 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1,17 @@ +type messagefile; + +(messagefile t) greeting() { + app { + echo "hello" stdout=@filename(t); + } +} + +messagefile outfile[] ; + +iterate i { + outfile[i] = greeting(); +} until(i>10); + + Copied: trunk/tests/language-behaviour/foreach/0851-iterate-using-body-variables.swift (from rev 4602, trunk/tests/language-behaviour/0851-iterate-using-body-variables.swift) =================================================================== --- trunk/tests/language-behaviour/foreach/0851-iterate-using-body-variables.swift (rev 0) +++ trunk/tests/language-behaviour/foreach/0851-iterate-using-body-variables.swift 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1,18 @@ +type messagefile; + +(messagefile t) greeting() { + app { + echo "hello" stdout=@filename(t); + } +} + +messagefile outfile[] ; + +iterate i { + int j = i; + outfile[i] = greeting(); +} until(j>10); + + Added: trunk/tests/language-behaviour/foreach/title.txt =================================================================== --- trunk/tests/language-behaviour/foreach/title.txt (rev 0) +++ trunk/tests/language-behaviour/foreach/title.txt 2011-06-16 18:03:24 UTC (rev 4623) @@ -0,0 +1 @@ +Language-Behaviour Tests From achavez at ci.uchicago.edu Thu Jun 16 14:15:58 2011 From: achavez at ci.uchicago.edu (achavez at ci.uchicago.edu) Date: Thu, 16 Jun 2011 14:15:58 -0500 (CDT) Subject: [Swift-commit] r4624 - in trunk/tests/language-behaviour: . IO arithmetic compounds control_structures datatypes logic procedures strings variables Message-ID: <20110616191558.71DB29CCAC@svn.ci.uchicago.edu> Author: achavez Date: 2011-06-16 14:15:58 -0500 (Thu, 16 Jun 2011) New Revision: 4624 Added: trunk/tests/language-behaviour/IO/060-duplicate.check.sh trunk/tests/language-behaviour/IO/060-duplicate.clean.sh trunk/tests/language-behaviour/IO/060-duplicate.in trunk/tests/language-behaviour/IO/060-duplicate.out.expected trunk/tests/language-behaviour/IO/060-duplicate.setup.sh trunk/tests/language-behaviour/IO/060-duplicate.swift trunk/tests/language-behaviour/IO/087-external-dataset.swift trunk/tests/language-behaviour/IO/106-import.setup.sh trunk/tests/language-behaviour/IO/106-import.swift trunk/tests/language-behaviour/IO/130-fmri.0000.jpeg.expected trunk/tests/language-behaviour/IO/130-fmri.0001.h.in trunk/tests/language-behaviour/IO/130-fmri.0001.jpeg.expected trunk/tests/language-behaviour/IO/130-fmri.0001.v.in trunk/tests/language-behaviour/IO/130-fmri.0002.h.in trunk/tests/language-behaviour/IO/130-fmri.0002.jpeg.expected trunk/tests/language-behaviour/IO/130-fmri.0002.v.in trunk/tests/language-behaviour/IO/130-fmri.0003.h.in trunk/tests/language-behaviour/IO/130-fmri.0003.v.in trunk/tests/language-behaviour/IO/130-fmri.0004.h.in trunk/tests/language-behaviour/IO/130-fmri.0004.v.in trunk/tests/language-behaviour/IO/130-fmri.h.template trunk/tests/language-behaviour/IO/130-fmri.swift trunk/tests/language-behaviour/IO/130-fmri.v.template trunk/tests/language-behaviour/IO/761-dirname.swift trunk/tests/language-behaviour/IO/q2.swift trunk/tests/language-behaviour/IO/q20.swift trunk/tests/language-behaviour/IO/q21.swift trunk/tests/language-behaviour/IO/q22.swift trunk/tests/language-behaviour/IO/q23.swift trunk/tests/language-behaviour/IO/q3.swift trunk/tests/language-behaviour/IO/q5.swift trunk/tests/language-behaviour/IO/q6.swift trunk/tests/language-behaviour/IO/q7.swift trunk/tests/language-behaviour/IO/testimport.swift trunk/tests/language-behaviour/IO/testimport2.swift trunk/tests/language-behaviour/arithmetic/030-mix-float-int.out.expected trunk/tests/language-behaviour/arithmetic/030-mix-float-int.swift trunk/tests/language-behaviour/arithmetic/031-add-float.out.expected trunk/tests/language-behaviour/arithmetic/031-add-float.swift trunk/tests/language-behaviour/compounds/ trunk/tests/language-behaviour/compounds/0024-compound.Q.out.expected trunk/tests/language-behaviour/compounds/0024-compound.R.out.expected trunk/tests/language-behaviour/compounds/0024-compound.swift trunk/tests/language-behaviour/compounds/00241-nested-single-compound.out.expected trunk/tests/language-behaviour/compounds/00241-nested-single-compound.swift trunk/tests/language-behaviour/compounds/00242-compound-with-vars.swift trunk/tests/language-behaviour/control_structures/ trunk/tests/language-behaviour/control_structures/090-case.out.expected trunk/tests/language-behaviour/control_structures/090-case.swift trunk/tests/language-behaviour/control_structures/091-case.out.expected trunk/tests/language-behaviour/control_structures/091-case.swift trunk/tests/language-behaviour/control_structures/100-comparison.out.expected trunk/tests/language-behaviour/control_structures/100-comparison.swift trunk/tests/language-behaviour/control_structures/101-comparison-string.out.expected trunk/tests/language-behaviour/control_structures/101-comparison-string.swift trunk/tests/language-behaviour/control_structures/105-if.out.expected trunk/tests/language-behaviour/control_structures/105-if.swift trunk/tests/language-behaviour/control_structures/bug84-comparisons.out.expected trunk/tests/language-behaviour/control_structures/bug84-comparisons.swift trunk/tests/language-behaviour/control_structures/bug84-comparisons2.out.expected trunk/tests/language-behaviour/control_structures/bug84-comparisons2.swift trunk/tests/language-behaviour/datatypes/ trunk/tests/language-behaviour/datatypes/0231-complex-type.out.expected trunk/tests/language-behaviour/datatypes/0231-complex-type.swift trunk/tests/language-behaviour/datatypes/027-single-character-typename.swift trunk/tests/language-behaviour/datatypes/028-double-character-typename.swift trunk/tests/language-behaviour/datatypes/032-boolconst.f.out.expected trunk/tests/language-behaviour/datatypes/032-boolconst.swift trunk/tests/language-behaviour/datatypes/032-boolconst.t.out.expected trunk/tests/language-behaviour/datatypes/053-pass-int.out.expected trunk/tests/language-behaviour/datatypes/053-pass-int.swift trunk/tests/language-behaviour/datatypes/054-pass-int.out.expected trunk/tests/language-behaviour/datatypes/054-pass-int.swift trunk/tests/language-behaviour/datatypes/055-pass-int.out.expected trunk/tests/language-behaviour/datatypes/055-pass-int.swift trunk/tests/language-behaviour/datatypes/regress-r2292.swift trunk/tests/language-behaviour/logic/ trunk/tests/language-behaviour/logic/033-and.ff.out.expected trunk/tests/language-behaviour/logic/033-and.ft.out.expected trunk/tests/language-behaviour/logic/033-and.swift trunk/tests/language-behaviour/logic/033-and.tf.out.expected trunk/tests/language-behaviour/logic/033-and.tt.out.expected trunk/tests/language-behaviour/logic/034-or.ff.out.expected trunk/tests/language-behaviour/logic/034-or.ft.out.expected trunk/tests/language-behaviour/logic/034-or.swift trunk/tests/language-behaviour/logic/034-or.tf.out.expected trunk/tests/language-behaviour/logic/034-or.tt.out.expected trunk/tests/language-behaviour/logic/035-not.swift trunk/tests/language-behaviour/procedures/ trunk/tests/language-behaviour/procedures/0026-function-param.swift trunk/tests/language-behaviour/procedures/00261-function-param-file.clean.sh trunk/tests/language-behaviour/procedures/00261-function-param-file.in trunk/tests/language-behaviour/procedures/00261-function-param-file.setup.sh trunk/tests/language-behaviour/procedures/00261-function-param-file.swift trunk/tests/language-behaviour/procedures/00262-function-param-file-many.clean.sh trunk/tests/language-behaviour/procedures/00262-function-param-file-many.in trunk/tests/language-behaviour/procedures/00262-function-param-file-many.setup.sh trunk/tests/language-behaviour/procedures/00262-function-param-file-many.swift trunk/tests/language-behaviour/procedures/080-declare-assign-proc.swift trunk/tests/language-behaviour/procedures/081-declare-assign-proc.swift trunk/tests/language-behaviour/procedures/082-declare-assign-proc-separate.swift trunk/tests/language-behaviour/procedures/089-nested-proc-call.swift trunk/tests/language-behaviour/procedures/proc-in-expr.swift trunk/tests/language-behaviour/strings/ trunk/tests/language-behaviour/strings/003-strcat.out.expected trunk/tests/language-behaviour/strings/003-strcat.swift trunk/tests/language-behaviour/strings/0031-strcat-op.out.expected trunk/tests/language-behaviour/strings/0031-strcat-op.swift trunk/tests/language-behaviour/strings/004-strcat-in-arg.out.expected trunk/tests/language-behaviour/strings/004-strcat-in-arg.swift trunk/tests/language-behaviour/strings/005-strcut.out.expected trunk/tests/language-behaviour/strings/005-strcut.swift trunk/tests/language-behaviour/strings/0051-regexp.out.expected trunk/tests/language-behaviour/strings/0051-regexp.swift trunk/tests/language-behaviour/strings/0052-regexp.out.expected trunk/tests/language-behaviour/strings/0052-regexp.swift trunk/tests/language-behaviour/strings/0053-toint.out.expected trunk/tests/language-behaviour/strings/0053-toint.swift trunk/tests/language-behaviour/strings/0054-strsplit.out.expected trunk/tests/language-behaviour/strings/0054-strsplit.swift trunk/tests/language-behaviour/strings/103-quote.out.expected trunk/tests/language-behaviour/strings/103-quote.swift trunk/tests/language-behaviour/strings/1031-quote.swift trunk/tests/language-behaviour/strings/1032-singlequote.out.expected trunk/tests/language-behaviour/strings/1032-singlequote.swift trunk/tests/language-behaviour/strings/1033-singlequote.out.expected trunk/tests/language-behaviour/strings/1033-singlequote.swift trunk/tests/language-behaviour/strings/141-space-in-filename.space here.out.expected trunk/tests/language-behaviour/strings/141-space-in-filename.swift trunk/tests/language-behaviour/strings/142-space-and-quotes. space .out.expected trunk/tests/language-behaviour/strings/142-space-and-quotes.1.out.expected trunk/tests/language-behaviour/strings/142-space-and-quotes.2" space ".out.expected trunk/tests/language-behaviour/strings/142-space-and-quotes.2.out.expected trunk/tests/language-behaviour/strings/142-space-and-quotes.3' space '.out.expected trunk/tests/language-behaviour/strings/142-space-and-quotes.3.out.expected trunk/tests/language-behaviour/strings/142-space-and-quotes.out.expected trunk/tests/language-behaviour/strings/142-space-and-quotes.swift trunk/tests/language-behaviour/strings/1421-space-and-quotes.''' ' ''' '' '''''' ' """"""""" ' ' ' """' "'".out.expected trunk/tests/language-behaviour/strings/1421-space-and-quotes.1.out.expected trunk/tests/language-behaviour/strings/1421-space-and-quotes.2 sp"ace .out.expected trunk/tests/language-behaviour/strings/1421-space-and-quotes.2" space .out.expected trunk/tests/language-behaviour/strings/1421-space-and-quotes.2' sp"ac"e .out.expected trunk/tests/language-behaviour/strings/1421-space-and-quotes.2.out.expected trunk/tests/language-behaviour/strings/1421-space-and-quotes.3 sp'ace .out.expected trunk/tests/language-behaviour/strings/1421-space-and-quotes.3' sp'ac'e .out.expected trunk/tests/language-behaviour/strings/1421-space-and-quotes.3' space .out.expected trunk/tests/language-behaviour/strings/1421-space-and-quotes.3.out.expected trunk/tests/language-behaviour/strings/1421-space-and-quotes.4.out.expected trunk/tests/language-behaviour/strings/1421-space-and-quotes.5.out.expected trunk/tests/language-behaviour/strings/1421-space-and-quotes.6.out.expected trunk/tests/language-behaviour/strings/1421-space-and-quotes.7.out.expected trunk/tests/language-behaviour/strings/1421-space-and-quotes.swift trunk/tests/language-behaviour/strings/143-newlines.out.expected trunk/tests/language-behaviour/strings/143-newlines.swift trunk/tests/language-behaviour/strings/145-url.out.expected trunk/tests/language-behaviour/strings/145-url.swift trunk/tests/language-behaviour/strings/161-star-dot.out.expected trunk/tests/language-behaviour/strings/161-star-dot.swift trunk/tests/language-behaviour/variables/ trunk/tests/language-behaviour/variables/084-declare-many-at-once.swift trunk/tests/language-behaviour/variables/120-local-vars.out.expected trunk/tests/language-behaviour/variables/120-local-vars.swift trunk/tests/language-behaviour/variables/121-multi-return-vars.first.out.expected trunk/tests/language-behaviour/variables/121-multi-return-vars.second.out.expected trunk/tests/language-behaviour/variables/121-multi-return-vars.swift trunk/tests/language-behaviour/variables/122-multi-return-vars.swift trunk/tests/language-behaviour/variables/123-global-vars.swift trunk/tests/language-behaviour/variables/1232-global-separate-assign.swift Removed: trunk/tests/language-behaviour/0024-compound.Q.out.expected trunk/tests/language-behaviour/0024-compound.R.out.expected trunk/tests/language-behaviour/0024-compound.swift trunk/tests/language-behaviour/00241-nested-single-compound.out.expected trunk/tests/language-behaviour/00241-nested-single-compound.swift trunk/tests/language-behaviour/00242-compound-with-vars.swift trunk/tests/language-behaviour/0026-function-param.swift trunk/tests/language-behaviour/00261-function-param-file.clean.sh trunk/tests/language-behaviour/00261-function-param-file.in trunk/tests/language-behaviour/00261-function-param-file.setup.sh trunk/tests/language-behaviour/00261-function-param-file.swift trunk/tests/language-behaviour/00262-function-param-file-many.clean.sh trunk/tests/language-behaviour/00262-function-param-file-many.in trunk/tests/language-behaviour/00262-function-param-file-many.setup.sh trunk/tests/language-behaviour/00262-function-param-file-many.swift trunk/tests/language-behaviour/003-strcat.out.expected trunk/tests/language-behaviour/003-strcat.swift trunk/tests/language-behaviour/0031-strcat-op.out.expected trunk/tests/language-behaviour/0031-strcat-op.swift trunk/tests/language-behaviour/004-strcat-in-arg.out.expected trunk/tests/language-behaviour/004-strcat-in-arg.swift trunk/tests/language-behaviour/005-strcut.out.expected trunk/tests/language-behaviour/005-strcut.swift trunk/tests/language-behaviour/0051-regexp.out.expected trunk/tests/language-behaviour/0051-regexp.swift trunk/tests/language-behaviour/0052-regexp.out.expected trunk/tests/language-behaviour/0052-regexp.swift trunk/tests/language-behaviour/0053-toint.out.expected trunk/tests/language-behaviour/0053-toint.swift trunk/tests/language-behaviour/0054-strsplit.out.expected trunk/tests/language-behaviour/0054-strsplit.swift trunk/tests/language-behaviour/0231-complex-type.out.expected trunk/tests/language-behaviour/0231-complex-type.swift trunk/tests/language-behaviour/027-single-character-typename.swift trunk/tests/language-behaviour/028-double-character-typename.swift trunk/tests/language-behaviour/030-mix-float-int.out.expected trunk/tests/language-behaviour/030-mix-float-int.swift trunk/tests/language-behaviour/031-add-float.out.expected trunk/tests/language-behaviour/031-add-float.swift trunk/tests/language-behaviour/032-boolconst.f.out.expected trunk/tests/language-behaviour/032-boolconst.swift trunk/tests/language-behaviour/032-boolconst.t.out.expected trunk/tests/language-behaviour/033-and.ff.out.expected trunk/tests/language-behaviour/033-and.ft.out.expected trunk/tests/language-behaviour/033-and.swift trunk/tests/language-behaviour/033-and.tf.out.expected trunk/tests/language-behaviour/033-and.tt.out.expected trunk/tests/language-behaviour/034-or.ff.out.expected trunk/tests/language-behaviour/034-or.ft.out.expected trunk/tests/language-behaviour/034-or.swift trunk/tests/language-behaviour/034-or.tf.out.expected trunk/tests/language-behaviour/034-or.tt.out.expected trunk/tests/language-behaviour/035-not.swift trunk/tests/language-behaviour/053-pass-int.out.expected trunk/tests/language-behaviour/053-pass-int.swift trunk/tests/language-behaviour/054-pass-int.out.expected trunk/tests/language-behaviour/054-pass-int.swift trunk/tests/language-behaviour/055-pass-int.out.expected trunk/tests/language-behaviour/055-pass-int.swift trunk/tests/language-behaviour/060-duplicate.check.sh trunk/tests/language-behaviour/060-duplicate.clean.sh trunk/tests/language-behaviour/060-duplicate.in trunk/tests/language-behaviour/060-duplicate.out.expected trunk/tests/language-behaviour/060-duplicate.setup.sh trunk/tests/language-behaviour/060-duplicate.swift trunk/tests/language-behaviour/080-declare-assign-proc.swift trunk/tests/language-behaviour/081-declare-assign-proc.swift trunk/tests/language-behaviour/082-declare-assign-proc-separate.swift trunk/tests/language-behaviour/084-declare-many-at-once.swift trunk/tests/language-behaviour/085-iterate.swift trunk/tests/language-behaviour/0851-iterate-using-body-variables.swift trunk/tests/language-behaviour/087-external-dataset.swift trunk/tests/language-behaviour/089-nested-proc-call.swift trunk/tests/language-behaviour/090-case.out.expected trunk/tests/language-behaviour/090-case.swift trunk/tests/language-behaviour/091-case.out.expected trunk/tests/language-behaviour/091-case.swift trunk/tests/language-behaviour/100-comparison.out.expected trunk/tests/language-behaviour/100-comparison.swift trunk/tests/language-behaviour/101-comparison-string.out.expected trunk/tests/language-behaviour/101-comparison-string.swift trunk/tests/language-behaviour/103-quote.out.expected trunk/tests/language-behaviour/103-quote.swift trunk/tests/language-behaviour/1031-quote.swift trunk/tests/language-behaviour/1032-singlequote.out.expected trunk/tests/language-behaviour/1032-singlequote.swift trunk/tests/language-behaviour/1033-singlequote.out.expected trunk/tests/language-behaviour/1033-singlequote.swift trunk/tests/language-behaviour/105-if.out.expected trunk/tests/language-behaviour/105-if.swift trunk/tests/language-behaviour/106-import.setup.sh trunk/tests/language-behaviour/106-import.swift trunk/tests/language-behaviour/120-local-vars.out.expected trunk/tests/language-behaviour/120-local-vars.swift trunk/tests/language-behaviour/121-multi-return-vars.first.out.expected trunk/tests/language-behaviour/121-multi-return-vars.second.out.expected trunk/tests/language-behaviour/121-multi-return-vars.swift trunk/tests/language-behaviour/122-multi-return-vars.swift trunk/tests/language-behaviour/123-global-vars.swift trunk/tests/language-behaviour/1232-global-separate-assign.swift trunk/tests/language-behaviour/130-fmri.0000.jpeg.expected trunk/tests/language-behaviour/130-fmri.0001.h.in trunk/tests/language-behaviour/130-fmri.0001.jpeg.expected trunk/tests/language-behaviour/130-fmri.0001.v.in trunk/tests/language-behaviour/130-fmri.0002.h.in trunk/tests/language-behaviour/130-fmri.0002.jpeg.expected trunk/tests/language-behaviour/130-fmri.0002.v.in trunk/tests/language-behaviour/130-fmri.0003.h.in trunk/tests/language-behaviour/130-fmri.0003.v.in trunk/tests/language-behaviour/130-fmri.0004.h.in trunk/tests/language-behaviour/130-fmri.0004.v.in trunk/tests/language-behaviour/130-fmri.h.template trunk/tests/language-behaviour/130-fmri.swift trunk/tests/language-behaviour/130-fmri.v.template trunk/tests/language-behaviour/141-space-in-filename.space here.out.expected trunk/tests/language-behaviour/141-space-in-filename.swift trunk/tests/language-behaviour/142-space-and-quotes.1.out.expected trunk/tests/language-behaviour/142-space-and-quotes.2.out.expected trunk/tests/language-behaviour/142-space-and-quotes.3.out.expected trunk/tests/language-behaviour/142-space-and-quotes.out.expected trunk/tests/language-behaviour/142-space-and-quotes.swift trunk/tests/language-behaviour/1421-space-and-quotes.1.out.expected trunk/tests/language-behaviour/1421-space-and-quotes.2.out.expected trunk/tests/language-behaviour/1421-space-and-quotes.3.out.expected trunk/tests/language-behaviour/1421-space-and-quotes.4.out.expected trunk/tests/language-behaviour/1421-space-and-quotes.5.out.expected trunk/tests/language-behaviour/1421-space-and-quotes.6.out.expected trunk/tests/language-behaviour/1421-space-and-quotes.7.out.expected trunk/tests/language-behaviour/1421-space-and-quotes.swift trunk/tests/language-behaviour/143-newlines.out.expected trunk/tests/language-behaviour/143-newlines.swift trunk/tests/language-behaviour/145-url.out.expected trunk/tests/language-behaviour/145-url.swift trunk/tests/language-behaviour/161-star-dot.out.expected trunk/tests/language-behaviour/161-star-dot.swift trunk/tests/language-behaviour/761-dirname.swift trunk/tests/language-behaviour/bug84-comparisons.out.expected trunk/tests/language-behaviour/bug84-comparisons.swift trunk/tests/language-behaviour/bug84-comparisons2.out.expected trunk/tests/language-behaviour/bug84-comparisons2.swift trunk/tests/language-behaviour/foreach/ trunk/tests/language-behaviour/proc-in-expr.swift trunk/tests/language-behaviour/regress-r2292.swift trunk/tests/language-behaviour/testimport.swift trunk/tests/language-behaviour/testimport2.swift Modified: trunk/tests/language-behaviour/title.txt Log: Language-behaviour Directory reorganized into smaller groups Deleted: trunk/tests/language-behaviour/0024-compound.Q.out.expected =================================================================== --- trunk/tests/language-behaviour/0024-compound.Q.out.expected 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/0024-compound.Q.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -f Deleted: trunk/tests/language-behaviour/0024-compound.R.out.expected =================================================================== --- trunk/tests/language-behaviour/0024-compound.R.out.expected 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/0024-compound.R.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -s Deleted: trunk/tests/language-behaviour/0024-compound.swift =================================================================== --- trunk/tests/language-behaviour/0024-compound.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/0024-compound.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,20 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(string m) { - app { - echo m stdout=@filename(t); - } -} - -(messagefile first, messagefile second) compound() { - first = greeting("f"); - second = greeting("s"); - -} - -messagefile a <"0024-compound.Q.out">; -messagefile b <"0024-compound.R.out">; - -(a,b) = compound(); - - Deleted: trunk/tests/language-behaviour/00241-nested-single-compound.out.expected =================================================================== --- trunk/tests/language-behaviour/00241-nested-single-compound.out.expected 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/00241-nested-single-compound.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -f Deleted: trunk/tests/language-behaviour/00241-nested-single-compound.swift =================================================================== --- trunk/tests/language-behaviour/00241-nested-single-compound.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/00241-nested-single-compound.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,21 +0,0 @@ -type file; - -(file t) greeting(string m) { - app { - echo m stdout=@filename(t); - } -} - -(file first) compound() { - first = greeting("f"); -} - -(file first) compoundB() { - first = compound(); -} - -file a <"00241-nested-single-compound.out">; - -a = compoundB(); - - Deleted: trunk/tests/language-behaviour/00242-compound-with-vars.swift =================================================================== --- trunk/tests/language-behaviour/00242-compound-with-vars.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/00242-compound-with-vars.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,20 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(string m) { - app { - echo m stdout=@filename(t); - } -} - -(messagefile first, messagefile second) compound() { - string third="f"; - first = greeting(third); - second = greeting("s"); -} - -messagefile a <"0024-compound.Q.out">; -messagefile b <"0024-compound.R.out">; - -(a,b) = compound(); - - Deleted: trunk/tests/language-behaviour/0026-function-param.swift =================================================================== --- trunk/tests/language-behaviour/0026-function-param.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/0026-function-param.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,7 +0,0 @@ -(int r) add(int a, int b) { - r = a + b; -} - -trace(add(1, 1)); - -trace(add(add(1, 1), add(2, 2))); Deleted: trunk/tests/language-behaviour/00261-function-param-file.clean.sh =================================================================== --- trunk/tests/language-behaviour/00261-function-param-file.clean.sh 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/00261-function-param-file.clean.sh 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,5 +0,0 @@ -#!/bin/bash - -rm -v 00261-function-param-file.in || exit 1 - -exit 0 Deleted: trunk/tests/language-behaviour/00261-function-param-file.in =================================================================== --- trunk/tests/language-behaviour/00261-function-param-file.in 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/00261-function-param-file.in 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,4 +0,0 @@ -a -b -c -d Deleted: trunk/tests/language-behaviour/00261-function-param-file.setup.sh =================================================================== --- trunk/tests/language-behaviour/00261-function-param-file.setup.sh 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/00261-function-param-file.setup.sh 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,5 +0,0 @@ -#!/bin/bash - -cp -v ${GROUP}/00261-function-param-file.in . || exit 1 - -exit 0 Deleted: trunk/tests/language-behaviour/00261-function-param-file.swift =================================================================== --- trunk/tests/language-behaviour/00261-function-param-file.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/00261-function-param-file.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,14 +0,0 @@ -type file; - -app (file editedParams) setTemps ( file inParams ) -{ -cat stdin=@inParams stdout=@editedParams; -} - -file inParams; - -string config [] = readData( setTemps(inParams ) ); - -trace(0,config[0]); -trace(1,config[1]); - Deleted: trunk/tests/language-behaviour/00262-function-param-file-many.clean.sh =================================================================== --- trunk/tests/language-behaviour/00262-function-param-file-many.clean.sh 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/00262-function-param-file-many.clean.sh 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,5 +0,0 @@ -#!/bin/bash - -rm -v 00262-function-param-file-many.in || exit 1 - -exit 0 Deleted: trunk/tests/language-behaviour/00262-function-param-file-many.in =================================================================== --- trunk/tests/language-behaviour/00262-function-param-file-many.in 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/00262-function-param-file-many.in 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,4 +0,0 @@ -a -b -c -d Deleted: trunk/tests/language-behaviour/00262-function-param-file-many.setup.sh =================================================================== --- trunk/tests/language-behaviour/00262-function-param-file-many.setup.sh 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/00262-function-param-file-many.setup.sh 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,5 +0,0 @@ -#!/bin/bash - -cp -v ${GROUP}/00262-function-param-file-many.in . || exit 1 - -exit 0 Deleted: trunk/tests/language-behaviour/00262-function-param-file-many.swift =================================================================== --- trunk/tests/language-behaviour/00262-function-param-file-many.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/00262-function-param-file-many.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,14 +0,0 @@ -type file; - -app (file editedParams) cat ( file inParams ) -{ -cat stdin=@inParams stdout=@editedParams; -} - -file inParams; - -string config [] = readData( cat(cat(cat(inParams ) ))); - -trace(0,config[0]); -trace(1,config[1]); - Deleted: trunk/tests/language-behaviour/003-strcat.out.expected =================================================================== --- trunk/tests/language-behaviour/003-strcat.out.expected 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/003-strcat.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -abcqux Deleted: trunk/tests/language-behaviour/003-strcat.swift =================================================================== --- trunk/tests/language-behaviour/003-strcat.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/003-strcat.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,15 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(string m) { - app { - echo m stdout=@filename(t); - } -} - -messagefile outfile <"003-strcat.out">; - -string v = @strcat("abc","qux"); - -outfile = greeting(v); - - Deleted: trunk/tests/language-behaviour/0031-strcat-op.out.expected =================================================================== --- trunk/tests/language-behaviour/0031-strcat-op.out.expected 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/0031-strcat-op.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -abc,qux Deleted: trunk/tests/language-behaviour/0031-strcat-op.swift =================================================================== --- trunk/tests/language-behaviour/0031-strcat-op.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/0031-strcat-op.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,18 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(string m) { - app { - echo m stdout=@filename(t); - } -} - -messagefile outfile <"0031-strcat-op.out">; - -string a = "abc"; -string b = "qux"; - -string v = a + "," + b; - -outfile = greeting(v); - - Deleted: trunk/tests/language-behaviour/004-strcat-in-arg.out.expected =================================================================== --- trunk/tests/language-behaviour/004-strcat-in-arg.out.expected 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/004-strcat-in-arg.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -test004append Deleted: trunk/tests/language-behaviour/004-strcat-in-arg.swift =================================================================== --- trunk/tests/language-behaviour/004-strcat-in-arg.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/004-strcat-in-arg.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,13 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(string m) { - app { - echo m stdout=@filename(t); - } -} - -messagefile outfile <"004-strcat-in-arg.out">; - -outfile = greeting(@strcat("test004","append")); - - Deleted: trunk/tests/language-behaviour/005-strcut.out.expected =================================================================== --- trunk/tests/language-behaviour/005-strcut.out.expected 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/005-strcut.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -def Deleted: trunk/tests/language-behaviour/005-strcut.swift =================================================================== --- trunk/tests/language-behaviour/005-strcut.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/005-strcut.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,14 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(string m) { - app { - echo m stdout=@filename(t); - } -} - -messagefile outfile <"005-strcut.out">; - -string v = @strcut("abcdefghi", "abc(def)ghi"); - -outfile = greeting(v); - Deleted: trunk/tests/language-behaviour/0051-regexp.out.expected =================================================================== --- trunk/tests/language-behaviour/0051-regexp.out.expected 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/0051-regexp.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -monkey Deleted: trunk/tests/language-behaviour/0051-regexp.swift =================================================================== --- trunk/tests/language-behaviour/0051-regexp.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/0051-regexp.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,14 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(string m) { - app { - echo m stdout=@filename(t); - } -} - -messagefile outfile <"0051-regexp.out">; - -string v = @regexp("abcdefghi", "abc(def)ghi","monkey"); - -outfile = greeting(v); - Deleted: trunk/tests/language-behaviour/0052-regexp.out.expected =================================================================== --- trunk/tests/language-behaviour/0052-regexp.out.expected 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/0052-regexp.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -abmonkeyhi Deleted: trunk/tests/language-behaviour/0052-regexp.swift =================================================================== --- trunk/tests/language-behaviour/0052-regexp.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/0052-regexp.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,14 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(string m) { - app { - echo m stdout=@filename(t); - } -} - -messagefile outfile <"0052-regexp.out">; - -string v = @regexp("abcdefghi", "c(def)g","monkey"); - -outfile = greeting(v); - Deleted: trunk/tests/language-behaviour/0053-toint.out.expected =================================================================== --- trunk/tests/language-behaviour/0053-toint.out.expected 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/0053-toint.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -109 Deleted: trunk/tests/language-behaviour/0053-toint.swift =================================================================== --- trunk/tests/language-behaviour/0053-toint.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/0053-toint.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,15 +0,0 @@ -type messagefile; - -(messagefile t) greeting(int m) { - app { - echo m stdout=@filename(t); - } -} - -messagefile outfile <"0053-toint.out">; - -string left = "010"; -string right = "99"; - -outfile = greeting(@toint(left) + @toint(right)); - Deleted: trunk/tests/language-behaviour/0054-strsplit.out.expected =================================================================== --- trunk/tests/language-behaviour/0054-strsplit.out.expected 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/0054-strsplit.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -ab , c , def , ghij Deleted: trunk/tests/language-behaviour/0054-strsplit.swift =================================================================== --- trunk/tests/language-behaviour/0054-strsplit.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/0054-strsplit.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,14 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(string a, string b, string c, string d) { - app { - echo a "," b "," c "," d stdout=@filename(t); - } -} - -messagefile outfile <"0054-strsplit.out">; - -string s[] = @strsplit("ab c def ghij", "\\s"); - -outfile = greeting(s[0], s[1], s[2], s[3]); - Deleted: trunk/tests/language-behaviour/0231-complex-type.out.expected =================================================================== --- trunk/tests/language-behaviour/0231-complex-type.out.expected 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/0231-complex-type.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -3 44 Deleted: trunk/tests/language-behaviour/0231-complex-type.swift =================================================================== --- trunk/tests/language-behaviour/0231-complex-type.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/0231-complex-type.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,21 +0,0 @@ -type messagefile {} - -type mystruct { - int first, second; -} - -(messagefile t) greeting(mystruct m) { - app { - echo m.first m.second stdout=@filename(t); - } -} - -messagefile outfile <"0231-complex-type.out">; - -mystruct m; - -m.first = 3; -m.second = 44; - -outfile = greeting(m); - Deleted: trunk/tests/language-behaviour/027-single-character-typename.swift =================================================================== --- trunk/tests/language-behaviour/027-single-character-typename.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/027-single-character-typename.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,3 +0,0 @@ -type q; -q i; - Deleted: trunk/tests/language-behaviour/028-double-character-typename.swift =================================================================== --- trunk/tests/language-behaviour/028-double-character-typename.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/028-double-character-typename.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,4 +0,0 @@ -type qq; - -qq i; - Deleted: trunk/tests/language-behaviour/030-mix-float-int.out.expected =================================================================== --- trunk/tests/language-behaviour/030-mix-float-int.out.expected 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/030-mix-float-int.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -54.3 Deleted: trunk/tests/language-behaviour/030-mix-float-int.swift =================================================================== --- trunk/tests/language-behaviour/030-mix-float-int.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/030-mix-float-int.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,14 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(float m) { - app { - echo m stdout=@filename(t); - } -} - -messagefile outfile <"030-mix-float-int.out">; - -float f = 42.0 + 12.3; - -outfile = greeting(f); - Deleted: trunk/tests/language-behaviour/031-add-float.out.expected =================================================================== --- trunk/tests/language-behaviour/031-add-float.out.expected 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/031-add-float.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -135.3 Deleted: trunk/tests/language-behaviour/031-add-float.swift =================================================================== --- trunk/tests/language-behaviour/031-add-float.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/031-add-float.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,14 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(float m) { - app { - echo m stdout=@filename(t); - } -} - -messagefile outfile <"031-add-float.out">; - -float i = 42.1+93.2; - -outfile = greeting(i); - Deleted: trunk/tests/language-behaviour/032-boolconst.f.out.expected =================================================================== --- trunk/tests/language-behaviour/032-boolconst.f.out.expected 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/032-boolconst.f.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -false Deleted: trunk/tests/language-behaviour/032-boolconst.swift =================================================================== --- trunk/tests/language-behaviour/032-boolconst.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/032-boolconst.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,14 +0,0 @@ -type messagefile; - -(messagefile t) p(boolean b) { - app { - echo b stdout=@filename(t); - } -} - -messagefile tfile <"032-boolconst.t.out">; -messagefile ffile <"032-boolconst.f.out">; - -tfile = p(true); -ffile = p(false); - Deleted: trunk/tests/language-behaviour/032-boolconst.t.out.expected =================================================================== --- trunk/tests/language-behaviour/032-boolconst.t.out.expected 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/032-boolconst.t.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -true Deleted: trunk/tests/language-behaviour/033-and.ff.out.expected =================================================================== --- trunk/tests/language-behaviour/033-and.ff.out.expected 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/033-and.ff.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -false Deleted: trunk/tests/language-behaviour/033-and.ft.out.expected =================================================================== --- trunk/tests/language-behaviour/033-and.ft.out.expected 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/033-and.ft.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -false Deleted: trunk/tests/language-behaviour/033-and.swift =================================================================== --- trunk/tests/language-behaviour/033-and.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/033-and.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,18 +0,0 @@ -type messagefile; - -(messagefile t) p(boolean b) { - app { - echo b stdout=@filename(t); - } -} - -messagefile fffile <"033-and.ff.out">; -messagefile ftfile <"033-and.ft.out">; -messagefile tffile <"033-and.tf.out">; -messagefile ttfile <"033-and.tt.out">; - -fffile = p(false && false); -ftfile = p(false && true); -tffile = p(true && false); -ttfile = p(true && true); - Deleted: trunk/tests/language-behaviour/033-and.tf.out.expected =================================================================== --- trunk/tests/language-behaviour/033-and.tf.out.expected 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/033-and.tf.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -false Deleted: trunk/tests/language-behaviour/033-and.tt.out.expected =================================================================== --- trunk/tests/language-behaviour/033-and.tt.out.expected 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/033-and.tt.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -true Deleted: trunk/tests/language-behaviour/034-or.ff.out.expected =================================================================== --- trunk/tests/language-behaviour/034-or.ff.out.expected 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/034-or.ff.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -false Deleted: trunk/tests/language-behaviour/034-or.ft.out.expected =================================================================== --- trunk/tests/language-behaviour/034-or.ft.out.expected 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/034-or.ft.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -true Deleted: trunk/tests/language-behaviour/034-or.swift =================================================================== --- trunk/tests/language-behaviour/034-or.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/034-or.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,18 +0,0 @@ -type messagefile; - -(messagefile t) p(boolean b) { - app { - echo b stdout=@filename(t); - } -} - -messagefile fffile <"034-or.ff.out">; -messagefile ftfile <"034-or.ft.out">; -messagefile tffile <"034-or.tf.out">; -messagefile ttfile <"034-or.tt.out">; - -fffile = p(false || false); -ftfile = p(false || true); -tffile = p(true || false); -ttfile = p(true || true); - Deleted: trunk/tests/language-behaviour/034-or.tf.out.expected =================================================================== --- trunk/tests/language-behaviour/034-or.tf.out.expected 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/034-or.tf.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -true Deleted: trunk/tests/language-behaviour/034-or.tt.out.expected =================================================================== --- trunk/tests/language-behaviour/034-or.tt.out.expected 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/034-or.tt.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -true Deleted: trunk/tests/language-behaviour/035-not.swift =================================================================== --- trunk/tests/language-behaviour/035-not.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/035-not.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,14 +0,0 @@ -type messagefile; - -(messagefile t) p(boolean b) { - app { - echo b stdout=@filename(t); - } -} - -messagefile tfile <"035-not.t.out">; -messagefile ffile <"035-not.f.out">; - -tfile = p(!true); -ffile = p(!false); - Deleted: trunk/tests/language-behaviour/053-pass-int.out.expected =================================================================== --- trunk/tests/language-behaviour/053-pass-int.out.expected 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/053-pass-int.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -7 Deleted: trunk/tests/language-behaviour/053-pass-int.swift =================================================================== --- trunk/tests/language-behaviour/053-pass-int.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/053-pass-int.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,12 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(string m, int i) { - app { - echo i stdout=@filename(t); - } -} - -messagefile outfile <"053-pass-int.out">; - -outfile = greeting("hi", 7); - Deleted: trunk/tests/language-behaviour/054-pass-int.out.expected =================================================================== --- trunk/tests/language-behaviour/054-pass-int.out.expected 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/054-pass-int.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -99 Deleted: trunk/tests/language-behaviour/054-pass-int.swift =================================================================== --- trunk/tests/language-behaviour/054-pass-int.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/054-pass-int.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,14 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(string m, int i) { - app { - echo i stdout=@filename(t); - } -} - -messagefile outfile <"054-pass-int.out">; - -int luftballons = 99; - -outfile = greeting("hi", luftballons); - Deleted: trunk/tests/language-behaviour/055-pass-int.out.expected =================================================================== --- trunk/tests/language-behaviour/055-pass-int.out.expected 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/055-pass-int.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -99 Deleted: trunk/tests/language-behaviour/055-pass-int.swift =================================================================== --- trunk/tests/language-behaviour/055-pass-int.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/055-pass-int.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,16 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(string m, int i) { - app { - echo i stdout=@filename(t); - } -} - -messagefile outfile <"055-pass-int.out">; - -int luftballons; - -luftballons = 99; - -outfile = greeting("hi", luftballons); - Deleted: trunk/tests/language-behaviour/060-duplicate.check.sh =================================================================== --- trunk/tests/language-behaviour/060-duplicate.check.sh 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/060-duplicate.check.sh 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,5 +0,0 @@ -#!/bin/bash - -grep 060-duplicate.in 060-duplicate.out || exit 1 - -exit 0 Deleted: trunk/tests/language-behaviour/060-duplicate.clean.sh =================================================================== --- trunk/tests/language-behaviour/060-duplicate.clean.sh 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/060-duplicate.clean.sh 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,6 +0,0 @@ -#!/bin/bash - -rm -v 060-duplicate.in || exit 1 -rm -v 060-duplicate.out || exit 1 - -exit 0 Deleted: trunk/tests/language-behaviour/060-duplicate.in =================================================================== --- trunk/tests/language-behaviour/060-duplicate.in 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/060-duplicate.in 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -duplicatesource Deleted: trunk/tests/language-behaviour/060-duplicate.out.expected =================================================================== --- trunk/tests/language-behaviour/060-duplicate.out.expected 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/060-duplicate.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -060-duplicate.in Deleted: trunk/tests/language-behaviour/060-duplicate.setup.sh =================================================================== --- trunk/tests/language-behaviour/060-duplicate.setup.sh 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/060-duplicate.setup.sh 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,5 +0,0 @@ -#!/bin/bash - -cp -v ${GROUP}/060-duplicate.in . || exit 1 - -exit 0 Deleted: trunk/tests/language-behaviour/060-duplicate.swift =================================================================== --- trunk/tests/language-behaviour/060-duplicate.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/060-duplicate.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,15 +0,0 @@ -type file; - - -file input <"060-duplicate.in">; - -file output <"060-duplicate.out">; - -(file t) echo(file m) { - app { - echo @filename(m) stdout=@filename(t); - } -} - -output = echo(input); - Deleted: trunk/tests/language-behaviour/080-declare-assign-proc.swift =================================================================== --- trunk/tests/language-behaviour/080-declare-assign-proc.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/080-declare-assign-proc.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,12 +0,0 @@ -type messagefile {} - -(messagefile t) greeting() { - app { - echo "hello" stdout=@filename(t); - } -} - -messagefile outfile = greeting(); - -// can't check the output in present framework because don't know -// what filename got chosen for outfile... Deleted: trunk/tests/language-behaviour/081-declare-assign-proc.swift =================================================================== --- trunk/tests/language-behaviour/081-declare-assign-proc.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/081-declare-assign-proc.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,12 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(int i) { - app { - echo i stdout=@filename(t); - } -} - -messagefile outfile = greeting(3 + 2); - -// can't check the output in present framework because don't know -// what filename got chosen for outfile... Deleted: trunk/tests/language-behaviour/082-declare-assign-proc-separate.swift =================================================================== --- trunk/tests/language-behaviour/082-declare-assign-proc-separate.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/082-declare-assign-proc-separate.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,13 +0,0 @@ -type messagefile {} - -(messagefile t) greeting() { - app { - echo "hello" stdout=@filename(t); - } -} - -messagefile outfile; -outfile = greeting(); - -// can't check the output in present framework because don't know -// what filename got chosen for outfile... Deleted: trunk/tests/language-behaviour/084-declare-many-at-once.swift =================================================================== --- trunk/tests/language-behaviour/084-declare-many-at-once.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/084-declare-many-at-once.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,19 +0,0 @@ -type messagefile {} - -(messagefile t) greeting() { - app { - echo "hello" stdout=@filename(t); - } -} - -messagefile outfile = greeting(); - -messagefile o2 = greeting(), o4 = greeting(), o5, o6[], o7=greeting(); - -o6[0] = greeting(); -o6[1] = greeting(); -o5 = greeting(); -o6[2] = greeting(); - -// can't check the output in present framework because don't know -// what filename got chosen for outfile... Deleted: trunk/tests/language-behaviour/085-iterate.swift =================================================================== --- trunk/tests/language-behaviour/085-iterate.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/085-iterate.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,17 +0,0 @@ -type messagefile; - -(messagefile t) greeting() { - app { - echo "hello" stdout=@filename(t); - } -} - -messagefile outfile[] ; - -iterate i { - outfile[i] = greeting(); -} until(i>10); - - Deleted: trunk/tests/language-behaviour/0851-iterate-using-body-variables.swift =================================================================== --- trunk/tests/language-behaviour/0851-iterate-using-body-variables.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/0851-iterate-using-body-variables.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,18 +0,0 @@ -type messagefile; - -(messagefile t) greeting() { - app { - echo "hello" stdout=@filename(t); - } -} - -messagefile outfile[] ; - -iterate i { - int j = i; - outfile[i] = greeting(); -} until(j>10); - - Deleted: trunk/tests/language-behaviour/087-external-dataset.swift =================================================================== --- trunk/tests/language-behaviour/087-external-dataset.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/087-external-dataset.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,19 +0,0 @@ -type file; - -(external o) a() { - app { - touch "foo"; - } -} - -b(external o) { - app { - touch "bar"; - } -} - -external sync; - -sync=a(); -b(sync); - Deleted: trunk/tests/language-behaviour/089-nested-proc-call.swift =================================================================== --- trunk/tests/language-behaviour/089-nested-proc-call.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/089-nested-proc-call.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,21 +0,0 @@ -type messagefile; - -(messagefile t) inner_greeting() { - app { - echo "hello" stdout=@filename(t); - } -} - -(string s) outer_greeting() { - messagefile m <"ssss">; - m = inner_greeting(); - s = readData(m); -} - - -// messagefile outfile <"089-nested-proc-call.swift">; - -// outfile = greeting(); - -trace(outer_greeting()); - Deleted: trunk/tests/language-behaviour/090-case.out.expected =================================================================== --- trunk/tests/language-behaviour/090-case.out.expected 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/090-case.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -eighth message Deleted: trunk/tests/language-behaviour/090-case.swift =================================================================== --- trunk/tests/language-behaviour/090-case.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/090-case.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,27 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(string m) { - app { - echo m stdout=@filename(t); - } -} - -messagefile outfile <"090-case.out">; - - -string message; - -switch(8) { - case 3: - message="first message"; - case 8: - message="eighth message"; - case 57: - message="last message"; - default: - message="no message at all..."; -} - -trace(message); -outfile = greeting(message); - Deleted: trunk/tests/language-behaviour/091-case.out.expected =================================================================== --- trunk/tests/language-behaviour/091-case.out.expected 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/091-case.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -eighth message Deleted: trunk/tests/language-behaviour/091-case.swift =================================================================== --- trunk/tests/language-behaviour/091-case.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/091-case.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,29 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(string m) { - app { - echo m stdout=@filename(t); - } -} - -messagefile outfile <"091-case.out">; - -int selector = 8; - -trace(selector); - -string message; - -switch(selector) { - case 3: - message="first message"; - case 8: - message="eighth message"; - case 57: - message="last message"; - default: - message="no message at all..."; -} - -outfile = greeting(message); - Deleted: trunk/tests/language-behaviour/100-comparison.out.expected =================================================================== --- trunk/tests/language-behaviour/100-comparison.out.expected 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/100-comparison.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -true Deleted: trunk/tests/language-behaviour/100-comparison.swift =================================================================== --- trunk/tests/language-behaviour/100-comparison.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/100-comparison.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,14 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(boolean b) { - app { - echo b stdout=@filename(t); - } -} - -messagefile outfile <"100-comparison.out">; - -boolean r = 1==1; - -outfile = greeting(r); - Deleted: trunk/tests/language-behaviour/101-comparison-string.out.expected =================================================================== --- trunk/tests/language-behaviour/101-comparison-string.out.expected 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/101-comparison-string.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -true Deleted: trunk/tests/language-behaviour/101-comparison-string.swift =================================================================== --- trunk/tests/language-behaviour/101-comparison-string.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/101-comparison-string.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,16 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(boolean b) { - app { - echo b stdout=@filename(t); - } -} - -messagefile outfile <"101-comparison-string.out">; - -string s = "hello"; - -boolean r = s=="hello"; - -outfile = greeting(r); - Deleted: trunk/tests/language-behaviour/103-quote.out.expected =================================================================== --- trunk/tests/language-behaviour/103-quote.out.expected 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/103-quote.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -" Deleted: trunk/tests/language-behaviour/103-quote.swift =================================================================== --- trunk/tests/language-behaviour/103-quote.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/103-quote.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,12 +0,0 @@ -type messagefile; - -(messagefile t) greeting() { - app { - echo "\"" stdout=@filename(t); - } -} - -messagefile outfile <"103-quote.out">; - -outfile = greeting(); - Deleted: trunk/tests/language-behaviour/1031-quote.swift =================================================================== --- trunk/tests/language-behaviour/1031-quote.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/1031-quote.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,12 +0,0 @@ -type messagefile; - -(messagefile t) greeting() { - app { - echo "testing \"quotes\" in swift" stdout=@filename(t); - } -} - -messagefile outfile <"1031-quote.out">; - -outfile = greeting(); - Deleted: trunk/tests/language-behaviour/1032-singlequote.out.expected =================================================================== --- trunk/tests/language-behaviour/1032-singlequote.out.expected 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/1032-singlequote.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -testing 'quotes' in swift Deleted: trunk/tests/language-behaviour/1032-singlequote.swift =================================================================== --- trunk/tests/language-behaviour/1032-singlequote.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/1032-singlequote.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,12 +0,0 @@ -type messagefile; - -(messagefile t) greeting() { - app { - echo "testing 'quotes' in swift" stdout=@filename(t); - } -} - -messagefile outfile <"1032-singlequote.out">; - -outfile = greeting(); - Deleted: trunk/tests/language-behaviour/1033-singlequote.out.expected =================================================================== --- trunk/tests/language-behaviour/1033-singlequote.out.expected 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/1033-singlequote.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -' Deleted: trunk/tests/language-behaviour/1033-singlequote.swift =================================================================== --- trunk/tests/language-behaviour/1033-singlequote.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/1033-singlequote.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,12 +0,0 @@ -type messagefile; - -(messagefile t) greeting() { - app { - echo "'" stdout=@filename(t); - } -} - -messagefile outfile <"1033-singlequote.out">; - -outfile = greeting(); - Deleted: trunk/tests/language-behaviour/105-if.out.expected =================================================================== --- trunk/tests/language-behaviour/105-if.out.expected 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/105-if.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -hello Deleted: trunk/tests/language-behaviour/105-if.swift =================================================================== --- trunk/tests/language-behaviour/105-if.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/105-if.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,16 +0,0 @@ -type messagefile; - -(messagefile t) greeting() { - app { - echo "hello" stdout=@filename(t); - } -} - -messagefile outfile <"105-if.out">; - -boolean b = 1==1; - -if(b) { - outfile = greeting(); -} - Deleted: trunk/tests/language-behaviour/106-import.setup.sh =================================================================== --- trunk/tests/language-behaviour/106-import.setup.sh 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/106-import.setup.sh 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,6 +0,0 @@ -#!/bin/bash - -cp -v ${GROUP}/testimport.swift . || exit 1 -cp -v ${GROUP}/testimport2.swift . || exit 1 - -exit 0 Deleted: trunk/tests/language-behaviour/106-import.swift =================================================================== --- trunk/tests/language-behaviour/106-import.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/106-import.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,5 +0,0 @@ -import "testimport"; - -file f; - -int i = 6; Deleted: trunk/tests/language-behaviour/120-local-vars.out.expected =================================================================== --- trunk/tests/language-behaviour/120-local-vars.out.expected 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/120-local-vars.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -hi Deleted: trunk/tests/language-behaviour/120-local-vars.swift =================================================================== --- trunk/tests/language-behaviour/120-local-vars.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/120-local-vars.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,17 +0,0 @@ -type messagefile; - -(messagefile t) metagreeting(string m) { -string l = m; -t=greeting(l); -} - -(messagefile t) greeting(string m) { - app { - echo m stdout=@filename(t); - } -} - -messagefile outfile <"120-local-vars.out">; - -outfile = greeting("hi"); - Deleted: trunk/tests/language-behaviour/121-multi-return-vars.first.out.expected =================================================================== --- trunk/tests/language-behaviour/121-multi-return-vars.first.out.expected 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/121-multi-return-vars.first.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -hi Deleted: trunk/tests/language-behaviour/121-multi-return-vars.second.out.expected =================================================================== Deleted: trunk/tests/language-behaviour/121-multi-return-vars.swift =================================================================== --- trunk/tests/language-behaviour/121-multi-return-vars.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/121-multi-return-vars.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,13 +0,0 @@ -type messagefile; - -(messagefile a, messagefile b) greeting(string m) { - app { - echo m stdout=@filename(a) stderr=@filename(b); - } -} - -messagefile firstfile <"121-multi-return-vars.first.out">; -messagefile secondfile <"121-multi-return-vars.second.out">; - -(firstfile, secondfile) = greeting("hi"); - Deleted: trunk/tests/language-behaviour/122-multi-return-vars.swift =================================================================== --- trunk/tests/language-behaviour/122-multi-return-vars.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/122-multi-return-vars.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,10 +0,0 @@ -type messagefile; - -(messagefile a, messagefile b) greeting(string m) { - app { - echo m stdout=@filename(a) stderr=@filename(b); - } -} - -(messagefile firstfile, messagefile secondfile) = greeting("hi"); - Deleted: trunk/tests/language-behaviour/123-global-vars.swift =================================================================== --- trunk/tests/language-behaviour/123-global-vars.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/123-global-vars.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,14 +0,0 @@ -type messagefile; - - -(messagefile t) greeting() { - app { - echo m stdout=@filename(t); - } -} - -global string m = "hello"; -messagefile outfile <"123-global-vars.out">; - -outfile = greeting(); - Deleted: trunk/tests/language-behaviour/1232-global-separate-assign.swift =================================================================== --- trunk/tests/language-behaviour/1232-global-separate-assign.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/1232-global-separate-assign.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,15 +0,0 @@ -type messagefile; - - -(messagefile t) greeting() { - app { - echo m stdout=@filename(t); - } -} - -global string m; -m = "hi"; -messagefile outfile <"1232-global-separate-assign.aout">; - -outfile = greeting(); - Deleted: trunk/tests/language-behaviour/130-fmri.0000.jpeg.expected =================================================================== Deleted: trunk/tests/language-behaviour/130-fmri.0001.h.in =================================================================== --- trunk/tests/language-behaviour/130-fmri.0001.h.in 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/130-fmri.0001.h.in 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -qux Deleted: trunk/tests/language-behaviour/130-fmri.0001.jpeg.expected =================================================================== Deleted: trunk/tests/language-behaviour/130-fmri.0001.v.in =================================================================== --- trunk/tests/language-behaviour/130-fmri.0001.v.in 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/130-fmri.0001.v.in 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -qux Deleted: trunk/tests/language-behaviour/130-fmri.0002.h.in =================================================================== --- trunk/tests/language-behaviour/130-fmri.0002.h.in 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/130-fmri.0002.h.in 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -qux Deleted: trunk/tests/language-behaviour/130-fmri.0002.jpeg.expected =================================================================== Deleted: trunk/tests/language-behaviour/130-fmri.0002.v.in =================================================================== --- trunk/tests/language-behaviour/130-fmri.0002.v.in 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/130-fmri.0002.v.in 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -qux Deleted: trunk/tests/language-behaviour/130-fmri.0003.h.in =================================================================== --- trunk/tests/language-behaviour/130-fmri.0003.h.in 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/130-fmri.0003.h.in 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -qux Deleted: trunk/tests/language-behaviour/130-fmri.0003.v.in =================================================================== --- trunk/tests/language-behaviour/130-fmri.0003.v.in 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/130-fmri.0003.v.in 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -qux Deleted: trunk/tests/language-behaviour/130-fmri.0004.h.in =================================================================== --- trunk/tests/language-behaviour/130-fmri.0004.h.in 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/130-fmri.0004.h.in 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -qux Deleted: trunk/tests/language-behaviour/130-fmri.0004.v.in =================================================================== --- trunk/tests/language-behaviour/130-fmri.0004.v.in 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/130-fmri.0004.v.in 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -qux Deleted: trunk/tests/language-behaviour/130-fmri.h.template =================================================================== --- trunk/tests/language-behaviour/130-fmri.h.template 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/130-fmri.h.template 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -foo Deleted: trunk/tests/language-behaviour/130-fmri.swift =================================================================== --- trunk/tests/language-behaviour/130-fmri.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/130-fmri.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,78 +0,0 @@ - -# attempt to emulate the workflow patterns of the fMRI workflow that -# I often fiddle with. - -type voxels; -type header; - -type volume { - voxels v; - header h; - } - -type slice; - -type jpeg; - - -// inputs: 4 volumes and a reference volume - -volume inputs[] ; -volume template ; - -// align 4 volumes to reference volume - -volume aligned[]; - -foreach inp, i in inputs { - aligned[i] = align(inputs[i], template); -} - -(volume o) align(volume candidate, volume template) { - app { - touch @o.v @o.h; - } -} - -// take average of all 4 (or 5?) volumes - -(volume avg) average(volume candidates[]) { - app { - touch @avg.v @avg.h; - } -} - -volume brainatlas = average(aligned); - -// make 3 slices of the average volume, along x, y, z axes - -(slice s) slicer(volume atlas, string axis) { - app { - touch @s; - } -} - -slice slices[]; - - -string axes[] = ["x", "y", "z"]; -foreach axis, i in axes { - slices[i] = slicer(brainatlas, axis); -} - -// convert each slice into a jpeg - -jpeg final[] ; - -(jpeg j) convert(slice s) { - app { - touch @j; - } -} - -foreach j,i in slices { - final[i] = convert(slices[i]); -} - -// outputs: 3 jpegs - Deleted: trunk/tests/language-behaviour/130-fmri.v.template =================================================================== --- trunk/tests/language-behaviour/130-fmri.v.template 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/130-fmri.v.template 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -foo Deleted: trunk/tests/language-behaviour/141-space-in-filename.space here.out.expected =================================================================== --- trunk/tests/language-behaviour/141-space-in-filename.space here.out.expected 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/141-space-in-filename.space here.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -hello Deleted: trunk/tests/language-behaviour/141-space-in-filename.swift =================================================================== --- trunk/tests/language-behaviour/141-space-in-filename.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/141-space-in-filename.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,12 +0,0 @@ -type messagefile; - -(messagefile t) greeting() { - app { - echo "hello" stdout=@filename(t); - } -} - -messagefile outfile <"141-space-in-filename.space here.out">; - -outfile = greeting(); - Deleted: trunk/tests/language-behaviour/142-space-and-quotes.1.out.expected =================================================================== Deleted: trunk/tests/language-behaviour/142-space-and-quotes.2.out.expected =================================================================== Deleted: trunk/tests/language-behaviour/142-space-and-quotes.3.out.expected =================================================================== Deleted: trunk/tests/language-behaviour/142-space-and-quotes.out.expected =================================================================== Deleted: trunk/tests/language-behaviour/142-space-and-quotes.swift =================================================================== --- trunk/tests/language-behaviour/142-space-and-quotes.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/142-space-and-quotes.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,24 +0,0 @@ - -// this checks how spaces and quotes get passed through to underlying -// executables - -type messagefile; - -(messagefile t) p() { - app { - touch @filename(t); - } -} - -messagefile outfile <"142-space-and-quotes.out">; -outfile = p(); - -messagefile outfileB <"142-space-and-quotes. space .out">; -outfileB = p(); - -messagefile outfileC <"142-space-and-quotes.2\" space \".out">; -outfileC = p(); - -messagefile outfileD <"142-space-and-quotes.3' space '.out">; -outfileD = p(); - Deleted: trunk/tests/language-behaviour/1421-space-and-quotes.1.out.expected =================================================================== Deleted: trunk/tests/language-behaviour/1421-space-and-quotes.2.out.expected =================================================================== Deleted: trunk/tests/language-behaviour/1421-space-and-quotes.3.out.expected =================================================================== Deleted: trunk/tests/language-behaviour/1421-space-and-quotes.4.out.expected =================================================================== Deleted: trunk/tests/language-behaviour/1421-space-and-quotes.5.out.expected =================================================================== Deleted: trunk/tests/language-behaviour/1421-space-and-quotes.6.out.expected =================================================================== Deleted: trunk/tests/language-behaviour/1421-space-and-quotes.7.out.expected =================================================================== Deleted: trunk/tests/language-behaviour/1421-space-and-quotes.swift =================================================================== --- trunk/tests/language-behaviour/1421-space-and-quotes.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/1421-space-and-quotes.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,32 +0,0 @@ - -// this checks how spaces and quotes get passed through to underlying -// executables - -type messagefile; - -(messagefile t) p() { - app { - touch @filename(t); - } -} - -messagefile outfileC <"1421-space-and-quotes.2\" space .out">; -outfileC = p(); - -messagefile outfileD <"1421-space-and-quotes.3' space .out">; -outfileD = p(); - -messagefile outfileE <"1421-space-and-quotes.2 sp\"ace .out">; -outfileE = p(); - -messagefile outfileF <"1421-space-and-quotes.3 sp'ace .out">; -outfileF = p(); - -messagefile outfileG <"1421-space-and-quotes.2' sp\"ac\"e .out">; -outfileG = p(); - -messagefile outfileH <"1421-space-and-quotes.3' sp'ac'e .out">; -outfileH = p(); - -messagefile outfileI <"1421-space-and-quotes.''' ' ''' '' '''''' ' \"\"\"\"\"\"\"\"\" ' ' ' \"\"\"' \"'\".out">; -outfileI = p(); Deleted: trunk/tests/language-behaviour/143-newlines.out.expected =================================================================== --- trunk/tests/language-behaviour/143-newlines.out.expected 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/143-newlines.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -hello world Deleted: trunk/tests/language-behaviour/143-newlines.swift =================================================================== --- trunk/tests/language-behaviour/143-newlines.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/143-newlines.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,13 +0,0 @@ -type messagefile; - -(messagefile t) greeting() { - app { - echo "hello" - "world" stdout=@filename(t); - } -} - -messagefile outfile <"143-newlines.out">; - -outfile = greeting(); - Deleted: trunk/tests/language-behaviour/145-url.out.expected =================================================================== --- trunk/tests/language-behaviour/145-url.out.expected 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/145-url.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -hello Deleted: trunk/tests/language-behaviour/145-url.swift =================================================================== --- trunk/tests/language-behaviour/145-url.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/145-url.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,12 +0,0 @@ -type messagefile; - -(messagefile t) greeting() { - app { - echo "hello" stdout=@filename(t); - } -} - -messagefile outfile <"file://localhost/145-url.out">; - -outfile = greeting(); - Deleted: trunk/tests/language-behaviour/161-star-dot.out.expected =================================================================== --- trunk/tests/language-behaviour/161-star-dot.out.expected 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/161-star-dot.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -two-C Deleted: trunk/tests/language-behaviour/161-star-dot.swift =================================================================== --- trunk/tests/language-behaviour/161-star-dot.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/161-star-dot.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,36 +0,0 @@ -type messagefile; - -(messagefile t) greeting(string s) { - app { - echo s stdout=@filename(t); - } -} - -messagefile outfile <"161-star-dot.out">; - -type astruct { - string a; - string b; - string c; -}; - -astruct foo[]; - -foo[0].a = "zero-A"; -foo[0].b = "zero-B"; -foo[0].c = "zero-C"; - -foo[1].a = "one-A"; -foo[1].b = "one-B"; -foo[1].c = "one-C"; - -foo[2].a = "two-A"; -foo[2].b = "two-B"; -foo[2].c = "two-C"; - -string s[] = foo[*].c; - -string u = s[2]; - -outfile = greeting(u); - Deleted: trunk/tests/language-behaviour/761-dirname.swift =================================================================== --- trunk/tests/language-behaviour/761-dirname.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/761-dirname.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,9 +0,0 @@ - -type file{} - -file f<"/d/f.txt">; - -string s = @dirname(f); -string t = @tostring(s); - -tracef("dirname: %s\n", s); Copied: trunk/tests/language-behaviour/IO/060-duplicate.check.sh (from rev 4602, trunk/tests/language-behaviour/060-duplicate.check.sh) =================================================================== --- trunk/tests/language-behaviour/IO/060-duplicate.check.sh (rev 0) +++ trunk/tests/language-behaviour/IO/060-duplicate.check.sh 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,5 @@ +#!/bin/bash + +grep 060-duplicate.in 060-duplicate.out || exit 1 + +exit 0 Copied: trunk/tests/language-behaviour/IO/060-duplicate.clean.sh (from rev 4602, trunk/tests/language-behaviour/060-duplicate.clean.sh) =================================================================== --- trunk/tests/language-behaviour/IO/060-duplicate.clean.sh (rev 0) +++ trunk/tests/language-behaviour/IO/060-duplicate.clean.sh 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,6 @@ +#!/bin/bash + +rm -v 060-duplicate.in || exit 1 +rm -v 060-duplicate.out || exit 1 + +exit 0 Copied: trunk/tests/language-behaviour/IO/060-duplicate.in (from rev 4602, trunk/tests/language-behaviour/060-duplicate.in) =================================================================== --- trunk/tests/language-behaviour/IO/060-duplicate.in (rev 0) +++ trunk/tests/language-behaviour/IO/060-duplicate.in 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +duplicatesource Copied: trunk/tests/language-behaviour/IO/060-duplicate.out.expected (from rev 4602, trunk/tests/language-behaviour/060-duplicate.out.expected) =================================================================== --- trunk/tests/language-behaviour/IO/060-duplicate.out.expected (rev 0) +++ trunk/tests/language-behaviour/IO/060-duplicate.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +060-duplicate.in Copied: trunk/tests/language-behaviour/IO/060-duplicate.setup.sh (from rev 4602, trunk/tests/language-behaviour/060-duplicate.setup.sh) =================================================================== --- trunk/tests/language-behaviour/IO/060-duplicate.setup.sh (rev 0) +++ trunk/tests/language-behaviour/IO/060-duplicate.setup.sh 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,5 @@ +#!/bin/bash + +cp -v ${GROUP}/060-duplicate.in . || exit 1 + +exit 0 Copied: trunk/tests/language-behaviour/IO/060-duplicate.swift (from rev 4602, trunk/tests/language-behaviour/060-duplicate.swift) =================================================================== --- trunk/tests/language-behaviour/IO/060-duplicate.swift (rev 0) +++ trunk/tests/language-behaviour/IO/060-duplicate.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,15 @@ +type file; + + +file input <"060-duplicate.in">; + +file output <"060-duplicate.out">; + +(file t) echo(file m) { + app { + echo @filename(m) stdout=@filename(t); + } +} + +output = echo(input); + Copied: trunk/tests/language-behaviour/IO/087-external-dataset.swift (from rev 4602, trunk/tests/language-behaviour/087-external-dataset.swift) =================================================================== --- trunk/tests/language-behaviour/IO/087-external-dataset.swift (rev 0) +++ trunk/tests/language-behaviour/IO/087-external-dataset.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,19 @@ +type file; + +(external o) a() { + app { + touch "foo"; + } +} + +b(external o) { + app { + touch "bar"; + } +} + +external sync; + +sync=a(); +b(sync); + Copied: trunk/tests/language-behaviour/IO/106-import.setup.sh (from rev 4602, trunk/tests/language-behaviour/106-import.setup.sh) =================================================================== --- trunk/tests/language-behaviour/IO/106-import.setup.sh (rev 0) +++ trunk/tests/language-behaviour/IO/106-import.setup.sh 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,6 @@ +#!/bin/bash + +cp -v ${GROUP}/testimport.swift . || exit 1 +cp -v ${GROUP}/testimport2.swift . || exit 1 + +exit 0 Copied: trunk/tests/language-behaviour/IO/106-import.swift (from rev 4602, trunk/tests/language-behaviour/106-import.swift) =================================================================== --- trunk/tests/language-behaviour/IO/106-import.swift (rev 0) +++ trunk/tests/language-behaviour/IO/106-import.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,5 @@ +import "testimport"; + +file f; + +int i = 6; Copied: trunk/tests/language-behaviour/IO/130-fmri.0000.jpeg.expected (from rev 4602, trunk/tests/language-behaviour/130-fmri.0000.jpeg.expected) =================================================================== Copied: trunk/tests/language-behaviour/IO/130-fmri.0001.h.in (from rev 4602, trunk/tests/language-behaviour/130-fmri.0001.h.in) =================================================================== --- trunk/tests/language-behaviour/IO/130-fmri.0001.h.in (rev 0) +++ trunk/tests/language-behaviour/IO/130-fmri.0001.h.in 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +qux Copied: trunk/tests/language-behaviour/IO/130-fmri.0001.jpeg.expected (from rev 4602, trunk/tests/language-behaviour/130-fmri.0001.jpeg.expected) =================================================================== Copied: trunk/tests/language-behaviour/IO/130-fmri.0001.v.in (from rev 4602, trunk/tests/language-behaviour/130-fmri.0001.v.in) =================================================================== --- trunk/tests/language-behaviour/IO/130-fmri.0001.v.in (rev 0) +++ trunk/tests/language-behaviour/IO/130-fmri.0001.v.in 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +qux Copied: trunk/tests/language-behaviour/IO/130-fmri.0002.h.in (from rev 4602, trunk/tests/language-behaviour/130-fmri.0002.h.in) =================================================================== --- trunk/tests/language-behaviour/IO/130-fmri.0002.h.in (rev 0) +++ trunk/tests/language-behaviour/IO/130-fmri.0002.h.in 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +qux Copied: trunk/tests/language-behaviour/IO/130-fmri.0002.jpeg.expected (from rev 4602, trunk/tests/language-behaviour/130-fmri.0002.jpeg.expected) =================================================================== Copied: trunk/tests/language-behaviour/IO/130-fmri.0002.v.in (from rev 4602, trunk/tests/language-behaviour/130-fmri.0002.v.in) =================================================================== --- trunk/tests/language-behaviour/IO/130-fmri.0002.v.in (rev 0) +++ trunk/tests/language-behaviour/IO/130-fmri.0002.v.in 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +qux Copied: trunk/tests/language-behaviour/IO/130-fmri.0003.h.in (from rev 4602, trunk/tests/language-behaviour/130-fmri.0003.h.in) =================================================================== --- trunk/tests/language-behaviour/IO/130-fmri.0003.h.in (rev 0) +++ trunk/tests/language-behaviour/IO/130-fmri.0003.h.in 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +qux Copied: trunk/tests/language-behaviour/IO/130-fmri.0003.v.in (from rev 4602, trunk/tests/language-behaviour/130-fmri.0003.v.in) =================================================================== --- trunk/tests/language-behaviour/IO/130-fmri.0003.v.in (rev 0) +++ trunk/tests/language-behaviour/IO/130-fmri.0003.v.in 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +qux Copied: trunk/tests/language-behaviour/IO/130-fmri.0004.h.in (from rev 4602, trunk/tests/language-behaviour/130-fmri.0004.h.in) =================================================================== --- trunk/tests/language-behaviour/IO/130-fmri.0004.h.in (rev 0) +++ trunk/tests/language-behaviour/IO/130-fmri.0004.h.in 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +qux Copied: trunk/tests/language-behaviour/IO/130-fmri.0004.v.in (from rev 4602, trunk/tests/language-behaviour/130-fmri.0004.v.in) =================================================================== --- trunk/tests/language-behaviour/IO/130-fmri.0004.v.in (rev 0) +++ trunk/tests/language-behaviour/IO/130-fmri.0004.v.in 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +qux Copied: trunk/tests/language-behaviour/IO/130-fmri.h.template (from rev 4602, trunk/tests/language-behaviour/130-fmri.h.template) =================================================================== --- trunk/tests/language-behaviour/IO/130-fmri.h.template (rev 0) +++ trunk/tests/language-behaviour/IO/130-fmri.h.template 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +foo Copied: trunk/tests/language-behaviour/IO/130-fmri.swift (from rev 4602, trunk/tests/language-behaviour/130-fmri.swift) =================================================================== --- trunk/tests/language-behaviour/IO/130-fmri.swift (rev 0) +++ trunk/tests/language-behaviour/IO/130-fmri.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,78 @@ + +# attempt to emulate the workflow patterns of the fMRI workflow that +# I often fiddle with. + +type voxels; +type header; + +type volume { + voxels v; + header h; + } + +type slice; + +type jpeg; + + +// inputs: 4 volumes and a reference volume + +volume inputs[] ; +volume template ; + +// align 4 volumes to reference volume + +volume aligned[]; + +foreach inp, i in inputs { + aligned[i] = align(inputs[i], template); +} + +(volume o) align(volume candidate, volume template) { + app { + touch @o.v @o.h; + } +} + +// take average of all 4 (or 5?) volumes + +(volume avg) average(volume candidates[]) { + app { + touch @avg.v @avg.h; + } +} + +volume brainatlas = average(aligned); + +// make 3 slices of the average volume, along x, y, z axes + +(slice s) slicer(volume atlas, string axis) { + app { + touch @s; + } +} + +slice slices[]; + + +string axes[] = ["x", "y", "z"]; +foreach axis, i in axes { + slices[i] = slicer(brainatlas, axis); +} + +// convert each slice into a jpeg + +jpeg final[] ; + +(jpeg j) convert(slice s) { + app { + touch @j; + } +} + +foreach j,i in slices { + final[i] = convert(slices[i]); +} + +// outputs: 3 jpegs + Copied: trunk/tests/language-behaviour/IO/130-fmri.v.template (from rev 4602, trunk/tests/language-behaviour/130-fmri.v.template) =================================================================== --- trunk/tests/language-behaviour/IO/130-fmri.v.template (rev 0) +++ trunk/tests/language-behaviour/IO/130-fmri.v.template 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +foo Copied: trunk/tests/language-behaviour/IO/761-dirname.swift (from rev 4602, trunk/tests/language-behaviour/761-dirname.swift) =================================================================== --- trunk/tests/language-behaviour/IO/761-dirname.swift (rev 0) +++ trunk/tests/language-behaviour/IO/761-dirname.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,9 @@ + +type file{} + +file f<"/d/f.txt">; + +string s = @dirname(f); +string t = @tostring(s); + +tracef("dirname: %s\n", s); Added: trunk/tests/language-behaviour/IO/q2.swift =================================================================== --- trunk/tests/language-behaviour/IO/q2.swift (rev 0) +++ trunk/tests/language-behaviour/IO/q2.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,12 @@ +type messagefile {} + +(messagefile t) greeting (string s) { + app { + echo s stdout=@filename(t); + } +} + +messagefile outfile <"hello2.txt">; + +outfile = greeting("hello world"); + Added: trunk/tests/language-behaviour/IO/q20.swift =================================================================== --- trunk/tests/language-behaviour/IO/q20.swift (rev 0) +++ trunk/tests/language-behaviour/IO/q20.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,18 @@ +type messagefile {} + +(messagefile t) greeting (string s) { + app { + echo s stdout=@filename(t); + } +} + +messagefile outfile <"hello20.txt">; + +boolean morning = true; + +if(morning) { + outfile = greeting("good morning"); +} else { + outfile = greeting("good afternoon"); +} + Added: trunk/tests/language-behaviour/IO/q21.swift =================================================================== --- trunk/tests/language-behaviour/IO/q21.swift (rev 0) +++ trunk/tests/language-behaviour/IO/q21.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,14 @@ +type messagefile {} + +(messagefile t) greeting (string s="hello") { + app { + echo s stdout=@filename(t); + } +} + +messagefile english <"english2.txt">; +messagefile french <"francais2.txt">; + +english = greeting(); +french = greeting(s="bonjour"); + Added: trunk/tests/language-behaviour/IO/q22.swift =================================================================== --- trunk/tests/language-behaviour/IO/q22.swift (rev 0) +++ trunk/tests/language-behaviour/IO/q22.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,19 @@ +type messagefile {} +type countfile {} + +(countfile t) countwords (messagefile f) { + app { + wc "-w" @filename(f) stdout=@filename(t); + } +} + +string inputNames = "one.txt two.txt three.txt"; +string outputNames = "one.count two.count three.count"; + +messagefile inputfiles[] ; +countfile outputfiles[] ; + +outputfiles[0] = countwords(inputfiles[0]); +outputfiles[1] = countwords(inputfiles[1]); +outputfiles[2] = countwords(inputfiles[2]); + Added: trunk/tests/language-behaviour/IO/q23.swift =================================================================== --- trunk/tests/language-behaviour/IO/q23.swift (rev 0) +++ trunk/tests/language-behaviour/IO/q23.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,14 @@ +type messagefile {} + +(messagefile t) greeting (string s) { + app { + echo s stdout=@filename(t); + } +} + +messagefile outfile <"q23.txt">; + +string message = @arg("text"); + +outfile = greeting(message); + Added: trunk/tests/language-behaviour/IO/q3.swift =================================================================== --- trunk/tests/language-behaviour/IO/q3.swift (rev 0) +++ trunk/tests/language-behaviour/IO/q3.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,10 @@ +type file {} + +(file t) echo (string s = "default greeting") { + app { + echo s stdout=@filename(t); + } +} + +file hw = echo(); + Added: trunk/tests/language-behaviour/IO/q5.swift =================================================================== --- trunk/tests/language-behaviour/IO/q5.swift (rev 0) +++ trunk/tests/language-behaviour/IO/q5.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,14 @@ +type messagefile {} + +(messagefile t) greeting (string s[]) { + app { + echo s[0] s[1] s[2] stdout=@filename(t); + } +} + +messagefile outfile <"q5out.txt">; + +string words[] = ["how","are","you"]; + +outfile = greeting(words); + Added: trunk/tests/language-behaviour/IO/q6.swift =================================================================== --- trunk/tests/language-behaviour/IO/q6.swift (rev 0) +++ trunk/tests/language-behaviour/IO/q6.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,14 @@ +type file {} + +(file t) echo (string s) { + app { + echo s stdout=@filename(t); + } +} + +string greetings[] = ["how","are","you"]; + +foreach g in greetings { + file hw = echo(g); +} + Added: trunk/tests/language-behaviour/IO/q7.swift =================================================================== --- trunk/tests/language-behaviour/IO/q7.swift (rev 0) +++ trunk/tests/language-behaviour/IO/q7.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,16 @@ +type file {} + +(file t) echo (string s) { + app { + echo s stdout=@filename(t); + } +} + +string outputNames = "one two three"; + +file outputFiles[] ; + +foreach f in outputFiles { + f = echo("hello"); +} + Copied: trunk/tests/language-behaviour/IO/testimport.swift (from rev 4602, trunk/tests/language-behaviour/testimport.swift) =================================================================== --- trunk/tests/language-behaviour/IO/testimport.swift (rev 0) +++ trunk/tests/language-behaviour/IO/testimport.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,4 @@ +import "testimport2"; + +type file; + Copied: trunk/tests/language-behaviour/IO/testimport2.swift (from rev 4602, trunk/tests/language-behaviour/testimport2.swift) =================================================================== --- trunk/tests/language-behaviour/IO/testimport2.swift (rev 0) +++ trunk/tests/language-behaviour/IO/testimport2.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,4 @@ +import "testimport"; + +type F; + Copied: trunk/tests/language-behaviour/arithmetic/030-mix-float-int.out.expected (from rev 4602, trunk/tests/language-behaviour/030-mix-float-int.out.expected) =================================================================== --- trunk/tests/language-behaviour/arithmetic/030-mix-float-int.out.expected (rev 0) +++ trunk/tests/language-behaviour/arithmetic/030-mix-float-int.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +54.3 Copied: trunk/tests/language-behaviour/arithmetic/030-mix-float-int.swift (from rev 4602, trunk/tests/language-behaviour/030-mix-float-int.swift) =================================================================== --- trunk/tests/language-behaviour/arithmetic/030-mix-float-int.swift (rev 0) +++ trunk/tests/language-behaviour/arithmetic/030-mix-float-int.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,14 @@ +type messagefile {} + +(messagefile t) greeting(float m) { + app { + echo m stdout=@filename(t); + } +} + +messagefile outfile <"030-mix-float-int.out">; + +float f = 42.0 + 12.3; + +outfile = greeting(f); + Copied: trunk/tests/language-behaviour/arithmetic/031-add-float.out.expected (from rev 4602, trunk/tests/language-behaviour/031-add-float.out.expected) =================================================================== --- trunk/tests/language-behaviour/arithmetic/031-add-float.out.expected (rev 0) +++ trunk/tests/language-behaviour/arithmetic/031-add-float.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +135.3 Copied: trunk/tests/language-behaviour/arithmetic/031-add-float.swift (from rev 4602, trunk/tests/language-behaviour/031-add-float.swift) =================================================================== --- trunk/tests/language-behaviour/arithmetic/031-add-float.swift (rev 0) +++ trunk/tests/language-behaviour/arithmetic/031-add-float.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,14 @@ +type messagefile {} + +(messagefile t) greeting(float m) { + app { + echo m stdout=@filename(t); + } +} + +messagefile outfile <"031-add-float.out">; + +float i = 42.1+93.2; + +outfile = greeting(i); + Deleted: trunk/tests/language-behaviour/bug84-comparisons.out.expected =================================================================== --- trunk/tests/language-behaviour/bug84-comparisons.out.expected 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/bug84-comparisons.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -true Deleted: trunk/tests/language-behaviour/bug84-comparisons.swift =================================================================== --- trunk/tests/language-behaviour/bug84-comparisons.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/bug84-comparisons.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,12 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(boolean b) { - app { - echo b stdout=@filename(t); - } -} - -messagefile outfile <"bug84-comparisons.out">; - -outfile = greeting(1 == 1); - Deleted: trunk/tests/language-behaviour/bug84-comparisons2.out.expected =================================================================== --- trunk/tests/language-behaviour/bug84-comparisons2.out.expected 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/bug84-comparisons2.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -true Deleted: trunk/tests/language-behaviour/bug84-comparisons2.swift =================================================================== --- trunk/tests/language-behaviour/bug84-comparisons2.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/bug84-comparisons2.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,16 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(boolean b) { - app { - echo b stdout=@filename(t); - } -} - -messagefile outfile <"bug84-comparisons2.out">; - -int i = 2; - -boolean r = i==2; - -outfile = greeting(r); - Copied: trunk/tests/language-behaviour/compounds/0024-compound.Q.out.expected (from rev 4602, trunk/tests/language-behaviour/0024-compound.Q.out.expected) =================================================================== --- trunk/tests/language-behaviour/compounds/0024-compound.Q.out.expected (rev 0) +++ trunk/tests/language-behaviour/compounds/0024-compound.Q.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +f Copied: trunk/tests/language-behaviour/compounds/0024-compound.R.out.expected (from rev 4602, trunk/tests/language-behaviour/0024-compound.R.out.expected) =================================================================== --- trunk/tests/language-behaviour/compounds/0024-compound.R.out.expected (rev 0) +++ trunk/tests/language-behaviour/compounds/0024-compound.R.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +s Copied: trunk/tests/language-behaviour/compounds/0024-compound.swift (from rev 4602, trunk/tests/language-behaviour/0024-compound.swift) =================================================================== --- trunk/tests/language-behaviour/compounds/0024-compound.swift (rev 0) +++ trunk/tests/language-behaviour/compounds/0024-compound.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,20 @@ +type messagefile {} + +(messagefile t) greeting(string m) { + app { + echo m stdout=@filename(t); + } +} + +(messagefile first, messagefile second) compound() { + first = greeting("f"); + second = greeting("s"); + +} + +messagefile a <"0024-compound.Q.out">; +messagefile b <"0024-compound.R.out">; + +(a,b) = compound(); + + Copied: trunk/tests/language-behaviour/compounds/00241-nested-single-compound.out.expected (from rev 4602, trunk/tests/language-behaviour/00241-nested-single-compound.out.expected) =================================================================== --- trunk/tests/language-behaviour/compounds/00241-nested-single-compound.out.expected (rev 0) +++ trunk/tests/language-behaviour/compounds/00241-nested-single-compound.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +f Copied: trunk/tests/language-behaviour/compounds/00241-nested-single-compound.swift (from rev 4602, trunk/tests/language-behaviour/00241-nested-single-compound.swift) =================================================================== --- trunk/tests/language-behaviour/compounds/00241-nested-single-compound.swift (rev 0) +++ trunk/tests/language-behaviour/compounds/00241-nested-single-compound.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,21 @@ +type file; + +(file t) greeting(string m) { + app { + echo m stdout=@filename(t); + } +} + +(file first) compound() { + first = greeting("f"); +} + +(file first) compoundB() { + first = compound(); +} + +file a <"00241-nested-single-compound.out">; + +a = compoundB(); + + Copied: trunk/tests/language-behaviour/compounds/00242-compound-with-vars.swift (from rev 4602, trunk/tests/language-behaviour/00242-compound-with-vars.swift) =================================================================== --- trunk/tests/language-behaviour/compounds/00242-compound-with-vars.swift (rev 0) +++ trunk/tests/language-behaviour/compounds/00242-compound-with-vars.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,20 @@ +type messagefile {} + +(messagefile t) greeting(string m) { + app { + echo m stdout=@filename(t); + } +} + +(messagefile first, messagefile second) compound() { + string third="f"; + first = greeting(third); + second = greeting("s"); +} + +messagefile a <"0024-compound.Q.out">; +messagefile b <"0024-compound.R.out">; + +(a,b) = compound(); + + Copied: trunk/tests/language-behaviour/control_structures/090-case.out.expected (from rev 4602, trunk/tests/language-behaviour/090-case.out.expected) =================================================================== --- trunk/tests/language-behaviour/control_structures/090-case.out.expected (rev 0) +++ trunk/tests/language-behaviour/control_structures/090-case.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +eighth message Copied: trunk/tests/language-behaviour/control_structures/090-case.swift (from rev 4602, trunk/tests/language-behaviour/090-case.swift) =================================================================== --- trunk/tests/language-behaviour/control_structures/090-case.swift (rev 0) +++ trunk/tests/language-behaviour/control_structures/090-case.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,27 @@ +type messagefile {} + +(messagefile t) greeting(string m) { + app { + echo m stdout=@filename(t); + } +} + +messagefile outfile <"090-case.out">; + + +string message; + +switch(8) { + case 3: + message="first message"; + case 8: + message="eighth message"; + case 57: + message="last message"; + default: + message="no message at all..."; +} + +trace(message); +outfile = greeting(message); + Copied: trunk/tests/language-behaviour/control_structures/091-case.out.expected (from rev 4602, trunk/tests/language-behaviour/091-case.out.expected) =================================================================== --- trunk/tests/language-behaviour/control_structures/091-case.out.expected (rev 0) +++ trunk/tests/language-behaviour/control_structures/091-case.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +eighth message Copied: trunk/tests/language-behaviour/control_structures/091-case.swift (from rev 4602, trunk/tests/language-behaviour/091-case.swift) =================================================================== --- trunk/tests/language-behaviour/control_structures/091-case.swift (rev 0) +++ trunk/tests/language-behaviour/control_structures/091-case.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,29 @@ +type messagefile {} + +(messagefile t) greeting(string m) { + app { + echo m stdout=@filename(t); + } +} + +messagefile outfile <"091-case.out">; + +int selector = 8; + +trace(selector); + +string message; + +switch(selector) { + case 3: + message="first message"; + case 8: + message="eighth message"; + case 57: + message="last message"; + default: + message="no message at all..."; +} + +outfile = greeting(message); + Copied: trunk/tests/language-behaviour/control_structures/100-comparison.out.expected (from rev 4602, trunk/tests/language-behaviour/100-comparison.out.expected) =================================================================== --- trunk/tests/language-behaviour/control_structures/100-comparison.out.expected (rev 0) +++ trunk/tests/language-behaviour/control_structures/100-comparison.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +true Copied: trunk/tests/language-behaviour/control_structures/100-comparison.swift (from rev 4602, trunk/tests/language-behaviour/100-comparison.swift) =================================================================== --- trunk/tests/language-behaviour/control_structures/100-comparison.swift (rev 0) +++ trunk/tests/language-behaviour/control_structures/100-comparison.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,14 @@ +type messagefile {} + +(messagefile t) greeting(boolean b) { + app { + echo b stdout=@filename(t); + } +} + +messagefile outfile <"100-comparison.out">; + +boolean r = 1==1; + +outfile = greeting(r); + Copied: trunk/tests/language-behaviour/control_structures/101-comparison-string.out.expected (from rev 4602, trunk/tests/language-behaviour/101-comparison-string.out.expected) =================================================================== --- trunk/tests/language-behaviour/control_structures/101-comparison-string.out.expected (rev 0) +++ trunk/tests/language-behaviour/control_structures/101-comparison-string.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +true Copied: trunk/tests/language-behaviour/control_structures/101-comparison-string.swift (from rev 4602, trunk/tests/language-behaviour/101-comparison-string.swift) =================================================================== --- trunk/tests/language-behaviour/control_structures/101-comparison-string.swift (rev 0) +++ trunk/tests/language-behaviour/control_structures/101-comparison-string.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,16 @@ +type messagefile {} + +(messagefile t) greeting(boolean b) { + app { + echo b stdout=@filename(t); + } +} + +messagefile outfile <"101-comparison-string.out">; + +string s = "hello"; + +boolean r = s=="hello"; + +outfile = greeting(r); + Copied: trunk/tests/language-behaviour/control_structures/105-if.out.expected (from rev 4602, trunk/tests/language-behaviour/105-if.out.expected) =================================================================== --- trunk/tests/language-behaviour/control_structures/105-if.out.expected (rev 0) +++ trunk/tests/language-behaviour/control_structures/105-if.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +hello Copied: trunk/tests/language-behaviour/control_structures/105-if.swift (from rev 4602, trunk/tests/language-behaviour/105-if.swift) =================================================================== --- trunk/tests/language-behaviour/control_structures/105-if.swift (rev 0) +++ trunk/tests/language-behaviour/control_structures/105-if.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,16 @@ +type messagefile; + +(messagefile t) greeting() { + app { + echo "hello" stdout=@filename(t); + } +} + +messagefile outfile <"105-if.out">; + +boolean b = 1==1; + +if(b) { + outfile = greeting(); +} + Copied: trunk/tests/language-behaviour/control_structures/bug84-comparisons.out.expected (from rev 4602, trunk/tests/language-behaviour/bug84-comparisons.out.expected) =================================================================== --- trunk/tests/language-behaviour/control_structures/bug84-comparisons.out.expected (rev 0) +++ trunk/tests/language-behaviour/control_structures/bug84-comparisons.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +true Copied: trunk/tests/language-behaviour/control_structures/bug84-comparisons.swift (from rev 4602, trunk/tests/language-behaviour/bug84-comparisons.swift) =================================================================== --- trunk/tests/language-behaviour/control_structures/bug84-comparisons.swift (rev 0) +++ trunk/tests/language-behaviour/control_structures/bug84-comparisons.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,12 @@ +type messagefile {} + +(messagefile t) greeting(boolean b) { + app { + echo b stdout=@filename(t); + } +} + +messagefile outfile <"bug84-comparisons.out">; + +outfile = greeting(1 == 1); + Copied: trunk/tests/language-behaviour/control_structures/bug84-comparisons2.out.expected (from rev 4602, trunk/tests/language-behaviour/bug84-comparisons2.out.expected) =================================================================== --- trunk/tests/language-behaviour/control_structures/bug84-comparisons2.out.expected (rev 0) +++ trunk/tests/language-behaviour/control_structures/bug84-comparisons2.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +true Copied: trunk/tests/language-behaviour/control_structures/bug84-comparisons2.swift (from rev 4602, trunk/tests/language-behaviour/bug84-comparisons2.swift) =================================================================== --- trunk/tests/language-behaviour/control_structures/bug84-comparisons2.swift (rev 0) +++ trunk/tests/language-behaviour/control_structures/bug84-comparisons2.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,16 @@ +type messagefile {} + +(messagefile t) greeting(boolean b) { + app { + echo b stdout=@filename(t); + } +} + +messagefile outfile <"bug84-comparisons2.out">; + +int i = 2; + +boolean r = i==2; + +outfile = greeting(r); + Copied: trunk/tests/language-behaviour/datatypes/0231-complex-type.out.expected (from rev 4602, trunk/tests/language-behaviour/0231-complex-type.out.expected) =================================================================== --- trunk/tests/language-behaviour/datatypes/0231-complex-type.out.expected (rev 0) +++ trunk/tests/language-behaviour/datatypes/0231-complex-type.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +3 44 Copied: trunk/tests/language-behaviour/datatypes/0231-complex-type.swift (from rev 4602, trunk/tests/language-behaviour/0231-complex-type.swift) =================================================================== --- trunk/tests/language-behaviour/datatypes/0231-complex-type.swift (rev 0) +++ trunk/tests/language-behaviour/datatypes/0231-complex-type.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,21 @@ +type messagefile {} + +type mystruct { + int first, second; +} + +(messagefile t) greeting(mystruct m) { + app { + echo m.first m.second stdout=@filename(t); + } +} + +messagefile outfile <"0231-complex-type.out">; + +mystruct m; + +m.first = 3; +m.second = 44; + +outfile = greeting(m); + Copied: trunk/tests/language-behaviour/datatypes/027-single-character-typename.swift (from rev 4602, trunk/tests/language-behaviour/027-single-character-typename.swift) =================================================================== --- trunk/tests/language-behaviour/datatypes/027-single-character-typename.swift (rev 0) +++ trunk/tests/language-behaviour/datatypes/027-single-character-typename.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,3 @@ +type q; +q i; + Copied: trunk/tests/language-behaviour/datatypes/028-double-character-typename.swift (from rev 4602, trunk/tests/language-behaviour/028-double-character-typename.swift) =================================================================== --- trunk/tests/language-behaviour/datatypes/028-double-character-typename.swift (rev 0) +++ trunk/tests/language-behaviour/datatypes/028-double-character-typename.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,4 @@ +type qq; + +qq i; + Copied: trunk/tests/language-behaviour/datatypes/032-boolconst.f.out.expected (from rev 4602, trunk/tests/language-behaviour/032-boolconst.f.out.expected) =================================================================== --- trunk/tests/language-behaviour/datatypes/032-boolconst.f.out.expected (rev 0) +++ trunk/tests/language-behaviour/datatypes/032-boolconst.f.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +false Copied: trunk/tests/language-behaviour/datatypes/032-boolconst.swift (from rev 4602, trunk/tests/language-behaviour/032-boolconst.swift) =================================================================== --- trunk/tests/language-behaviour/datatypes/032-boolconst.swift (rev 0) +++ trunk/tests/language-behaviour/datatypes/032-boolconst.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,14 @@ +type messagefile; + +(messagefile t) p(boolean b) { + app { + echo b stdout=@filename(t); + } +} + +messagefile tfile <"032-boolconst.t.out">; +messagefile ffile <"032-boolconst.f.out">; + +tfile = p(true); +ffile = p(false); + Copied: trunk/tests/language-behaviour/datatypes/032-boolconst.t.out.expected (from rev 4602, trunk/tests/language-behaviour/032-boolconst.t.out.expected) =================================================================== --- trunk/tests/language-behaviour/datatypes/032-boolconst.t.out.expected (rev 0) +++ trunk/tests/language-behaviour/datatypes/032-boolconst.t.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +true Copied: trunk/tests/language-behaviour/datatypes/053-pass-int.out.expected (from rev 4602, trunk/tests/language-behaviour/053-pass-int.out.expected) =================================================================== --- trunk/tests/language-behaviour/datatypes/053-pass-int.out.expected (rev 0) +++ trunk/tests/language-behaviour/datatypes/053-pass-int.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +7 Copied: trunk/tests/language-behaviour/datatypes/053-pass-int.swift (from rev 4602, trunk/tests/language-behaviour/053-pass-int.swift) =================================================================== --- trunk/tests/language-behaviour/datatypes/053-pass-int.swift (rev 0) +++ trunk/tests/language-behaviour/datatypes/053-pass-int.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,12 @@ +type messagefile {} + +(messagefile t) greeting(string m, int i) { + app { + echo i stdout=@filename(t); + } +} + +messagefile outfile <"053-pass-int.out">; + +outfile = greeting("hi", 7); + Copied: trunk/tests/language-behaviour/datatypes/054-pass-int.out.expected (from rev 4602, trunk/tests/language-behaviour/054-pass-int.out.expected) =================================================================== --- trunk/tests/language-behaviour/datatypes/054-pass-int.out.expected (rev 0) +++ trunk/tests/language-behaviour/datatypes/054-pass-int.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +99 Copied: trunk/tests/language-behaviour/datatypes/054-pass-int.swift (from rev 4602, trunk/tests/language-behaviour/054-pass-int.swift) =================================================================== --- trunk/tests/language-behaviour/datatypes/054-pass-int.swift (rev 0) +++ trunk/tests/language-behaviour/datatypes/054-pass-int.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,14 @@ +type messagefile {} + +(messagefile t) greeting(string m, int i) { + app { + echo i stdout=@filename(t); + } +} + +messagefile outfile <"054-pass-int.out">; + +int luftballons = 99; + +outfile = greeting("hi", luftballons); + Copied: trunk/tests/language-behaviour/datatypes/055-pass-int.out.expected (from rev 4602, trunk/tests/language-behaviour/055-pass-int.out.expected) =================================================================== --- trunk/tests/language-behaviour/datatypes/055-pass-int.out.expected (rev 0) +++ trunk/tests/language-behaviour/datatypes/055-pass-int.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +99 Copied: trunk/tests/language-behaviour/datatypes/055-pass-int.swift (from rev 4602, trunk/tests/language-behaviour/055-pass-int.swift) =================================================================== --- trunk/tests/language-behaviour/datatypes/055-pass-int.swift (rev 0) +++ trunk/tests/language-behaviour/datatypes/055-pass-int.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,16 @@ +type messagefile {} + +(messagefile t) greeting(string m, int i) { + app { + echo i stdout=@filename(t); + } +} + +messagefile outfile <"055-pass-int.out">; + +int luftballons; + +luftballons = 99; + +outfile = greeting("hi", luftballons); + Copied: trunk/tests/language-behaviour/datatypes/regress-r2292.swift (from rev 4602, trunk/tests/language-behaviour/regress-r2292.swift) =================================================================== --- trunk/tests/language-behaviour/datatypes/regress-r2292.swift (rev 0) +++ trunk/tests/language-behaviour/datatypes/regress-r2292.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +type row { int column[]; } Copied: trunk/tests/language-behaviour/logic/033-and.ff.out.expected (from rev 4602, trunk/tests/language-behaviour/033-and.ff.out.expected) =================================================================== --- trunk/tests/language-behaviour/logic/033-and.ff.out.expected (rev 0) +++ trunk/tests/language-behaviour/logic/033-and.ff.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +false Copied: trunk/tests/language-behaviour/logic/033-and.ft.out.expected (from rev 4602, trunk/tests/language-behaviour/033-and.ft.out.expected) =================================================================== --- trunk/tests/language-behaviour/logic/033-and.ft.out.expected (rev 0) +++ trunk/tests/language-behaviour/logic/033-and.ft.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +false Copied: trunk/tests/language-behaviour/logic/033-and.swift (from rev 4602, trunk/tests/language-behaviour/033-and.swift) =================================================================== --- trunk/tests/language-behaviour/logic/033-and.swift (rev 0) +++ trunk/tests/language-behaviour/logic/033-and.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,18 @@ +type messagefile; + +(messagefile t) p(boolean b) { + app { + echo b stdout=@filename(t); + } +} + +messagefile fffile <"033-and.ff.out">; +messagefile ftfile <"033-and.ft.out">; +messagefile tffile <"033-and.tf.out">; +messagefile ttfile <"033-and.tt.out">; + +fffile = p(false && false); +ftfile = p(false && true); +tffile = p(true && false); +ttfile = p(true && true); + Copied: trunk/tests/language-behaviour/logic/033-and.tf.out.expected (from rev 4602, trunk/tests/language-behaviour/033-and.tf.out.expected) =================================================================== --- trunk/tests/language-behaviour/logic/033-and.tf.out.expected (rev 0) +++ trunk/tests/language-behaviour/logic/033-and.tf.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +false Copied: trunk/tests/language-behaviour/logic/033-and.tt.out.expected (from rev 4602, trunk/tests/language-behaviour/033-and.tt.out.expected) =================================================================== --- trunk/tests/language-behaviour/logic/033-and.tt.out.expected (rev 0) +++ trunk/tests/language-behaviour/logic/033-and.tt.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +true Copied: trunk/tests/language-behaviour/logic/034-or.ff.out.expected (from rev 4602, trunk/tests/language-behaviour/034-or.ff.out.expected) =================================================================== --- trunk/tests/language-behaviour/logic/034-or.ff.out.expected (rev 0) +++ trunk/tests/language-behaviour/logic/034-or.ff.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +false Copied: trunk/tests/language-behaviour/logic/034-or.ft.out.expected (from rev 4602, trunk/tests/language-behaviour/034-or.ft.out.expected) =================================================================== --- trunk/tests/language-behaviour/logic/034-or.ft.out.expected (rev 0) +++ trunk/tests/language-behaviour/logic/034-or.ft.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +true Copied: trunk/tests/language-behaviour/logic/034-or.swift (from rev 4602, trunk/tests/language-behaviour/034-or.swift) =================================================================== --- trunk/tests/language-behaviour/logic/034-or.swift (rev 0) +++ trunk/tests/language-behaviour/logic/034-or.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,18 @@ +type messagefile; + +(messagefile t) p(boolean b) { + app { + echo b stdout=@filename(t); + } +} + +messagefile fffile <"034-or.ff.out">; +messagefile ftfile <"034-or.ft.out">; +messagefile tffile <"034-or.tf.out">; +messagefile ttfile <"034-or.tt.out">; + +fffile = p(false || false); +ftfile = p(false || true); +tffile = p(true || false); +ttfile = p(true || true); + Copied: trunk/tests/language-behaviour/logic/034-or.tf.out.expected (from rev 4602, trunk/tests/language-behaviour/034-or.tf.out.expected) =================================================================== --- trunk/tests/language-behaviour/logic/034-or.tf.out.expected (rev 0) +++ trunk/tests/language-behaviour/logic/034-or.tf.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +true Copied: trunk/tests/language-behaviour/logic/034-or.tt.out.expected (from rev 4602, trunk/tests/language-behaviour/034-or.tt.out.expected) =================================================================== --- trunk/tests/language-behaviour/logic/034-or.tt.out.expected (rev 0) +++ trunk/tests/language-behaviour/logic/034-or.tt.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +true Copied: trunk/tests/language-behaviour/logic/035-not.swift (from rev 4602, trunk/tests/language-behaviour/035-not.swift) =================================================================== --- trunk/tests/language-behaviour/logic/035-not.swift (rev 0) +++ trunk/tests/language-behaviour/logic/035-not.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,14 @@ +type messagefile; + +(messagefile t) p(boolean b) { + app { + echo b stdout=@filename(t); + } +} + +messagefile tfile <"035-not.t.out">; +messagefile ffile <"035-not.f.out">; + +tfile = p(!true); +ffile = p(!false); + Deleted: trunk/tests/language-behaviour/proc-in-expr.swift =================================================================== --- trunk/tests/language-behaviour/proc-in-expr.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/proc-in-expr.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,10 +0,0 @@ - -(int r) mynum(int p) { - r = p; -} - -int x = mynum(3); - -trace(x); - - Copied: trunk/tests/language-behaviour/procedures/0026-function-param.swift (from rev 4602, trunk/tests/language-behaviour/0026-function-param.swift) =================================================================== --- trunk/tests/language-behaviour/procedures/0026-function-param.swift (rev 0) +++ trunk/tests/language-behaviour/procedures/0026-function-param.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,7 @@ +(int r) add(int a, int b) { + r = a + b; +} + +trace(add(1, 1)); + +trace(add(add(1, 1), add(2, 2))); Copied: trunk/tests/language-behaviour/procedures/00261-function-param-file.clean.sh (from rev 4602, trunk/tests/language-behaviour/00261-function-param-file.clean.sh) =================================================================== --- trunk/tests/language-behaviour/procedures/00261-function-param-file.clean.sh (rev 0) +++ trunk/tests/language-behaviour/procedures/00261-function-param-file.clean.sh 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,5 @@ +#!/bin/bash + +rm -v 00261-function-param-file.in || exit 1 + +exit 0 Copied: trunk/tests/language-behaviour/procedures/00261-function-param-file.in (from rev 4602, trunk/tests/language-behaviour/00261-function-param-file.in) =================================================================== --- trunk/tests/language-behaviour/procedures/00261-function-param-file.in (rev 0) +++ trunk/tests/language-behaviour/procedures/00261-function-param-file.in 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,4 @@ +a +b +c +d Copied: trunk/tests/language-behaviour/procedures/00261-function-param-file.setup.sh (from rev 4602, trunk/tests/language-behaviour/00261-function-param-file.setup.sh) =================================================================== --- trunk/tests/language-behaviour/procedures/00261-function-param-file.setup.sh (rev 0) +++ trunk/tests/language-behaviour/procedures/00261-function-param-file.setup.sh 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,5 @@ +#!/bin/bash + +cp -v ${GROUP}/00261-function-param-file.in . || exit 1 + +exit 0 Copied: trunk/tests/language-behaviour/procedures/00261-function-param-file.swift (from rev 4602, trunk/tests/language-behaviour/00261-function-param-file.swift) =================================================================== --- trunk/tests/language-behaviour/procedures/00261-function-param-file.swift (rev 0) +++ trunk/tests/language-behaviour/procedures/00261-function-param-file.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,14 @@ +type file; + +app (file editedParams) setTemps ( file inParams ) +{ +cat stdin=@inParams stdout=@editedParams; +} + +file inParams; + +string config [] = readData( setTemps(inParams ) ); + +trace(0,config[0]); +trace(1,config[1]); + Copied: trunk/tests/language-behaviour/procedures/00262-function-param-file-many.clean.sh (from rev 4602, trunk/tests/language-behaviour/00262-function-param-file-many.clean.sh) =================================================================== --- trunk/tests/language-behaviour/procedures/00262-function-param-file-many.clean.sh (rev 0) +++ trunk/tests/language-behaviour/procedures/00262-function-param-file-many.clean.sh 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,5 @@ +#!/bin/bash + +rm -v 00262-function-param-file-many.in || exit 1 + +exit 0 Copied: trunk/tests/language-behaviour/procedures/00262-function-param-file-many.in (from rev 4602, trunk/tests/language-behaviour/00262-function-param-file-many.in) =================================================================== --- trunk/tests/language-behaviour/procedures/00262-function-param-file-many.in (rev 0) +++ trunk/tests/language-behaviour/procedures/00262-function-param-file-many.in 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,4 @@ +a +b +c +d Copied: trunk/tests/language-behaviour/procedures/00262-function-param-file-many.setup.sh (from rev 4602, trunk/tests/language-behaviour/00262-function-param-file-many.setup.sh) =================================================================== --- trunk/tests/language-behaviour/procedures/00262-function-param-file-many.setup.sh (rev 0) +++ trunk/tests/language-behaviour/procedures/00262-function-param-file-many.setup.sh 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,5 @@ +#!/bin/bash + +cp -v ${GROUP}/00262-function-param-file-many.in . || exit 1 + +exit 0 Copied: trunk/tests/language-behaviour/procedures/00262-function-param-file-many.swift (from rev 4602, trunk/tests/language-behaviour/00262-function-param-file-many.swift) =================================================================== --- trunk/tests/language-behaviour/procedures/00262-function-param-file-many.swift (rev 0) +++ trunk/tests/language-behaviour/procedures/00262-function-param-file-many.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,14 @@ +type file; + +app (file editedParams) cat ( file inParams ) +{ +cat stdin=@inParams stdout=@editedParams; +} + +file inParams; + +string config [] = readData( cat(cat(cat(inParams ) ))); + +trace(0,config[0]); +trace(1,config[1]); + Copied: trunk/tests/language-behaviour/procedures/080-declare-assign-proc.swift (from rev 4602, trunk/tests/language-behaviour/080-declare-assign-proc.swift) =================================================================== --- trunk/tests/language-behaviour/procedures/080-declare-assign-proc.swift (rev 0) +++ trunk/tests/language-behaviour/procedures/080-declare-assign-proc.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,12 @@ +type messagefile {} + +(messagefile t) greeting() { + app { + echo "hello" stdout=@filename(t); + } +} + +messagefile outfile = greeting(); + +// can't check the output in present framework because don't know +// what filename got chosen for outfile... Copied: trunk/tests/language-behaviour/procedures/081-declare-assign-proc.swift (from rev 4602, trunk/tests/language-behaviour/081-declare-assign-proc.swift) =================================================================== --- trunk/tests/language-behaviour/procedures/081-declare-assign-proc.swift (rev 0) +++ trunk/tests/language-behaviour/procedures/081-declare-assign-proc.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,12 @@ +type messagefile {} + +(messagefile t) greeting(int i) { + app { + echo i stdout=@filename(t); + } +} + +messagefile outfile = greeting(3 + 2); + +// can't check the output in present framework because don't know +// what filename got chosen for outfile... Copied: trunk/tests/language-behaviour/procedures/082-declare-assign-proc-separate.swift (from rev 4602, trunk/tests/language-behaviour/082-declare-assign-proc-separate.swift) =================================================================== --- trunk/tests/language-behaviour/procedures/082-declare-assign-proc-separate.swift (rev 0) +++ trunk/tests/language-behaviour/procedures/082-declare-assign-proc-separate.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,13 @@ +type messagefile {} + +(messagefile t) greeting() { + app { + echo "hello" stdout=@filename(t); + } +} + +messagefile outfile; +outfile = greeting(); + +// can't check the output in present framework because don't know +// what filename got chosen for outfile... Copied: trunk/tests/language-behaviour/procedures/089-nested-proc-call.swift (from rev 4602, trunk/tests/language-behaviour/089-nested-proc-call.swift) =================================================================== --- trunk/tests/language-behaviour/procedures/089-nested-proc-call.swift (rev 0) +++ trunk/tests/language-behaviour/procedures/089-nested-proc-call.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,21 @@ +type messagefile; + +(messagefile t) inner_greeting() { + app { + echo "hello" stdout=@filename(t); + } +} + +(string s) outer_greeting() { + messagefile m <"ssss">; + m = inner_greeting(); + s = readData(m); +} + + +// messagefile outfile <"089-nested-proc-call.swift">; + +// outfile = greeting(); + +trace(outer_greeting()); + Copied: trunk/tests/language-behaviour/procedures/proc-in-expr.swift (from rev 4602, trunk/tests/language-behaviour/proc-in-expr.swift) =================================================================== --- trunk/tests/language-behaviour/procedures/proc-in-expr.swift (rev 0) +++ trunk/tests/language-behaviour/procedures/proc-in-expr.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,10 @@ + +(int r) mynum(int p) { + r = p; +} + +int x = mynum(3); + +trace(x); + + Deleted: trunk/tests/language-behaviour/regress-r2292.swift =================================================================== --- trunk/tests/language-behaviour/regress-r2292.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/regress-r2292.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +0,0 @@ -type row { int column[]; } Copied: trunk/tests/language-behaviour/strings/003-strcat.out.expected (from rev 4602, trunk/tests/language-behaviour/003-strcat.out.expected) =================================================================== --- trunk/tests/language-behaviour/strings/003-strcat.out.expected (rev 0) +++ trunk/tests/language-behaviour/strings/003-strcat.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +abcqux Copied: trunk/tests/language-behaviour/strings/003-strcat.swift (from rev 4602, trunk/tests/language-behaviour/003-strcat.swift) =================================================================== --- trunk/tests/language-behaviour/strings/003-strcat.swift (rev 0) +++ trunk/tests/language-behaviour/strings/003-strcat.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,15 @@ +type messagefile {} + +(messagefile t) greeting(string m) { + app { + echo m stdout=@filename(t); + } +} + +messagefile outfile <"003-strcat.out">; + +string v = @strcat("abc","qux"); + +outfile = greeting(v); + + Copied: trunk/tests/language-behaviour/strings/0031-strcat-op.out.expected (from rev 4602, trunk/tests/language-behaviour/0031-strcat-op.out.expected) =================================================================== --- trunk/tests/language-behaviour/strings/0031-strcat-op.out.expected (rev 0) +++ trunk/tests/language-behaviour/strings/0031-strcat-op.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +abc,qux Copied: trunk/tests/language-behaviour/strings/0031-strcat-op.swift (from rev 4602, trunk/tests/language-behaviour/0031-strcat-op.swift) =================================================================== --- trunk/tests/language-behaviour/strings/0031-strcat-op.swift (rev 0) +++ trunk/tests/language-behaviour/strings/0031-strcat-op.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,18 @@ +type messagefile {} + +(messagefile t) greeting(string m) { + app { + echo m stdout=@filename(t); + } +} + +messagefile outfile <"0031-strcat-op.out">; + +string a = "abc"; +string b = "qux"; + +string v = a + "," + b; + +outfile = greeting(v); + + Copied: trunk/tests/language-behaviour/strings/004-strcat-in-arg.out.expected (from rev 4602, trunk/tests/language-behaviour/004-strcat-in-arg.out.expected) =================================================================== --- trunk/tests/language-behaviour/strings/004-strcat-in-arg.out.expected (rev 0) +++ trunk/tests/language-behaviour/strings/004-strcat-in-arg.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +test004append Copied: trunk/tests/language-behaviour/strings/004-strcat-in-arg.swift (from rev 4602, trunk/tests/language-behaviour/004-strcat-in-arg.swift) =================================================================== --- trunk/tests/language-behaviour/strings/004-strcat-in-arg.swift (rev 0) +++ trunk/tests/language-behaviour/strings/004-strcat-in-arg.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,13 @@ +type messagefile {} + +(messagefile t) greeting(string m) { + app { + echo m stdout=@filename(t); + } +} + +messagefile outfile <"004-strcat-in-arg.out">; + +outfile = greeting(@strcat("test004","append")); + + Copied: trunk/tests/language-behaviour/strings/005-strcut.out.expected (from rev 4602, trunk/tests/language-behaviour/005-strcut.out.expected) =================================================================== --- trunk/tests/language-behaviour/strings/005-strcut.out.expected (rev 0) +++ trunk/tests/language-behaviour/strings/005-strcut.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +def Copied: trunk/tests/language-behaviour/strings/005-strcut.swift (from rev 4602, trunk/tests/language-behaviour/005-strcut.swift) =================================================================== --- trunk/tests/language-behaviour/strings/005-strcut.swift (rev 0) +++ trunk/tests/language-behaviour/strings/005-strcut.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,14 @@ +type messagefile {} + +(messagefile t) greeting(string m) { + app { + echo m stdout=@filename(t); + } +} + +messagefile outfile <"005-strcut.out">; + +string v = @strcut("abcdefghi", "abc(def)ghi"); + +outfile = greeting(v); + Copied: trunk/tests/language-behaviour/strings/0051-regexp.out.expected (from rev 4602, trunk/tests/language-behaviour/0051-regexp.out.expected) =================================================================== --- trunk/tests/language-behaviour/strings/0051-regexp.out.expected (rev 0) +++ trunk/tests/language-behaviour/strings/0051-regexp.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +monkey Copied: trunk/tests/language-behaviour/strings/0051-regexp.swift (from rev 4602, trunk/tests/language-behaviour/0051-regexp.swift) =================================================================== --- trunk/tests/language-behaviour/strings/0051-regexp.swift (rev 0) +++ trunk/tests/language-behaviour/strings/0051-regexp.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,14 @@ +type messagefile {} + +(messagefile t) greeting(string m) { + app { + echo m stdout=@filename(t); + } +} + +messagefile outfile <"0051-regexp.out">; + +string v = @regexp("abcdefghi", "abc(def)ghi","monkey"); + +outfile = greeting(v); + Copied: trunk/tests/language-behaviour/strings/0052-regexp.out.expected (from rev 4602, trunk/tests/language-behaviour/0052-regexp.out.expected) =================================================================== --- trunk/tests/language-behaviour/strings/0052-regexp.out.expected (rev 0) +++ trunk/tests/language-behaviour/strings/0052-regexp.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +abmonkeyhi Copied: trunk/tests/language-behaviour/strings/0052-regexp.swift (from rev 4602, trunk/tests/language-behaviour/0052-regexp.swift) =================================================================== --- trunk/tests/language-behaviour/strings/0052-regexp.swift (rev 0) +++ trunk/tests/language-behaviour/strings/0052-regexp.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,14 @@ +type messagefile {} + +(messagefile t) greeting(string m) { + app { + echo m stdout=@filename(t); + } +} + +messagefile outfile <"0052-regexp.out">; + +string v = @regexp("abcdefghi", "c(def)g","monkey"); + +outfile = greeting(v); + Copied: trunk/tests/language-behaviour/strings/0053-toint.out.expected (from rev 4602, trunk/tests/language-behaviour/0053-toint.out.expected) =================================================================== --- trunk/tests/language-behaviour/strings/0053-toint.out.expected (rev 0) +++ trunk/tests/language-behaviour/strings/0053-toint.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +109 Copied: trunk/tests/language-behaviour/strings/0053-toint.swift (from rev 4602, trunk/tests/language-behaviour/0053-toint.swift) =================================================================== --- trunk/tests/language-behaviour/strings/0053-toint.swift (rev 0) +++ trunk/tests/language-behaviour/strings/0053-toint.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,15 @@ +type messagefile; + +(messagefile t) greeting(int m) { + app { + echo m stdout=@filename(t); + } +} + +messagefile outfile <"0053-toint.out">; + +string left = "010"; +string right = "99"; + +outfile = greeting(@toint(left) + @toint(right)); + Copied: trunk/tests/language-behaviour/strings/0054-strsplit.out.expected (from rev 4602, trunk/tests/language-behaviour/0054-strsplit.out.expected) =================================================================== --- trunk/tests/language-behaviour/strings/0054-strsplit.out.expected (rev 0) +++ trunk/tests/language-behaviour/strings/0054-strsplit.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +ab , c , def , ghij Copied: trunk/tests/language-behaviour/strings/0054-strsplit.swift (from rev 4602, trunk/tests/language-behaviour/0054-strsplit.swift) =================================================================== --- trunk/tests/language-behaviour/strings/0054-strsplit.swift (rev 0) +++ trunk/tests/language-behaviour/strings/0054-strsplit.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,14 @@ +type messagefile {} + +(messagefile t) greeting(string a, string b, string c, string d) { + app { + echo a "," b "," c "," d stdout=@filename(t); + } +} + +messagefile outfile <"0054-strsplit.out">; + +string s[] = @strsplit("ab c def ghij", "\\s"); + +outfile = greeting(s[0], s[1], s[2], s[3]); + Copied: trunk/tests/language-behaviour/strings/103-quote.out.expected (from rev 4602, trunk/tests/language-behaviour/103-quote.out.expected) =================================================================== --- trunk/tests/language-behaviour/strings/103-quote.out.expected (rev 0) +++ trunk/tests/language-behaviour/strings/103-quote.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +" Copied: trunk/tests/language-behaviour/strings/103-quote.swift (from rev 4602, trunk/tests/language-behaviour/103-quote.swift) =================================================================== --- trunk/tests/language-behaviour/strings/103-quote.swift (rev 0) +++ trunk/tests/language-behaviour/strings/103-quote.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,12 @@ +type messagefile; + +(messagefile t) greeting() { + app { + echo "\"" stdout=@filename(t); + } +} + +messagefile outfile <"103-quote.out">; + +outfile = greeting(); + Copied: trunk/tests/language-behaviour/strings/1031-quote.swift (from rev 4602, trunk/tests/language-behaviour/1031-quote.swift) =================================================================== --- trunk/tests/language-behaviour/strings/1031-quote.swift (rev 0) +++ trunk/tests/language-behaviour/strings/1031-quote.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,12 @@ +type messagefile; + +(messagefile t) greeting() { + app { + echo "testing \"quotes\" in swift" stdout=@filename(t); + } +} + +messagefile outfile <"1031-quote.out">; + +outfile = greeting(); + Copied: trunk/tests/language-behaviour/strings/1032-singlequote.out.expected (from rev 4602, trunk/tests/language-behaviour/1032-singlequote.out.expected) =================================================================== --- trunk/tests/language-behaviour/strings/1032-singlequote.out.expected (rev 0) +++ trunk/tests/language-behaviour/strings/1032-singlequote.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +testing 'quotes' in swift Copied: trunk/tests/language-behaviour/strings/1032-singlequote.swift (from rev 4602, trunk/tests/language-behaviour/1032-singlequote.swift) =================================================================== --- trunk/tests/language-behaviour/strings/1032-singlequote.swift (rev 0) +++ trunk/tests/language-behaviour/strings/1032-singlequote.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,12 @@ +type messagefile; + +(messagefile t) greeting() { + app { + echo "testing 'quotes' in swift" stdout=@filename(t); + } +} + +messagefile outfile <"1032-singlequote.out">; + +outfile = greeting(); + Copied: trunk/tests/language-behaviour/strings/1033-singlequote.out.expected (from rev 4602, trunk/tests/language-behaviour/1033-singlequote.out.expected) =================================================================== --- trunk/tests/language-behaviour/strings/1033-singlequote.out.expected (rev 0) +++ trunk/tests/language-behaviour/strings/1033-singlequote.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +' Copied: trunk/tests/language-behaviour/strings/1033-singlequote.swift (from rev 4602, trunk/tests/language-behaviour/1033-singlequote.swift) =================================================================== --- trunk/tests/language-behaviour/strings/1033-singlequote.swift (rev 0) +++ trunk/tests/language-behaviour/strings/1033-singlequote.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,12 @@ +type messagefile; + +(messagefile t) greeting() { + app { + echo "'" stdout=@filename(t); + } +} + +messagefile outfile <"1033-singlequote.out">; + +outfile = greeting(); + Copied: trunk/tests/language-behaviour/strings/141-space-in-filename.space here.out.expected (from rev 4602, trunk/tests/language-behaviour/141-space-in-filename.space here.out.expected) =================================================================== --- trunk/tests/language-behaviour/strings/141-space-in-filename.space here.out.expected (rev 0) +++ trunk/tests/language-behaviour/strings/141-space-in-filename.space here.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +hello Copied: trunk/tests/language-behaviour/strings/141-space-in-filename.swift (from rev 4602, trunk/tests/language-behaviour/141-space-in-filename.swift) =================================================================== --- trunk/tests/language-behaviour/strings/141-space-in-filename.swift (rev 0) +++ trunk/tests/language-behaviour/strings/141-space-in-filename.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,12 @@ +type messagefile; + +(messagefile t) greeting() { + app { + echo "hello" stdout=@filename(t); + } +} + +messagefile outfile <"141-space-in-filename.space here.out">; + +outfile = greeting(); + Added: trunk/tests/language-behaviour/strings/142-space-and-quotes. space .out.expected =================================================================== Copied: trunk/tests/language-behaviour/strings/142-space-and-quotes.1.out.expected (from rev 4602, trunk/tests/language-behaviour/142-space-and-quotes.1.out.expected) =================================================================== Added: trunk/tests/language-behaviour/strings/142-space-and-quotes.2" space ".out.expected =================================================================== Copied: trunk/tests/language-behaviour/strings/142-space-and-quotes.2.out.expected (from rev 4602, trunk/tests/language-behaviour/142-space-and-quotes.2.out.expected) =================================================================== Added: trunk/tests/language-behaviour/strings/142-space-and-quotes.3' space '.out.expected =================================================================== Copied: trunk/tests/language-behaviour/strings/142-space-and-quotes.3.out.expected (from rev 4602, trunk/tests/language-behaviour/142-space-and-quotes.3.out.expected) =================================================================== Copied: trunk/tests/language-behaviour/strings/142-space-and-quotes.out.expected (from rev 4602, trunk/tests/language-behaviour/142-space-and-quotes.out.expected) =================================================================== Copied: trunk/tests/language-behaviour/strings/142-space-and-quotes.swift (from rev 4602, trunk/tests/language-behaviour/142-space-and-quotes.swift) =================================================================== --- trunk/tests/language-behaviour/strings/142-space-and-quotes.swift (rev 0) +++ trunk/tests/language-behaviour/strings/142-space-and-quotes.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,24 @@ + +// this checks how spaces and quotes get passed through to underlying +// executables + +type messagefile; + +(messagefile t) p() { + app { + touch @filename(t); + } +} + +messagefile outfile <"142-space-and-quotes.out">; +outfile = p(); + +messagefile outfileB <"142-space-and-quotes. space .out">; +outfileB = p(); + +messagefile outfileC <"142-space-and-quotes.2\" space \".out">; +outfileC = p(); + +messagefile outfileD <"142-space-and-quotes.3' space '.out">; +outfileD = p(); + Added: trunk/tests/language-behaviour/strings/1421-space-and-quotes.''' ' ''' '' '''''' ' """"""""" ' ' ' """' "'".out.expected =================================================================== Copied: trunk/tests/language-behaviour/strings/1421-space-and-quotes.1.out.expected (from rev 4602, trunk/tests/language-behaviour/1421-space-and-quotes.1.out.expected) =================================================================== Added: trunk/tests/language-behaviour/strings/1421-space-and-quotes.2 sp"ace .out.expected =================================================================== Added: trunk/tests/language-behaviour/strings/1421-space-and-quotes.2" space .out.expected =================================================================== Added: trunk/tests/language-behaviour/strings/1421-space-and-quotes.2' sp"ac"e .out.expected =================================================================== Copied: trunk/tests/language-behaviour/strings/1421-space-and-quotes.2.out.expected (from rev 4602, trunk/tests/language-behaviour/1421-space-and-quotes.2.out.expected) =================================================================== Added: trunk/tests/language-behaviour/strings/1421-space-and-quotes.3 sp'ace .out.expected =================================================================== Added: trunk/tests/language-behaviour/strings/1421-space-and-quotes.3' sp'ac'e .out.expected =================================================================== Added: trunk/tests/language-behaviour/strings/1421-space-and-quotes.3' space .out.expected =================================================================== Copied: trunk/tests/language-behaviour/strings/1421-space-and-quotes.3.out.expected (from rev 4602, trunk/tests/language-behaviour/1421-space-and-quotes.3.out.expected) =================================================================== Copied: trunk/tests/language-behaviour/strings/1421-space-and-quotes.4.out.expected (from rev 4602, trunk/tests/language-behaviour/1421-space-and-quotes.4.out.expected) =================================================================== Copied: trunk/tests/language-behaviour/strings/1421-space-and-quotes.5.out.expected (from rev 4602, trunk/tests/language-behaviour/1421-space-and-quotes.5.out.expected) =================================================================== Copied: trunk/tests/language-behaviour/strings/1421-space-and-quotes.6.out.expected (from rev 4602, trunk/tests/language-behaviour/1421-space-and-quotes.6.out.expected) =================================================================== Copied: trunk/tests/language-behaviour/strings/1421-space-and-quotes.7.out.expected (from rev 4602, trunk/tests/language-behaviour/1421-space-and-quotes.7.out.expected) =================================================================== Copied: trunk/tests/language-behaviour/strings/1421-space-and-quotes.swift (from rev 4602, trunk/tests/language-behaviour/1421-space-and-quotes.swift) =================================================================== --- trunk/tests/language-behaviour/strings/1421-space-and-quotes.swift (rev 0) +++ trunk/tests/language-behaviour/strings/1421-space-and-quotes.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,32 @@ + +// this checks how spaces and quotes get passed through to underlying +// executables + +type messagefile; + +(messagefile t) p() { + app { + touch @filename(t); + } +} + +messagefile outfileC <"1421-space-and-quotes.2\" space .out">; +outfileC = p(); + +messagefile outfileD <"1421-space-and-quotes.3' space .out">; +outfileD = p(); + +messagefile outfileE <"1421-space-and-quotes.2 sp\"ace .out">; +outfileE = p(); + +messagefile outfileF <"1421-space-and-quotes.3 sp'ace .out">; +outfileF = p(); + +messagefile outfileG <"1421-space-and-quotes.2' sp\"ac\"e .out">; +outfileG = p(); + +messagefile outfileH <"1421-space-and-quotes.3' sp'ac'e .out">; +outfileH = p(); + +messagefile outfileI <"1421-space-and-quotes.''' ' ''' '' '''''' ' \"\"\"\"\"\"\"\"\" ' ' ' \"\"\"' \"'\".out">; +outfileI = p(); Copied: trunk/tests/language-behaviour/strings/143-newlines.out.expected (from rev 4602, trunk/tests/language-behaviour/143-newlines.out.expected) =================================================================== --- trunk/tests/language-behaviour/strings/143-newlines.out.expected (rev 0) +++ trunk/tests/language-behaviour/strings/143-newlines.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +hello world Copied: trunk/tests/language-behaviour/strings/143-newlines.swift (from rev 4602, trunk/tests/language-behaviour/143-newlines.swift) =================================================================== --- trunk/tests/language-behaviour/strings/143-newlines.swift (rev 0) +++ trunk/tests/language-behaviour/strings/143-newlines.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,13 @@ +type messagefile; + +(messagefile t) greeting() { + app { + echo "hello" + "world" stdout=@filename(t); + } +} + +messagefile outfile <"143-newlines.out">; + +outfile = greeting(); + Copied: trunk/tests/language-behaviour/strings/145-url.out.expected (from rev 4602, trunk/tests/language-behaviour/145-url.out.expected) =================================================================== --- trunk/tests/language-behaviour/strings/145-url.out.expected (rev 0) +++ trunk/tests/language-behaviour/strings/145-url.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +hello Copied: trunk/tests/language-behaviour/strings/145-url.swift (from rev 4602, trunk/tests/language-behaviour/145-url.swift) =================================================================== --- trunk/tests/language-behaviour/strings/145-url.swift (rev 0) +++ trunk/tests/language-behaviour/strings/145-url.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,12 @@ +type messagefile; + +(messagefile t) greeting() { + app { + echo "hello" stdout=@filename(t); + } +} + +messagefile outfile <"file://localhost/145-url.out">; + +outfile = greeting(); + Copied: trunk/tests/language-behaviour/strings/161-star-dot.out.expected (from rev 4602, trunk/tests/language-behaviour/161-star-dot.out.expected) =================================================================== --- trunk/tests/language-behaviour/strings/161-star-dot.out.expected (rev 0) +++ trunk/tests/language-behaviour/strings/161-star-dot.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +two-C Copied: trunk/tests/language-behaviour/strings/161-star-dot.swift (from rev 4602, trunk/tests/language-behaviour/161-star-dot.swift) =================================================================== --- trunk/tests/language-behaviour/strings/161-star-dot.swift (rev 0) +++ trunk/tests/language-behaviour/strings/161-star-dot.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,36 @@ +type messagefile; + +(messagefile t) greeting(string s) { + app { + echo s stdout=@filename(t); + } +} + +messagefile outfile <"161-star-dot.out">; + +type astruct { + string a; + string b; + string c; +}; + +astruct foo[]; + +foo[0].a = "zero-A"; +foo[0].b = "zero-B"; +foo[0].c = "zero-C"; + +foo[1].a = "one-A"; +foo[1].b = "one-B"; +foo[1].c = "one-C"; + +foo[2].a = "two-A"; +foo[2].b = "two-B"; +foo[2].c = "two-C"; + +string s[] = foo[*].c; + +string u = s[2]; + +outfile = greeting(u); + Deleted: trunk/tests/language-behaviour/testimport.swift =================================================================== --- trunk/tests/language-behaviour/testimport.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/testimport.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,4 +0,0 @@ -import "testimport2"; - -type file; - Deleted: trunk/tests/language-behaviour/testimport2.swift =================================================================== --- trunk/tests/language-behaviour/testimport2.swift 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/testimport2.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -1,4 +0,0 @@ -import "testimport"; - -type F; - Modified: trunk/tests/language-behaviour/title.txt =================================================================== --- trunk/tests/language-behaviour/title.txt 2011-06-16 18:03:24 UTC (rev 4623) +++ trunk/tests/language-behaviour/title.txt 2011-06-16 19:15:58 UTC (rev 4624) @@ -1 +1 @@ -Language-Behaviour Tests +Language-Behavior Tests Copied: trunk/tests/language-behaviour/variables/084-declare-many-at-once.swift (from rev 4602, trunk/tests/language-behaviour/084-declare-many-at-once.swift) =================================================================== --- trunk/tests/language-behaviour/variables/084-declare-many-at-once.swift (rev 0) +++ trunk/tests/language-behaviour/variables/084-declare-many-at-once.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,19 @@ +type messagefile {} + +(messagefile t) greeting() { + app { + echo "hello" stdout=@filename(t); + } +} + +messagefile outfile = greeting(); + +messagefile o2 = greeting(), o4 = greeting(), o5, o6[], o7=greeting(); + +o6[0] = greeting(); +o6[1] = greeting(); +o5 = greeting(); +o6[2] = greeting(); + +// can't check the output in present framework because don't know +// what filename got chosen for outfile... Copied: trunk/tests/language-behaviour/variables/120-local-vars.out.expected (from rev 4602, trunk/tests/language-behaviour/120-local-vars.out.expected) =================================================================== --- trunk/tests/language-behaviour/variables/120-local-vars.out.expected (rev 0) +++ trunk/tests/language-behaviour/variables/120-local-vars.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +hi Copied: trunk/tests/language-behaviour/variables/120-local-vars.swift (from rev 4602, trunk/tests/language-behaviour/120-local-vars.swift) =================================================================== --- trunk/tests/language-behaviour/variables/120-local-vars.swift (rev 0) +++ trunk/tests/language-behaviour/variables/120-local-vars.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,17 @@ +type messagefile; + +(messagefile t) metagreeting(string m) { +string l = m; +t=greeting(l); +} + +(messagefile t) greeting(string m) { + app { + echo m stdout=@filename(t); + } +} + +messagefile outfile <"120-local-vars.out">; + +outfile = greeting("hi"); + Copied: trunk/tests/language-behaviour/variables/121-multi-return-vars.first.out.expected (from rev 4602, trunk/tests/language-behaviour/121-multi-return-vars.first.out.expected) =================================================================== --- trunk/tests/language-behaviour/variables/121-multi-return-vars.first.out.expected (rev 0) +++ trunk/tests/language-behaviour/variables/121-multi-return-vars.first.out.expected 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1 @@ +hi Copied: trunk/tests/language-behaviour/variables/121-multi-return-vars.second.out.expected (from rev 4602, trunk/tests/language-behaviour/121-multi-return-vars.second.out.expected) =================================================================== Copied: trunk/tests/language-behaviour/variables/121-multi-return-vars.swift (from rev 4602, trunk/tests/language-behaviour/121-multi-return-vars.swift) =================================================================== --- trunk/tests/language-behaviour/variables/121-multi-return-vars.swift (rev 0) +++ trunk/tests/language-behaviour/variables/121-multi-return-vars.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,13 @@ +type messagefile; + +(messagefile a, messagefile b) greeting(string m) { + app { + echo m stdout=@filename(a) stderr=@filename(b); + } +} + +messagefile firstfile <"121-multi-return-vars.first.out">; +messagefile secondfile <"121-multi-return-vars.second.out">; + +(firstfile, secondfile) = greeting("hi"); + Copied: trunk/tests/language-behaviour/variables/122-multi-return-vars.swift (from rev 4602, trunk/tests/language-behaviour/122-multi-return-vars.swift) =================================================================== --- trunk/tests/language-behaviour/variables/122-multi-return-vars.swift (rev 0) +++ trunk/tests/language-behaviour/variables/122-multi-return-vars.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,10 @@ +type messagefile; + +(messagefile a, messagefile b) greeting(string m) { + app { + echo m stdout=@filename(a) stderr=@filename(b); + } +} + +(messagefile firstfile, messagefile secondfile) = greeting("hi"); + Copied: trunk/tests/language-behaviour/variables/123-global-vars.swift (from rev 4602, trunk/tests/language-behaviour/123-global-vars.swift) =================================================================== --- trunk/tests/language-behaviour/variables/123-global-vars.swift (rev 0) +++ trunk/tests/language-behaviour/variables/123-global-vars.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,14 @@ +type messagefile; + + +(messagefile t) greeting() { + app { + echo m stdout=@filename(t); + } +} + +global string m = "hello"; +messagefile outfile <"123-global-vars.out">; + +outfile = greeting(); + Copied: trunk/tests/language-behaviour/variables/1232-global-separate-assign.swift (from rev 4602, trunk/tests/language-behaviour/1232-global-separate-assign.swift) =================================================================== --- trunk/tests/language-behaviour/variables/1232-global-separate-assign.swift (rev 0) +++ trunk/tests/language-behaviour/variables/1232-global-separate-assign.swift 2011-06-16 19:15:58 UTC (rev 4624) @@ -0,0 +1,15 @@ +type messagefile; + + +(messagefile t) greeting() { + app { + echo m stdout=@filename(t); + } +} + +global string m; +m = "hi"; +messagefile outfile <"1232-global-separate-assign.aout">; + +outfile = greeting(); + From achavez at ci.uchicago.edu Thu Jun 16 16:30:08 2011 From: achavez at ci.uchicago.edu (achavez at ci.uchicago.edu) Date: Thu, 16 Jun 2011 16:30:08 -0500 (CDT) Subject: [Swift-commit] r4625 - trunk/tests/groups Message-ID: <20110616213008.837869CCA3@svn.ci.uchicago.edu> Author: achavez Date: 2011-06-16 16:30:08 -0500 (Thu, 16 Jun 2011) New Revision: 4625 Modified: trunk/tests/groups/group-all-local.sh Log: Added the newest groups to the script Modified: trunk/tests/groups/group-all-local.sh =================================================================== --- trunk/tests/groups/group-all-local.sh 2011-06-16 19:15:58 UTC (rev 4624) +++ trunk/tests/groups/group-all-local.sh 2011-06-16 21:30:08 UTC (rev 4625) @@ -2,13 +2,23 @@ # GROUPLIST definition to run all local tests GROUPLIST=( $TESTDIR/language-behaviour \ - $TESTDIR/language/working \ - $TESTDIR/local \ - $TESTDIR/language/should-not-work \ - $TESTDIR/cdm \ - $TESTDIR/cdm/ps \ - $TESTDIR/cdm/star - $TESTDIR/cdm/ps/pinned + # $TESTDIR/language/working \ + # $TESTDIR/local \ + # $TESTDIR/language/should-not-work \ + # $TESTDIR/cdm \ + # $TESTDIR/cdm/ps \ + # $TESTDIR/cdm/star + $TESTDIR/language-behaviour/arrays \ + $TESTDIR/language-behaviour/mappers \ + $TESTDIR/language-behaviour/IO \ + $TESTDIR/language-behaviour/iterators \ + $TESTDIR/language-behaviour/logic \ + $TESTDIR/language-behaviour/control_structures \ + $TESTDIR/language-behaviour/procedures \ + $TESTDIR/language-behaviour/arithmetic \ + $TESTDIR/language-behaviour/strings \ + $TESTDIR/documentation/ \ + # $TESTDIR/cdm/ps/pinned # $TESTDIR/site/intrepid ) From achavez at ci.uchicago.edu Fri Jun 17 14:52:39 2011 From: achavez at ci.uchicago.edu (achavez at ci.uchicago.edu) Date: Fri, 17 Jun 2011 14:52:39 -0500 (CDT) Subject: [Swift-commit] r4629 - in trunk/tests: . documentation Message-ID: <20110617195239.DCEBB9CCAC@svn.ci.uchicago.edu> Author: achavez Date: 2011-06-17 14:52:39 -0500 (Fri, 17 Jun 2011) New Revision: 4629 Added: trunk/tests/documentation/ trunk/tests/documentation/3-1_hello_world.check.sh trunk/tests/documentation/3-1_hello_world.clean.sh trunk/tests/documentation/3-1_hello_world.swift trunk/tests/documentation/4-1-2_many_parameters.check.sh trunk/tests/documentation/4-1-2_many_parameters.clean.sh trunk/tests/documentation/4-1-2_many_parameters.swift trunk/tests/documentation/4-1_parameter.check.sh trunk/tests/documentation/4-1_parameter.clean.sh trunk/tests/documentation/4-1_parameter.swift trunk/tests/documentation/4-2_adding_another_application.check.sh trunk/tests/documentation/4-2_adding_another_application.clean.sh trunk/tests/documentation/4-2_adding_another_application.swift trunk/tests/documentation/4-4_datatypes.check.sh trunk/tests/documentation/4-4_datatypes.clean.sh trunk/tests/documentation/4-4_datatypes.swift trunk/tests/documentation/4-5_arrays.check.sh trunk/tests/documentation/4-5_arrays.clean.sh trunk/tests/documentation/4-5_arrays.swift trunk/tests/documentation/4-6-2_fixed_array_mapper.check.sh trunk/tests/documentation/4-6-2_fixed_array_mapper.clean.sh trunk/tests/documentation/4-6-2_fixed_array_mapper.swift trunk/tests/documentation/4-7_foreach.check.sh trunk/tests/documentation/4-7_foreach.clean.sh trunk/tests/documentation/4-7_foreach.swift trunk/tests/documentation/4-9_sequential_iteration.check.sh trunk/tests/documentation/4-9_sequential_iteration.clean.sh trunk/tests/documentation/4-9_sequential_iteration.swift trunk/tests/documentation/6-1_named_and_optional_params.check.sh trunk/tests/documentation/6-1_named_and_optional_params.clean.sh trunk/tests/documentation/6-1_named_and_optional_params.swift trunk/tests/documentation/swift.log trunk/tests/documentation/tc.data trunk/tests/documentation/tc.template.data trunk/tests/documentation/title.txt Log: Test group of the documentation Added: trunk/tests/documentation/3-1_hello_world.check.sh =================================================================== --- trunk/tests/documentation/3-1_hello_world.check.sh (rev 0) +++ trunk/tests/documentation/3-1_hello_world.check.sh 2011-06-17 19:52:39 UTC (rev 4629) @@ -0,0 +1,5 @@ +#!/bin/bash +set -x +grep 'Hello, world!' hello.txt || exit 1 + +exit 0 Property changes on: trunk/tests/documentation/3-1_hello_world.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/documentation/3-1_hello_world.clean.sh =================================================================== --- trunk/tests/documentation/3-1_hello_world.clean.sh (rev 0) +++ trunk/tests/documentation/3-1_hello_world.clean.sh 2011-06-17 19:52:39 UTC (rev 4629) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -rf 3-1_hello_world-* 3-1_hello_world.kml 3-1_hello_world.xml hello.txt || exit 1 +exit 0 Property changes on: trunk/tests/documentation/3-1_hello_world.clean.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/documentation/3-1_hello_world.swift =================================================================== --- trunk/tests/documentation/3-1_hello_world.swift (rev 0) +++ trunk/tests/documentation/3-1_hello_world.swift 2011-06-17 19:52:39 UTC (rev 4629) @@ -0,0 +1,8 @@ +type messagefile; + +app (messagefile t) greeting() { + echo "Hello, world!" stdout=@filename(t); +} + +messagefile outfile <"hello.txt">; +outfile = greeting(); Added: trunk/tests/documentation/4-1-2_many_parameters.check.sh =================================================================== --- trunk/tests/documentation/4-1-2_many_parameters.check.sh (rev 0) +++ trunk/tests/documentation/4-1-2_many_parameters.check.sh 2011-06-17 19:52:39 UTC (rev 4629) @@ -0,0 +1,5 @@ +#!/bin/bash +set -x +grep 'hello' english.txt | grep 'bonjour' francais.txt | grep 'konnichiwa' nihongo.txt || exit 1 + +exit 0 Property changes on: trunk/tests/documentation/4-1-2_many_parameters.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/documentation/4-1-2_many_parameters.clean.sh =================================================================== --- trunk/tests/documentation/4-1-2_many_parameters.clean.sh (rev 0) +++ trunk/tests/documentation/4-1-2_many_parameters.clean.sh 2011-06-17 19:52:39 UTC (rev 4629) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -rf 4-1-2_many_parameters-* 4-1-2_many_parameters.kml 4-1-2_many_parameters.xml english.txt francais.txt nihongo.txt|| exit 1 +exit 0 Property changes on: trunk/tests/documentation/4-1-2_many_parameters.clean.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/documentation/4-1-2_many_parameters.swift =================================================================== --- trunk/tests/documentation/4-1-2_many_parameters.swift (rev 0) +++ trunk/tests/documentation/4-1-2_many_parameters.swift 2011-06-17 19:52:39 UTC (rev 4629) @@ -0,0 +1,14 @@ +type messagefile; + +app (messagefile t) greeting (string s) { + echo s stdout=@filename(t); +} + +messagefile english <"english.txt">; +messagefile french <"francais.txt">; +english = greeting("hello"); +french = greeting("bonjour"); + +messagefile japanese <"nihongo.txt">; +japanese = greeting("konnichiwa"); + Added: trunk/tests/documentation/4-1_parameter.check.sh =================================================================== --- trunk/tests/documentation/4-1_parameter.check.sh (rev 0) +++ trunk/tests/documentation/4-1_parameter.check.sh 2011-06-17 19:52:39 UTC (rev 4629) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +grep 'hello world' hello2.txt || exit 1 +exit 0 Property changes on: trunk/tests/documentation/4-1_parameter.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/documentation/4-1_parameter.clean.sh =================================================================== --- trunk/tests/documentation/4-1_parameter.clean.sh (rev 0) +++ trunk/tests/documentation/4-1_parameter.clean.sh 2011-06-17 19:52:39 UTC (rev 4629) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -rf 4-1_parameter-* 4-1_parameter.kml 4-1_parameter.xml hello2.txt || exit 1 +exit 0 Property changes on: trunk/tests/documentation/4-1_parameter.clean.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/documentation/4-1_parameter.swift =================================================================== --- trunk/tests/documentation/4-1_parameter.swift (rev 0) +++ trunk/tests/documentation/4-1_parameter.swift 2011-06-17 19:52:39 UTC (rev 4629) @@ -0,0 +1,9 @@ +type messagefile; + +app (messagefile t) greeting (string s) { + echo s stdout=@filename(t); +} + +messagefile outfile <"hello2.txt">; + +outfile = greeting("hello world"); Added: trunk/tests/documentation/4-2_adding_another_application.check.sh =================================================================== --- trunk/tests/documentation/4-2_adding_another_application.check.sh (rev 0) +++ trunk/tests/documentation/4-2_adding_another_application.check.sh 2011-06-17 19:52:39 UTC (rev 4629) @@ -0,0 +1,5 @@ +#!/bin/bash +set -x +grep 'hello from Swift' hello.txt | grep 'HELLO FROM SWIFT' capitals.txt || exit 1 + +exit 0 Property changes on: trunk/tests/documentation/4-2_adding_another_application.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/documentation/4-2_adding_another_application.clean.sh =================================================================== --- trunk/tests/documentation/4-2_adding_another_application.clean.sh (rev 0) +++ trunk/tests/documentation/4-2_adding_another_application.clean.sh 2011-06-17 19:52:39 UTC (rev 4629) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -rf 4-2_adding_another_application-* 4-2_adding_another_application.kml 4-2_adding_another_application.xml hello.txt capitals.txt|| exit 1 +exit 0 Property changes on: trunk/tests/documentation/4-2_adding_another_application.clean.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/documentation/4-2_adding_another_application.swift =================================================================== --- trunk/tests/documentation/4-2_adding_another_application.swift (rev 0) +++ trunk/tests/documentation/4-2_adding_another_application.swift 2011-06-17 19:52:39 UTC (rev 4629) @@ -0,0 +1,14 @@ +type messagefile; + +app (messagefile t) greeting(string s) { + echo s stdout=@filename(t); +} +app (messagefile o) capitalise(messagefile i) { + tr "[a-z]" "[A-Z]" stdin=@filename(i) stdout=@filename(o); +} + +messagefile hellofile <"hello.txt">; +messagefile final <"capitals.txt">; + +hellofile = greeting("hello from Swift"); +final = capitalise(hellofile); Added: trunk/tests/documentation/4-4_datatypes.check.sh =================================================================== --- trunk/tests/documentation/4-4_datatypes.check.sh (rev 0) +++ trunk/tests/documentation/4-4_datatypes.check.sh 2011-06-17 19:52:39 UTC (rev 4629) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +grep 'Hello. Your name is John and you have eaten 3 pies.' q15.txt || exit 1 +exit 0 Property changes on: trunk/tests/documentation/4-4_datatypes.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/documentation/4-4_datatypes.clean.sh =================================================================== --- trunk/tests/documentation/4-4_datatypes.clean.sh (rev 0) +++ trunk/tests/documentation/4-4_datatypes.clean.sh 2011-06-17 19:52:39 UTC (rev 4629) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -rf 4-4_datatypes-* 4-4_datatypes.kml 4-4_datatypes.xml q15.txt || exit 1 +exit 0 Property changes on: trunk/tests/documentation/4-4_datatypes.clean.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/documentation/4-4_datatypes.swift =================================================================== --- trunk/tests/documentation/4-4_datatypes.swift (rev 0) +++ trunk/tests/documentation/4-4_datatypes.swift 2011-06-17 19:52:39 UTC (rev 4629) @@ -0,0 +1,19 @@ +type messagefile; + +type details { + string name; + int pies; +} + +app (messagefile t) greeting (details d) { + echo "Hello. Your name is" d.name "and you have eaten" d.pies "pies." stdout=@filename(t); +} + +details person; + +person.name = "John"; +person.pies = 3; + +messagefile outfile <"q15.txt">; + +outfile = greeting(person); Added: trunk/tests/documentation/4-5_arrays.check.sh =================================================================== --- trunk/tests/documentation/4-5_arrays.check.sh (rev 0) +++ trunk/tests/documentation/4-5_arrays.check.sh 2011-06-17 19:52:39 UTC (rev 4629) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat q5out.txt|grep 'how are you'|| exit 1 +exit 0 Property changes on: trunk/tests/documentation/4-5_arrays.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/documentation/4-5_arrays.clean.sh =================================================================== --- trunk/tests/documentation/4-5_arrays.clean.sh (rev 0) +++ trunk/tests/documentation/4-5_arrays.clean.sh 2011-06-17 19:52:39 UTC (rev 4629) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -rf 4-5_arrays-* 4-5_arrays.kml 4-5_arrays.xml q5out.txt || exit 1 +exit 0 Property changes on: trunk/tests/documentation/4-5_arrays.clean.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/documentation/4-5_arrays.swift =================================================================== --- trunk/tests/documentation/4-5_arrays.swift (rev 0) +++ trunk/tests/documentation/4-5_arrays.swift 2011-06-17 19:52:39 UTC (rev 4629) @@ -0,0 +1,11 @@ +type messagefile; + +app (messagefile t) greeting (string s[]) { + echo s[0] s[1] s[2] stdout=@filename(t); +} + +messagefile outfile <"q5out.txt">; + +string words[] = ["how","are","you"]; + +outfile = greeting(words); Added: trunk/tests/documentation/4-6-2_fixed_array_mapper.check.sh =================================================================== --- trunk/tests/documentation/4-6-2_fixed_array_mapper.check.sh (rev 0) +++ trunk/tests/documentation/4-6-2_fixed_array_mapper.check.sh 2011-06-17 19:52:39 UTC (rev 4629) @@ -0,0 +1,6 @@ +#!/bin/bash +set -x +cat one.count | grep '3 one.txt' || exit 1 +cat two.count | grep '3 two.txt' || exit 1 +cat three.count | grep '1 three.txt' || exit 1 +exit 0 Property changes on: trunk/tests/documentation/4-6-2_fixed_array_mapper.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/documentation/4-6-2_fixed_array_mapper.clean.sh =================================================================== --- trunk/tests/documentation/4-6-2_fixed_array_mapper.clean.sh (rev 0) +++ trunk/tests/documentation/4-6-2_fixed_array_mapper.clean.sh 2011-06-17 19:52:39 UTC (rev 4629) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -rf 4-6-2_fixed_array_mapper-* 4-6-2_fixed_array_mapper.kml 4-6-2_fixed_array_mapper.xml one.count two.count three.count || exit 1 +exit 0 Property changes on: trunk/tests/documentation/4-6-2_fixed_array_mapper.clean.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/documentation/4-6-2_fixed_array_mapper.swift =================================================================== --- trunk/tests/documentation/4-6-2_fixed_array_mapper.swift (rev 0) +++ trunk/tests/documentation/4-6-2_fixed_array_mapper.swift 2011-06-17 19:52:39 UTC (rev 4629) @@ -0,0 +1,16 @@ +type messagefile {} +type countfile {} + +app (countfile t) countwords (messagefile f) { + wc "-w" @filename(f) stdout=@filename(t); +} + +string inputNames = "one.txt two.txt three.txt"; +string outputNames = "one.count two.count three.count"; + +messagefile inputfiles[] ; +countfile outputfiles[] ; + +outputfiles[0] = countwords(inputfiles[0]); +outputfiles[1] = countwords(inputfiles[1]); +outputfiles[2] = countwords(inputfiles[2]); Property changes on: trunk/tests/documentation/4-7_foreach.check.sh ___________________________________________________________________ Added: svn:executable + * Property changes on: trunk/tests/documentation/4-7_foreach.clean.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/documentation/4-7_foreach.swift =================================================================== --- trunk/tests/documentation/4-7_foreach.swift (rev 0) +++ trunk/tests/documentation/4-7_foreach.swift 2011-06-17 19:52:39 UTC (rev 4629) @@ -0,0 +1,18 @@ +type messagefile {} +type countfile {} + +app (countfile t) countwords (messagefile f) { + wc "-w" @filename(f) stdout=@filename(t); +} + +string inputNames = "one.txt two.txt three.txt"; + +messagefile inputfiles[] ; + +foreach f in inputfiles { + countfile c; + c = countwords(f); +} Property changes on: trunk/tests/documentation/4-9_sequential_iteration.check.sh ___________________________________________________________________ Added: svn:executable + * Property changes on: trunk/tests/documentation/4-9_sequential_iteration.clean.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/documentation/4-9_sequential_iteration.swift =================================================================== --- trunk/tests/documentation/4-9_sequential_iteration.swift (rev 0) +++ trunk/tests/documentation/4-9_sequential_iteration.swift 2011-06-17 19:52:39 UTC (rev 4629) @@ -0,0 +1,18 @@ +type counterfile; + +app (counterfile t) echo(string m) { + echo m stdout=@filename(t); +} + +app (counterfile t) countstep(counterfile i) { + wcl @filename(i) @filename(t); +} + +counterfile a[] ; + +a[0] = echo("793578934574893"); + +iterate v { + a[v+1] = countstep(a[v]); + trace("extract int value ", at extractint(a[v+1])); +} until (@extractint(a[v+1]) <= 1); Property changes on: trunk/tests/documentation/6-1_named_and_optional_params.check.sh ___________________________________________________________________ Added: svn:executable + * Property changes on: trunk/tests/documentation/6-1_named_and_optional_params.clean.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/documentation/6-1_named_and_optional_params.swift =================================================================== --- trunk/tests/documentation/6-1_named_and_optional_params.swift (rev 0) +++ trunk/tests/documentation/6-1_named_and_optional_params.swift 2011-06-17 19:52:39 UTC (rev 4629) @@ -0,0 +1,9 @@ +type messagefile; +app (messagefile t) greeting (string s="hello") { + echo s stdout=@filename(t); +} +messagefile french <"french.txt">; +messagefile english <"english.txt">; + +french = greeting(s="bonjour"); +english = greeting(); Added: trunk/tests/documentation/swift.log =================================================================== --- trunk/tests/documentation/swift.log (rev 0) +++ trunk/tests/documentation/swift.log 2011-06-17 19:52:39 UTC (rev 4629) @@ -0,0 +1,6 @@ +2011-06-17 10:34:26,338-0500 DEBUG Loader Loader started +2011-06-17 10:35:47,746-0500 DEBUG Loader Loader started +2011-06-17 10:47:09,057-0500 DEBUG Loader Loader started +2011-06-17 10:47:30,938-0500 DEBUG Loader Loader started +2011-06-17 10:48:45,486-0500 DEBUG Loader Loader started +2011-06-17 11:12:05,375-0500 DEBUG Loader Loader started Added: trunk/tests/documentation/tc.data =================================================================== --- trunk/tests/documentation/tc.data (rev 0) +++ trunk/tests/documentation/tc.data 2011-06-17 19:52:39 UTC (rev 4629) @@ -0,0 +1,24 @@ +#This is the transformation catalog. +# +#It comes pre-configured with a number of simple transformations with +#paths that are likely to work on a linux box. However, on some systems, +#the paths to these executables will be different (for example, sometimes +#some of these programs are found in /usr/bin rather than in /bin) +# +#NOTE WELL: fields in this file must be separated by tabs, not spaces; and +#there must be no trailing whitespace at the end of each line. +# +# sitename transformation path INSTALLED platform profiles +localhost echo /bin/echo INSTALLED INTEL32::LINUX null +localhost tr /usr/bin/tr INSTALLED INTEL32::LINUX null +localhost cat /bin/cat INSTALLED INTEL32::LINUX null +localhost ls /bin/ls INSTALLED INTEL32::LINUX null +localhost grep /bin/grep INSTALLED INTEL32::LINUX null +localhost sort /bin/sort INSTALLED INTEL32::LINUX null +localhost paste /bin/paste INSTALLED INTEL32::LINUX null +localhost cp /bin/cp INSTALLED INTEL32::LINUX null +localhost wc /usr/bin/wc INSTALLED INTEL32::LINUX null +localhost touch /bin/touch INSTALLED INTEL32::LINUX null +localhost sleep /bin/sleep INSTALLED INTEL32::LINUX null +localhost delayedcat /home/Alberto/Swift/cog/modules/swift/tests/language-behaviour/delayedcat.sh INSTALLED INTEL32::LINUX null +#localhost wcl /home/Alberto/My\ Shell\ Scripts/wcl.sh INSTALLED INTEL32::LINUX null Added: trunk/tests/documentation/tc.template.data =================================================================== --- trunk/tests/documentation/tc.template.data (rev 0) +++ trunk/tests/documentation/tc.template.data 2011-06-17 19:52:39 UTC (rev 4629) @@ -0,0 +1,24 @@ +#This is the transformation catalog. +# +#It comes pre-configured with a number of simple transformations with +#paths that are likely to work on a linux box. However, on some systems, +#the paths to these executables will be different (for example, sometimes +#some of these programs are found in /usr/bin rather than in /bin) +# +#NOTE WELL: fields in this file must be separated by tabs, not spaces; and +#there must be no trailing whitespace at the end of each line. +# +# sitename transformation path INSTALLED platform profiles +localhost echo /bin/echo INSTALLED INTEL32::LINUX null +localhost tr /usr/bin/tr INSTALLED INTEL32::LINUX null +localhost cat /bin/cat INSTALLED INTEL32::LINUX null +localhost ls /bin/ls INSTALLED INTEL32::LINUX null +localhost grep /bin/grep INSTALLED INTEL32::LINUX null +localhost sort /bin/sort INSTALLED INTEL32::LINUX null +localhost paste /bin/paste INSTALLED INTEL32::LINUX null +localhost cp /bin/cp INSTALLED INTEL32::LINUX null +localhost wc /usr/bin/wc INSTALLED INTEL32::LINUX null +localhost touch /bin/touch INSTALLED INTEL32::LINUX null +localhost sleep /bin/sleep INSTALLED INTEL32::LINUX null +localhost delayedcat /home/Alberto/Swift/cog/modules/swift/tests/language-behaviour/delayedcat.sh INSTALLED INTEL32::LINUX null +localhost wcl /usr/bin/wcl.sh INSTALLED INTEL32::LINUX null Added: trunk/tests/documentation/title.txt =================================================================== --- trunk/tests/documentation/title.txt (rev 0) +++ trunk/tests/documentation/title.txt 2011-06-17 19:52:39 UTC (rev 4629) @@ -0,0 +1 @@ +Documentation Files Test From achavez at ci.uchicago.edu Fri Jun 17 15:23:23 2011 From: achavez at ci.uchicago.edu (achavez at ci.uchicago.edu) Date: Fri, 17 Jun 2011 15:23:23 -0500 (CDT) Subject: [Swift-commit] r4630 - trunk/tests/documentation Message-ID: <20110617202323.DAF559D09E@svn.ci.uchicago.edu> Author: achavez Date: 2011-06-17 15:23:23 -0500 (Fri, 17 Jun 2011) New Revision: 4630 Added: trunk/tests/documentation/4-6-2_fixed_array_mapper.setup.sh trunk/tests/documentation/one.txt trunk/tests/documentation/sites.template.xml trunk/tests/documentation/swift.properties trunk/tests/documentation/three.txt trunk/tests/documentation/two.txt Log: Added Missing Files. Added: trunk/tests/documentation/4-6-2_fixed_array_mapper.setup.sh =================================================================== --- trunk/tests/documentation/4-6-2_fixed_array_mapper.setup.sh (rev 0) +++ trunk/tests/documentation/4-6-2_fixed_array_mapper.setup.sh 2011-06-17 20:23:23 UTC (rev 4630) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cp -v $GROUP/one.txt $GROUP/two.txt $GROUP/three.txt .|| exit 1 +exit 0 Property changes on: trunk/tests/documentation/4-6-2_fixed_array_mapper.setup.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/documentation/one.txt =================================================================== --- trunk/tests/documentation/one.txt (rev 0) +++ trunk/tests/documentation/one.txt 2011-06-17 20:23:23 UTC (rev 4630) @@ -0,0 +1 @@ +this is one.txt Added: trunk/tests/documentation/sites.template.xml =================================================================== --- trunk/tests/documentation/sites.template.xml (rev 0) +++ trunk/tests/documentation/sites.template.xml 2011-06-17 20:23:23 UTC (rev 4630) @@ -0,0 +1,15 @@ + + + + + 127.0.0.1 + 1000 + 10000 + 4 + 8 + 1000 + 1 + 4 + /tmp + + Added: trunk/tests/documentation/swift.properties =================================================================== --- trunk/tests/documentation/swift.properties (rev 0) +++ trunk/tests/documentation/swift.properties 2011-06-17 20:23:23 UTC (rev 4630) @@ -0,0 +1,7 @@ +wrapperlog.always.transfer=true +sitedir.keep=true +execution.retries=0 +lazy.errors=false +status.mode=provider +use.provider.staging=false +provider.staging.pin.swiftfiles=false Added: trunk/tests/documentation/three.txt =================================================================== --- trunk/tests/documentation/three.txt (rev 0) +++ trunk/tests/documentation/three.txt 2011-06-17 20:23:23 UTC (rev 4630) @@ -0,0 +1 @@ +three Added: trunk/tests/documentation/two.txt =================================================================== --- trunk/tests/documentation/two.txt (rev 0) +++ trunk/tests/documentation/two.txt 2011-06-17 20:23:23 UTC (rev 4630) @@ -0,0 +1 @@ +a second file From achavez at ci.uchicago.edu Fri Jun 17 18:34:08 2011 From: achavez at ci.uchicago.edu (achavez at ci.uchicago.edu) Date: Fri, 17 Jun 2011 18:34:08 -0500 (CDT) Subject: [Swift-commit] r4632 - trunk/tests/documentation Message-ID: <20110617233408.726B39CCAC@svn.ci.uchicago.edu> Author: achavez Date: 2011-06-17 18:34:08 -0500 (Fri, 17 Jun 2011) New Revision: 4632 Modified: trunk/tests/documentation/4-7_foreach.check.sh trunk/tests/documentation/4-7_foreach.clean.sh trunk/tests/documentation/4-9_sequential_iteration.clean.sh trunk/tests/documentation/6-1_named_and_optional_params.check.sh trunk/tests/documentation/6-1_named_and_optional_params.clean.sh Log: Enhanced Check, and Clean Shell Scripts, for all the tests. Modified: trunk/tests/documentation/4-7_foreach.check.sh =================================================================== --- trunk/tests/documentation/4-7_foreach.check.sh 2011-06-17 21:27:14 UTC (rev 4631) +++ trunk/tests/documentation/4-7_foreach.check.sh 2011-06-17 23:34:08 UTC (rev 4632) @@ -0,0 +1,6 @@ +#!/bin/bash +set -x +cat one.count | grep '3 one.txt' || exit 1 +cat two.count | grep '3 two.txt' || exit 1 +cat three.count | grep '1 three.txt' || exit 1 +exit 0 Modified: trunk/tests/documentation/4-7_foreach.clean.sh =================================================================== --- trunk/tests/documentation/4-7_foreach.clean.sh 2011-06-17 21:27:14 UTC (rev 4631) +++ trunk/tests/documentation/4-7_foreach.clean.sh 2011-06-17 23:34:08 UTC (rev 4632) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -rf 4-7_foreach-* 4-7_foreach.kml 4-7_foreach.xml one.txt two.txt three.txt || exit 1 +exit 0 Modified: trunk/tests/documentation/4-9_sequential_iteration.clean.sh =================================================================== --- trunk/tests/documentation/4-9_sequential_iteration.clean.sh 2011-06-17 21:27:14 UTC (rev 4631) +++ trunk/tests/documentation/4-9_sequential_iteration.clean.sh 2011-06-17 23:34:08 UTC (rev 4632) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -rf 4-9_sequential_iteration-* 4-9_sequential_iteration.kml 4-9_sequential_iteration.xml foldout* || exit 1 +exit 0 Modified: trunk/tests/documentation/6-1_named_and_optional_params.check.sh =================================================================== --- trunk/tests/documentation/6-1_named_and_optional_params.check.sh 2011-06-17 21:27:14 UTC (rev 4631) +++ trunk/tests/documentation/6-1_named_and_optional_params.check.sh 2011-06-17 23:34:08 UTC (rev 4632) @@ -0,0 +1,5 @@ +#!/bin/bash +set -x +grep 'hello' english.txt | grep 'bonjour' french.txt || exit 1 + +exit 0 Modified: trunk/tests/documentation/6-1_named_and_optional_params.clean.sh =================================================================== --- trunk/tests/documentation/6-1_named_and_optional_params.clean.sh 2011-06-17 21:27:14 UTC (rev 4631) +++ trunk/tests/documentation/6-1_named_and_optional_params.clean.sh 2011-06-17 23:34:08 UTC (rev 4632) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -rf 6-1_named_and_optional_params-* 6-1_named_and_optional_params.kml 6-1_named_and_optional_params.xml english.txt francais.txt|| exit 1 +exit 0 From achavez at ci.uchicago.edu Wed Jun 22 09:58:34 2011 From: achavez at ci.uchicago.edu (achavez at ci.uchicago.edu) Date: Wed, 22 Jun 2011 09:58:34 -0500 (CDT) Subject: [Swift-commit] r4652 - in trunk/tests/language-behaviour: . arrays mappers math Message-ID: <20110622145834.B56849CFEC@svn.ci.uchicago.edu> Author: achavez Date: 2011-06-22 09:58:34 -0500 (Wed, 22 Jun 2011) New Revision: 4652 Added: trunk/tests/language-behaviour/arrays/020-array.check.sh trunk/tests/language-behaviour/arrays/020-array.clean.sh trunk/tests/language-behaviour/arrays/021-array-in-proc-param.check.sh trunk/tests/language-behaviour/arrays/021-array-in-proc-param.clean.sh trunk/tests/language-behaviour/arrays/022-array-with-exprs.check.sh trunk/tests/language-behaviour/arrays/022-array-with-exprs.clean.sh trunk/tests/language-behaviour/arrays/025-array-passing.check.sh trunk/tests/language-behaviour/arrays/025-array-passing.clean.sh trunk/tests/language-behaviour/arrays/027-array-assignment.check.sh trunk/tests/language-behaviour/arrays/027-array-assignment.clean.sh trunk/tests/language-behaviour/arrays/028-array-assignment.check.sh trunk/tests/language-behaviour/arrays/028-array-assignment.clean.sh trunk/tests/language-behaviour/arrays/029-array-assignment-sequence.clean.sh trunk/tests/language-behaviour/arrays/111-array-individual-assigns.check.sh trunk/tests/language-behaviour/arrays/111-array-individual-assigns.clean.sh trunk/tests/language-behaviour/arrays/162-dot-on-array.check.sh trunk/tests/language-behaviour/arrays/162-dot-on-array.clean.sh trunk/tests/language-behaviour/arrays/array_multidimensional_index.check.sh trunk/tests/language-behaviour/arrays/array_multidimensional_index.clean.sh trunk/tests/language-behaviour/math/ trunk/tests/language-behaviour/math/006-add.check.sh trunk/tests/language-behaviour/math/006-add.clean.sh trunk/tests/language-behaviour/math/007-add-in-proc-add.check.sh trunk/tests/language-behaviour/math/007-add-in-proc-add.clean.sh trunk/tests/language-behaviour/math/008-add-multiply.check.sh trunk/tests/language-behaviour/math/008-add-multiply.clean.sh trunk/tests/language-behaviour/math/009-multiply.check.sh trunk/tests/language-behaviour/math/009-multiply.clean.sh trunk/tests/language-behaviour/math/010-divide.check.sh trunk/tests/language-behaviour/math/010-divide.clean.sh trunk/tests/language-behaviour/math/011-divide-float.check.sh trunk/tests/language-behaviour/math/011-divide-float.clean.sh trunk/tests/language-behaviour/math/013-mod.check.sh trunk/tests/language-behaviour/math/013-mod.clean.sh trunk/tests/language-behaviour/math/014-subtract.check.sh trunk/tests/language-behaviour/math/014-subtract.clean.sh trunk/tests/language-behaviour/math/0145-unary-subtact.check.sh trunk/tests/language-behaviour/math/0145-unary-subtact.clean.sh trunk/tests/language-behaviour/math/015-lesseq.check.sh trunk/tests/language-behaviour/math/015-lesseq.clean.sh trunk/tests/language-behaviour/math/016-greatereq.check.sh trunk/tests/language-behaviour/math/016-greatereq.clean.sh trunk/tests/language-behaviour/math/017-greater.check.sh trunk/tests/language-behaviour/math/017-greater.clean.sh trunk/tests/language-behaviour/math/018-less.check.sh trunk/tests/language-behaviour/math/018-less.clean.sh trunk/tests/language-behaviour/math/019-equals.check.sh trunk/tests/language-behaviour/math/019-equals.clean.sh trunk/tests/language-behaviour/math/0191-not-equals.check.sh trunk/tests/language-behaviour/math/0191-not-equals.clean.sh trunk/tests/language-behaviour/math/030-mix-float-int.check.sh trunk/tests/language-behaviour/math/030-mix-float-int.clean.sh trunk/tests/language-behaviour/math/031-add-float.check.sh trunk/tests/language-behaviour/math/031-add-float.clean.sh Removed: trunk/tests/language-behaviour/arithmetic/ trunk/tests/language-behaviour/arrays/022-array-with-exprs.out.expected trunk/tests/language-behaviour/arrays/111-array-individual-assigns.out.expected trunk/tests/language-behaviour/arrays/162-dot-on-array.out.expected trunk/tests/language-behaviour/arrays/array_multidimensional_index.out.expected trunk/tests/language-behaviour/math/006-add.out.expected trunk/tests/language-behaviour/math/007-add-in-proc-add.out.expected trunk/tests/language-behaviour/math/008-add-multiply.out.expected trunk/tests/language-behaviour/math/009-multiply.out.expected trunk/tests/language-behaviour/math/010-divide.out.expected trunk/tests/language-behaviour/math/011-divide-float.out.expected trunk/tests/language-behaviour/math/013-mod.out.expected trunk/tests/language-behaviour/math/014-subtract.out.expected trunk/tests/language-behaviour/math/0145-unary-subtact.out.expected trunk/tests/language-behaviour/math/015-lesseq.out.expected trunk/tests/language-behaviour/math/016-greatereq.out.expected trunk/tests/language-behaviour/math/017-greater.out.expected trunk/tests/language-behaviour/math/018-less.out.expected trunk/tests/language-behaviour/math/019-equals.out.expected trunk/tests/language-behaviour/math/0191-not-equals.out.expected trunk/tests/language-behaviour/math/030-mix-float-int.out.expected trunk/tests/language-behaviour/math/031-add-float.out.expected Modified: trunk/tests/language-behaviour/arrays/020-array.swift trunk/tests/language-behaviour/arrays/022-array-with-exprs.swift trunk/tests/language-behaviour/arrays/025-array-passing.swift trunk/tests/language-behaviour/arrays/027-array-assignment.swift trunk/tests/language-behaviour/arrays/028-array-assignment.swift trunk/tests/language-behaviour/arrays/029-array-assignment-sequence.swift trunk/tests/language-behaviour/arrays/083-array-assign.swift trunk/tests/language-behaviour/arrays/111-array-individual-assigns.swift trunk/tests/language-behaviour/arrays/162-dot-on-array.swift trunk/tests/language-behaviour/arrays/array_multidimensional-2.swift trunk/tests/language-behaviour/arrays/array_multidimensional_assign.swift trunk/tests/language-behaviour/arrays/array_multidimensional_index.swift trunk/tests/language-behaviour/mappers/0032-strcat-mapper-param.1.out.expected trunk/tests/language-behaviour/mappers/0032-strcat-mapper-param.swift trunk/tests/language-behaviour/mappers/070-singlefilemapper.out.expected trunk/tests/language-behaviour/mappers/070-singlefilemapper.swift trunk/tests/language-behaviour/mappers/071-singlefilemapper-input.check.sh trunk/tests/language-behaviour/mappers/071-singlefilemapper-input.clean.sh trunk/tests/language-behaviour/mappers/07511-fixed-array-mapper-input.check.sh trunk/tests/language-behaviour/mappers/07511-fixed-array-mapper-input.clean.sh trunk/tests/language-behaviour/math/007-add-in-proc-add.swift trunk/tests/language-behaviour/math/008-add-multiply.swift trunk/tests/language-behaviour/math/009-multiply.swift trunk/tests/language-behaviour/math/011-divide-float.swift trunk/tests/language-behaviour/math/013-mod.swift trunk/tests/language-behaviour/math/014-subtract.swift trunk/tests/language-behaviour/math/0145-unary-subtact.swift trunk/tests/language-behaviour/math/015-lesseq.swift trunk/tests/language-behaviour/math/016-greatereq.swift trunk/tests/language-behaviour/math/017-greater.swift trunk/tests/language-behaviour/math/018-less.swift trunk/tests/language-behaviour/math/019-equals.swift trunk/tests/language-behaviour/math/0191-not-equals.swift trunk/tests/language-behaviour/math/030-mix-float-int.swift trunk/tests/language-behaviour/math/031-add-float.swift Log: Name of subgroup changed and shortened, clean and check shell scripts added Added: trunk/tests/language-behaviour/arrays/020-array.check.sh =================================================================== --- trunk/tests/language-behaviour/arrays/020-array.check.sh (rev 0) +++ trunk/tests/language-behaviour/arrays/020-array.check.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat 020-array.out | grep 4 || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/arrays/020-array.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/arrays/020-array.clean.sh =================================================================== --- trunk/tests/language-behaviour/arrays/020-array.clean.sh (rev 0) +++ trunk/tests/language-behaviour/arrays/020-array.clean.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 020-array-* 020-array.xml 020-array.kml 020-array.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/arrays/020-array.clean.sh ___________________________________________________________________ Added: svn:executable + * Modified: trunk/tests/language-behaviour/arrays/020-array.swift =================================================================== --- trunk/tests/language-behaviour/arrays/020-array.swift 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/arrays/020-array.swift 2011-06-22 14:58:34 UTC (rev 4652) @@ -1,9 +1,7 @@ type messagefile {} -(messagefile t) greeting(int m) { - app { +app (messagefile t) greeting(int m) { echo m stdout=@filename(t); - } } messagefile outfile <"020-array.out">; Added: trunk/tests/language-behaviour/arrays/021-array-in-proc-param.check.sh =================================================================== --- trunk/tests/language-behaviour/arrays/021-array-in-proc-param.check.sh (rev 0) +++ trunk/tests/language-behaviour/arrays/021-array-in-proc-param.check.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat 021-array-in-proc-param.out | grep 1 || exit 0 +exit 0 Property changes on: trunk/tests/language-behaviour/arrays/021-array-in-proc-param.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/arrays/021-array-in-proc-param.clean.sh =================================================================== --- trunk/tests/language-behaviour/arrays/021-array-in-proc-param.clean.sh (rev 0) +++ trunk/tests/language-behaviour/arrays/021-array-in-proc-param.clean.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 021-array-in-proc-param.out 021-array-in-proc-param-* 021-array-in-proc-param.kml 021-array-in-proc-param.xml || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/arrays/021-array-in-proc-param.clean.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/arrays/022-array-with-exprs.check.sh =================================================================== --- trunk/tests/language-behaviour/arrays/022-array-with-exprs.check.sh (rev 0) +++ trunk/tests/language-behaviour/arrays/022-array-with-exprs.check.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat 022-array-with-exprs.out | grep 22 || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/arrays/022-array-with-exprs.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/arrays/022-array-with-exprs.clean.sh =================================================================== --- trunk/tests/language-behaviour/arrays/022-array-with-exprs.clean.sh (rev 0) +++ trunk/tests/language-behaviour/arrays/022-array-with-exprs.clean.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 022-array-with-exprs-* 022-array-with-exprs.kml 022-array-with-exprs.xml 022-array-with-exprs.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/arrays/022-array-with-exprs.clean.sh ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/tests/language-behaviour/arrays/022-array-with-exprs.out.expected =================================================================== --- trunk/tests/language-behaviour/arrays/022-array-with-exprs.out.expected 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/arrays/022-array-with-exprs.out.expected 2011-06-22 14:58:34 UTC (rev 4652) @@ -1 +0,0 @@ -22 Modified: trunk/tests/language-behaviour/arrays/022-array-with-exprs.swift =================================================================== --- trunk/tests/language-behaviour/arrays/022-array-with-exprs.swift 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/arrays/022-array-with-exprs.swift 2011-06-22 14:58:34 UTC (rev 4652) @@ -1,9 +1,7 @@ type messagefile {} -(messagefile t) greeting(int m) { - app { +app (messagefile t) greeting(int m) { echo m stdout=@filename(t); - } } messagefile outfile <"022-array-with-exprs.out">; Added: trunk/tests/language-behaviour/arrays/025-array-passing.check.sh =================================================================== --- trunk/tests/language-behaviour/arrays/025-array-passing.check.sh (rev 0) +++ trunk/tests/language-behaviour/arrays/025-array-passing.check.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat 025-array-passing.out | grep two || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/arrays/025-array-passing.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/arrays/025-array-passing.clean.sh =================================================================== --- trunk/tests/language-behaviour/arrays/025-array-passing.clean.sh (rev 0) +++ trunk/tests/language-behaviour/arrays/025-array-passing.clean.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 025-array-passing-* 025-array-passing.kml 025-array-passing.xml 025-array-passing.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/arrays/025-array-passing.clean.sh ___________________________________________________________________ Added: svn:executable + * Modified: trunk/tests/language-behaviour/arrays/025-array-passing.swift =================================================================== --- trunk/tests/language-behaviour/arrays/025-array-passing.swift 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/arrays/025-array-passing.swift 2011-06-22 14:58:34 UTC (rev 4652) @@ -1,9 +1,7 @@ type messagefile {} -(messagefile t) greeting(string m[]) { - app { +app (messagefile t) greeting(string m[]) { echo m[1] stdout=@filename(t); - } } messagefile outfile <"025-array-passing.out">; Added: trunk/tests/language-behaviour/arrays/027-array-assignment.check.sh =================================================================== --- trunk/tests/language-behaviour/arrays/027-array-assignment.check.sh (rev 0) +++ trunk/tests/language-behaviour/arrays/027-array-assignment.check.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat 027-array-assignment.out | grep two || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/arrays/027-array-assignment.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/arrays/027-array-assignment.clean.sh =================================================================== --- trunk/tests/language-behaviour/arrays/027-array-assignment.clean.sh (rev 0) +++ trunk/tests/language-behaviour/arrays/027-array-assignment.clean.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 027-array-assignment.out 027-array-assignment-* 027-array-assignment.kml 027-array-assignment.xml || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/arrays/027-array-assignment.clean.sh ___________________________________________________________________ Added: svn:executable + * Modified: trunk/tests/language-behaviour/arrays/027-array-assignment.swift =================================================================== --- trunk/tests/language-behaviour/arrays/027-array-assignment.swift 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/arrays/027-array-assignment.swift 2011-06-22 14:58:34 UTC (rev 4652) @@ -1,9 +1,7 @@ type messagefile {} -(messagefile t) greeting(string m[]) { - app { +app (messagefile t) greeting(string m[]) { echo m[1] stdout=@filename(t); - } } messagefile outfile <"027-array-assignment.out">; Added: trunk/tests/language-behaviour/arrays/028-array-assignment.check.sh =================================================================== --- trunk/tests/language-behaviour/arrays/028-array-assignment.check.sh (rev 0) +++ trunk/tests/language-behaviour/arrays/028-array-assignment.check.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat 027-array-assignment.out | grep two || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/arrays/028-array-assignment.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/arrays/028-array-assignment.clean.sh =================================================================== --- trunk/tests/language-behaviour/arrays/028-array-assignment.clean.sh (rev 0) +++ trunk/tests/language-behaviour/arrays/028-array-assignment.clean.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,5 @@ +#!/bin/bash +set -x +rm -r 027-array-assignment.out 027-array-assignment-* 027-array-assignment.kml 027-array-assignment.xml || exit 1 +exit 0 + Property changes on: trunk/tests/language-behaviour/arrays/028-array-assignment.clean.sh ___________________________________________________________________ Added: svn:executable + * Modified: trunk/tests/language-behaviour/arrays/028-array-assignment.swift =================================================================== --- trunk/tests/language-behaviour/arrays/028-array-assignment.swift 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/arrays/028-array-assignment.swift 2011-06-22 14:58:34 UTC (rev 4652) @@ -1,9 +1,7 @@ type messagefile {} -(messagefile t) greeting(string m[]) { - app { +app (messagefile t) greeting(string m[]) { echo m[1] stdout=@filename(t); - } } messagefile outfile <"027-array-assignment.out">; Added: trunk/tests/language-behaviour/arrays/029-array-assignment-sequence.clean.sh =================================================================== --- trunk/tests/language-behaviour/arrays/029-array-assignment-sequence.clean.sh (rev 0) +++ trunk/tests/language-behaviour/arrays/029-array-assignment-sequence.clean.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm 029-array-assignment-* 029-array-assignment.kml 029-array-assignment.xml || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/arrays/029-array-assignment-sequence.clean.sh ___________________________________________________________________ Added: svn:executable + * Modified: trunk/tests/language-behaviour/arrays/029-array-assignment-sequence.swift =================================================================== --- trunk/tests/language-behaviour/arrays/029-array-assignment-sequence.swift 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/arrays/029-array-assignment-sequence.swift 2011-06-22 14:58:34 UTC (rev 4652) @@ -7,4 +7,3 @@ e=d; f=e; g=f; - Modified: trunk/tests/language-behaviour/arrays/083-array-assign.swift =================================================================== --- trunk/tests/language-behaviour/arrays/083-array-assign.swift 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/arrays/083-array-assign.swift 2011-06-22 14:58:34 UTC (rev 4652) @@ -1,13 +1,10 @@ type messagefile; -(messagefile t) greeting(string m) { - app { +app (messagefile t) greeting(string m) { echo m stdout=@filename(t); - } } messagefile outfile[]; outfile[0] = greeting("hi"); outfile[1] = greeting("bye"); - Added: trunk/tests/language-behaviour/arrays/111-array-individual-assigns.check.sh =================================================================== --- trunk/tests/language-behaviour/arrays/111-array-individual-assigns.check.sh (rev 0) +++ trunk/tests/language-behaviour/arrays/111-array-individual-assigns.check.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat 111-array-individual-assigns | grep 100 || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/arrays/111-array-individual-assigns.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/arrays/111-array-individual-assigns.clean.sh =================================================================== --- trunk/tests/language-behaviour/arrays/111-array-individual-assigns.clean.sh (rev 0) +++ trunk/tests/language-behaviour/arrays/111-array-individual-assigns.clean.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 111-array-individual-assigns-* 111-array-individual-assigns.*ml 111-array-individual-assigns.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/arrays/111-array-individual-assigns.clean.sh ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/tests/language-behaviour/arrays/111-array-individual-assigns.out.expected =================================================================== --- trunk/tests/language-behaviour/arrays/111-array-individual-assigns.out.expected 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/arrays/111-array-individual-assigns.out.expected 2011-06-22 14:58:34 UTC (rev 4652) @@ -1 +0,0 @@ -100 Modified: trunk/tests/language-behaviour/arrays/111-array-individual-assigns.swift =================================================================== --- trunk/tests/language-behaviour/arrays/111-array-individual-assigns.swift 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/arrays/111-array-individual-assigns.swift 2011-06-22 14:58:34 UTC (rev 4652) @@ -1,4 +1,3 @@ - int i[]; i[0]=1; @@ -7,10 +6,8 @@ type messagefile; -(messagefile t) p(int inp[]) { - app { +app (messagefile t) p(int inp[]) { echo inp[1] stdout=@filename(t); - } } messagefile outfile <"111-array-individual-assigns.out">; Added: trunk/tests/language-behaviour/arrays/162-dot-on-array.check.sh =================================================================== --- trunk/tests/language-behaviour/arrays/162-dot-on-array.check.sh (rev 0) +++ trunk/tests/language-behaviour/arrays/162-dot-on-array.check.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat 162-dot-on-array.out | grep two-C || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/arrays/162-dot-on-array.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/arrays/162-dot-on-array.clean.sh =================================================================== --- trunk/tests/language-behaviour/arrays/162-dot-on-array.clean.sh (rev 0) +++ trunk/tests/language-behaviour/arrays/162-dot-on-array.clean.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 162-dot-on-array-* 162-dot-on-array.*ml 162-dot-on-array.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/arrays/162-dot-on-array.clean.sh ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/tests/language-behaviour/arrays/162-dot-on-array.out.expected =================================================================== --- trunk/tests/language-behaviour/arrays/162-dot-on-array.out.expected 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/arrays/162-dot-on-array.out.expected 2011-06-22 14:58:34 UTC (rev 4652) @@ -1 +0,0 @@ -two-C Modified: trunk/tests/language-behaviour/arrays/162-dot-on-array.swift =================================================================== --- trunk/tests/language-behaviour/arrays/162-dot-on-array.swift 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/arrays/162-dot-on-array.swift 2011-06-22 14:58:34 UTC (rev 4652) @@ -1,9 +1,7 @@ type messagefile; -(messagefile t) greeting(string s) { - app { +app (messagefile t) greeting(string s) { echo s stdout=@filename(t); - } } messagefile outfile <"162-dot-on-array.out">; Modified: trunk/tests/language-behaviour/arrays/array_multidimensional-2.swift =================================================================== --- trunk/tests/language-behaviour/arrays/array_multidimensional-2.swift 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/arrays/array_multidimensional-2.swift 2011-06-22 14:58:34 UTC (rev 4652) @@ -1,9 +1,7 @@ type file; -(file t) echo_array (string s[][]) { - app { +app (file t) echo_array (string s[][]) { echo s[0][0] s[1][0] s[1][1] stdout=@filename(t); - } } string greetings[][]; Modified: trunk/tests/language-behaviour/arrays/array_multidimensional_assign.swift =================================================================== --- trunk/tests/language-behaviour/arrays/array_multidimensional_assign.swift 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/arrays/array_multidimensional_assign.swift 2011-06-22 14:58:34 UTC (rev 4652) @@ -1,9 +1,7 @@ type file {} -(file t) echo_array (string s[][]) { - app { +app (file t) echo_array (string s[][]) { echo s[0][0] s[1][0] s[1][1] stdout=@filename(t); - } } string greetings[][]; Added: trunk/tests/language-behaviour/arrays/array_multidimensional_index.check.sh =================================================================== --- trunk/tests/language-behaviour/arrays/array_multidimensional_index.check.sh (rev 0) +++ trunk/tests/language-behaviour/arrays/array_multidimensional_index.check.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +grep array_multidemnsional_index.out | grep 'left up down' || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/arrays/array_multidimensional_index.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/arrays/array_multidimensional_index.clean.sh =================================================================== --- trunk/tests/language-behaviour/arrays/array_multidimensional_index.clean.sh (rev 0) +++ trunk/tests/language-behaviour/arrays/array_multidimensional_index.clean.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r array_multidimensional_index-* array_multidimensional_index.*ml array_multidimensional_index.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/arrays/array_multidimensional_index.clean.sh ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/tests/language-behaviour/arrays/array_multidimensional_index.out.expected =================================================================== --- trunk/tests/language-behaviour/arrays/array_multidimensional_index.out.expected 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/arrays/array_multidimensional_index.out.expected 2011-06-22 14:58:34 UTC (rev 4652) @@ -1 +0,0 @@ -left up down Modified: trunk/tests/language-behaviour/arrays/array_multidimensional_index.swift =================================================================== --- trunk/tests/language-behaviour/arrays/array_multidimensional_index.swift 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/arrays/array_multidimensional_index.swift 2011-06-22 14:58:34 UTC (rev 4652) @@ -1,9 +1,7 @@ type file {} -(file t) echo_array (string s[][]) { - app { +app (file t) echo_array (string s[][]) { echo s[0][0] s[1][0] s[1][1] stdout=@filename(t); - } } string greetings[][] = [ [ "left", "right" ], ["up", "down"]]; Modified: trunk/tests/language-behaviour/mappers/0032-strcat-mapper-param.1.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/0032-strcat-mapper-param.1.out.expected 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/mappers/0032-strcat-mapper-param.1.out.expected 2011-06-22 14:58:34 UTC (rev 4652) @@ -1 +1,4 @@ -0032-strcat-mapper-param.1 +#!/bin/bash +set -x +cat 0032-strcat-mapper-param.1.out | grep 0032-strcat-mapper-param.1 || exit 1 +exit 0 Modified: trunk/tests/language-behaviour/mappers/0032-strcat-mapper-param.swift =================================================================== --- trunk/tests/language-behaviour/mappers/0032-strcat-mapper-param.swift 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/mappers/0032-strcat-mapper-param.swift 2011-06-22 14:58:34 UTC (rev 4652) @@ -1,18 +1,9 @@ type file; - - -(file t) echo(string m) { - app { +app (file t) echo(string m) { echo m stdout=@filename(t); - } } - - -// file f1[] ; - - + // file f1[] ; file f1 <"0032-strcat-mapper-param.1">; - - string fn = @filename(f1); - file o ; - o = echo(fn); +string fn = @filename(f1); +file o ; +o = echo(fn); Modified: trunk/tests/language-behaviour/mappers/070-singlefilemapper.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/070-singlefilemapper.out.expected 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/mappers/070-singlefilemapper.out.expected 2011-06-22 14:58:34 UTC (rev 4652) @@ -1 +1,4 @@ -070-singlefilemapper.out +#!/bin/bash +set -x +cat 070-singlefilemapper.out | grep 070-singlefilemapper.out || exit 1 +exit 0 Modified: trunk/tests/language-behaviour/mappers/070-singlefilemapper.swift =================================================================== --- trunk/tests/language-behaviour/mappers/070-singlefilemapper.swift 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/mappers/070-singlefilemapper.swift 2011-06-22 14:58:34 UTC (rev 4652) @@ -1,12 +1,6 @@ type messagefile; - -(messagefile t) write() { - app { - echo @filename(t) stdout=@filename(t); - } +app (messagefile t) write() { + echo @filename(t) stdout=@filename(t); } - messagefile outfile <"070-singlefilemapper.out">; - outfile = write(); - Modified: trunk/tests/language-behaviour/mappers/071-singlefilemapper-input.check.sh =================================================================== --- trunk/tests/language-behaviour/mappers/071-singlefilemapper-input.check.sh 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/mappers/071-singlefilemapper-input.check.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -1,8 +1,4 @@ #!/bin/bash - set -x - -[ -f 071-singlefilemapper-input.in ] || exit 1 -grep 071-singlefilemapper-input.in 071-singlefilemapper-input.out || exit 1 - +cat 071-singlefilemapper-input.out | grep || exit 1 exit 0 Modified: trunk/tests/language-behaviour/mappers/071-singlefilemapper-input.clean.sh =================================================================== --- trunk/tests/language-behaviour/mappers/071-singlefilemapper-input.clean.sh 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/mappers/071-singlefilemapper-input.clean.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -6,3 +6,7 @@ 071-singlefilemapper-input.out || exit 1 exit 0 +#!/bin/bash +set -x +rm -r 071-singlefilemapper-input-* 071-singlefilemapper-input.*ml 071-singlefilemapper-input.out || exit 1 +exit 0 Modified: trunk/tests/language-behaviour/mappers/07511-fixed-array-mapper-input.check.sh =================================================================== --- trunk/tests/language-behaviour/mappers/07511-fixed-array-mapper-input.check.sh 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/mappers/07511-fixed-array-mapper-input.check.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -1,12 +1,4 @@ #!/bin/bash - set -x - -cat stdout.txt - -X=$( grep -c "file: 07511" stdout.txt ) -[ $? == 0 ] || exit 1 -echo $X -(( $X == 3 )) || exit 1 - +cat 07511-fixed-array-mapper-input.out | grep || exit 1 exit 0 Modified: trunk/tests/language-behaviour/mappers/07511-fixed-array-mapper-input.clean.sh =================================================================== --- trunk/tests/language-behaviour/mappers/07511-fixed-array-mapper-input.clean.sh 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/mappers/07511-fixed-array-mapper-input.clean.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -5,3 +5,7 @@ rm -v $GROUP/07511-fixed-array-mapper-input.*.in || exit 1 exit 0 +#!/bin/bash +set -x +rm -r 07511-fixed-array-mapper-input-* 07511-fixed-array-mapper-input.*ml 07511-fixed-array-mapper-input.out || exit 1 +exit 0 Added: trunk/tests/language-behaviour/math/006-add.check.sh =================================================================== --- trunk/tests/language-behaviour/math/006-add.check.sh (rev 0) +++ trunk/tests/language-behaviour/math/006-add.check.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,8 @@ +#!/bin/bash +set -x +(cat 006-add.out | grep 135) || exit 1 +exit 0 +#!/bin/bash +set -x +cat 006-add.out | grep || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/math/006-add.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/math/006-add.clean.sh =================================================================== --- trunk/tests/language-behaviour/math/006-add.clean.sh (rev 0) +++ trunk/tests/language-behaviour/math/006-add.clean.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 006-add-* 006-add.*ml 006-add.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/math/006-add.clean.sh ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/tests/language-behaviour/math/006-add.out.expected =================================================================== --- trunk/tests/language-behaviour/arithmetic/006-add.out.expected 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/math/006-add.out.expected 2011-06-22 14:58:34 UTC (rev 4652) @@ -1 +0,0 @@ -135 Added: trunk/tests/language-behaviour/math/007-add-in-proc-add.check.sh =================================================================== --- trunk/tests/language-behaviour/math/007-add-in-proc-add.check.sh (rev 0) +++ trunk/tests/language-behaviour/math/007-add-in-proc-add.check.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat 007-add-in-proc-add.out | grep 189|| exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/math/007-add-in-proc-add.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/math/007-add-in-proc-add.clean.sh =================================================================== --- trunk/tests/language-behaviour/math/007-add-in-proc-add.clean.sh (rev 0) +++ trunk/tests/language-behaviour/math/007-add-in-proc-add.clean.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 007-add-in-proc-add-* 007-add-in-proc-add.*ml 007-add-in-proc-add.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/math/007-add-in-proc-add.clean.sh ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/tests/language-behaviour/math/007-add-in-proc-add.out.expected =================================================================== --- trunk/tests/language-behaviour/arithmetic/007-add-in-proc-add.out.expected 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/math/007-add-in-proc-add.out.expected 2011-06-22 14:58:34 UTC (rev 4652) @@ -1 +0,0 @@ -189 Modified: trunk/tests/language-behaviour/math/007-add-in-proc-add.swift =================================================================== --- trunk/tests/language-behaviour/arithmetic/007-add-in-proc-add.swift 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/math/007-add-in-proc-add.swift 2011-06-22 14:58:34 UTC (rev 4652) @@ -1,9 +1,7 @@ type messagefile {} -(messagefile t) greeting(int m) { - app { +app (messagefile t) greeting(int m) { echo m stdout=@filename(t); - } } messagefile outfile <"007-add-in-proc-add.out">; Added: trunk/tests/language-behaviour/math/008-add-multiply.check.sh =================================================================== --- trunk/tests/language-behaviour/math/008-add-multiply.check.sh (rev 0) +++ trunk/tests/language-behaviour/math/008-add-multiply.check.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat 008-add-multiply.out | grep 8|| exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/math/008-add-multiply.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/math/008-add-multiply.clean.sh =================================================================== --- trunk/tests/language-behaviour/math/008-add-multiply.clean.sh (rev 0) +++ trunk/tests/language-behaviour/math/008-add-multiply.clean.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 008-add-multiply-* 008-add-multiply.*ml 008-add-multiply.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/math/008-add-multiply.clean.sh ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/tests/language-behaviour/math/008-add-multiply.out.expected =================================================================== --- trunk/tests/language-behaviour/arithmetic/008-add-multiply.out.expected 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/math/008-add-multiply.out.expected 2011-06-22 14:58:34 UTC (rev 4652) @@ -1 +0,0 @@ -8 Modified: trunk/tests/language-behaviour/math/008-add-multiply.swift =================================================================== --- trunk/tests/language-behaviour/arithmetic/008-add-multiply.swift 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/math/008-add-multiply.swift 2011-06-22 14:58:34 UTC (rev 4652) @@ -1,9 +1,7 @@ type messagefile {} -(messagefile t) greeting(int m) { - app { +app (messagefile t) greeting(int m) { echo m stdout=@filename(t); - } } messagefile outfile <"008-add-multiply.out">; Added: trunk/tests/language-behaviour/math/009-multiply.check.sh =================================================================== --- trunk/tests/language-behaviour/math/009-multiply.check.sh (rev 0) +++ trunk/tests/language-behaviour/math/009-multiply.check.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat 009-multiply.out | grep 42|| exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/math/009-multiply.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/math/009-multiply.clean.sh =================================================================== --- trunk/tests/language-behaviour/math/009-multiply.clean.sh (rev 0) +++ trunk/tests/language-behaviour/math/009-multiply.clean.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 009-multiply-* 009-multiply.*ml 009-multiply.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/math/009-multiply.clean.sh ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/tests/language-behaviour/math/009-multiply.out.expected =================================================================== --- trunk/tests/language-behaviour/arithmetic/009-multiply.out.expected 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/math/009-multiply.out.expected 2011-06-22 14:58:34 UTC (rev 4652) @@ -1 +0,0 @@ -42 Modified: trunk/tests/language-behaviour/math/009-multiply.swift =================================================================== --- trunk/tests/language-behaviour/arithmetic/009-multiply.swift 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/math/009-multiply.swift 2011-06-22 14:58:34 UTC (rev 4652) @@ -1,9 +1,7 @@ type messagefile {} -(messagefile t) greeting(int m) { - app { +app (messagefile t) greeting(int m) { echo m stdout=@filename(t); - } } messagefile outfile <"009-multiply.out">; Added: trunk/tests/language-behaviour/math/010-divide.check.sh =================================================================== --- trunk/tests/language-behaviour/math/010-divide.check.sh (rev 0) +++ trunk/tests/language-behaviour/math/010-divide.check.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat 010-divide.out | grep 33|| exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/math/010-divide.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/math/010-divide.clean.sh =================================================================== --- trunk/tests/language-behaviour/math/010-divide.clean.sh (rev 0) +++ trunk/tests/language-behaviour/math/010-divide.clean.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 010-divide-* 010-divide.*ml 010-divide.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/math/010-divide.clean.sh ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/tests/language-behaviour/math/010-divide.out.expected =================================================================== --- trunk/tests/language-behaviour/arithmetic/010-divide.out.expected 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/math/010-divide.out.expected 2011-06-22 14:58:34 UTC (rev 4652) @@ -1 +0,0 @@ -33 Added: trunk/tests/language-behaviour/math/011-divide-float.check.sh =================================================================== --- trunk/tests/language-behaviour/math/011-divide-float.check.sh (rev 0) +++ trunk/tests/language-behaviour/math/011-divide-float.check.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat 011-divide-float.out | grep 0.3333333333333333|| exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/math/011-divide-float.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/math/011-divide-float.clean.sh =================================================================== --- trunk/tests/language-behaviour/math/011-divide-float.clean.sh (rev 0) +++ trunk/tests/language-behaviour/math/011-divide-float.clean.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 011-divide-float-* 011-divide-float.*ml 011-divide-float.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/math/011-divide-float.clean.sh ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/tests/language-behaviour/math/011-divide-float.out.expected =================================================================== --- trunk/tests/language-behaviour/arithmetic/011-divide-float.out.expected 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/math/011-divide-float.out.expected 2011-06-22 14:58:34 UTC (rev 4652) @@ -1 +0,0 @@ -0.3333333333333333 Modified: trunk/tests/language-behaviour/math/011-divide-float.swift =================================================================== --- trunk/tests/language-behaviour/arithmetic/011-divide-float.swift 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/math/011-divide-float.swift 2011-06-22 14:58:34 UTC (rev 4652) @@ -1,9 +1,7 @@ type messagefile {} -(messagefile t) greeting(float m) { - app { +app (messagefile t) greeting(float m) { echo m stdout=@filename(t); - } } messagefile outfile <"011-divide-float.out">; Added: trunk/tests/language-behaviour/math/013-mod.check.sh =================================================================== --- trunk/tests/language-behaviour/math/013-mod.check.sh (rev 0) +++ trunk/tests/language-behaviour/math/013-mod.check.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat 013-mod.out | grep 19|| exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/math/013-mod.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/math/013-mod.clean.sh =================================================================== --- trunk/tests/language-behaviour/math/013-mod.clean.sh (rev 0) +++ trunk/tests/language-behaviour/math/013-mod.clean.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 013-mod-* 013-mod.*ml 013-mod.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/math/013-mod.clean.sh ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/tests/language-behaviour/math/013-mod.out.expected =================================================================== --- trunk/tests/language-behaviour/arithmetic/013-mod.out.expected 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/math/013-mod.out.expected 2011-06-22 14:58:34 UTC (rev 4652) @@ -1 +0,0 @@ -19 Modified: trunk/tests/language-behaviour/math/013-mod.swift =================================================================== --- trunk/tests/language-behaviour/arithmetic/013-mod.swift 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/math/013-mod.swift 2011-06-22 14:58:34 UTC (rev 4652) @@ -1,9 +1,7 @@ type messagefile {} -(messagefile t) greeting(int m) { - app { +app (messagefile t) greeting(int m) { echo m stdout=@filename(t); - } } messagefile outfile <"013-mod.out">; Added: trunk/tests/language-behaviour/math/014-subtract.check.sh =================================================================== --- trunk/tests/language-behaviour/math/014-subtract.check.sh (rev 0) +++ trunk/tests/language-behaviour/math/014-subtract.check.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat 014-subtract.out | grep '\-37'|| exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/math/014-subtract.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/math/014-subtract.clean.sh =================================================================== --- trunk/tests/language-behaviour/math/014-subtract.clean.sh (rev 0) +++ trunk/tests/language-behaviour/math/014-subtract.clean.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 014-subtract-* 014-subtract.*ml 014-subtract.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/math/014-subtract.clean.sh ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/tests/language-behaviour/math/014-subtract.out.expected =================================================================== --- trunk/tests/language-behaviour/arithmetic/014-subtract.out.expected 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/math/014-subtract.out.expected 2011-06-22 14:58:34 UTC (rev 4652) @@ -1 +0,0 @@ --37 Modified: trunk/tests/language-behaviour/math/014-subtract.swift =================================================================== --- trunk/tests/language-behaviour/arithmetic/014-subtract.swift 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/math/014-subtract.swift 2011-06-22 14:58:34 UTC (rev 4652) @@ -1,9 +1,7 @@ type messagefile {} -(messagefile t) greeting(int m) { - app { +app (messagefile t) greeting(int m) { echo m stdout=@filename(t); - } } messagefile outfile <"014-subtract.out">; Added: trunk/tests/language-behaviour/math/0145-unary-subtact.check.sh =================================================================== --- trunk/tests/language-behaviour/math/0145-unary-subtact.check.sh (rev 0) +++ trunk/tests/language-behaviour/math/0145-unary-subtact.check.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat 0145-unary-subtact.out | grep '\-989929'|| exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/math/0145-unary-subtact.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/math/0145-unary-subtact.clean.sh =================================================================== --- trunk/tests/language-behaviour/math/0145-unary-subtact.clean.sh (rev 0) +++ trunk/tests/language-behaviour/math/0145-unary-subtact.clean.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 0145-unary-subtact-* 0145-unary-subtact.*ml 0145-unary-subtact.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/math/0145-unary-subtact.clean.sh ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/tests/language-behaviour/math/0145-unary-subtact.out.expected =================================================================== --- trunk/tests/language-behaviour/arithmetic/0145-unary-subtact.out.expected 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/math/0145-unary-subtact.out.expected 2011-06-22 14:58:34 UTC (rev 4652) @@ -1 +0,0 @@ --989929 Modified: trunk/tests/language-behaviour/math/0145-unary-subtact.swift =================================================================== --- trunk/tests/language-behaviour/arithmetic/0145-unary-subtact.swift 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/math/0145-unary-subtact.swift 2011-06-22 14:58:34 UTC (rev 4652) @@ -1,9 +1,7 @@ type messagefile {} -(messagefile t) greeting(int m) { - app { +app (messagefile t) greeting(int m) { echo m stdout=@filename(t); - } } messagefile outfile <"0145-unary-subtact.out">; Added: trunk/tests/language-behaviour/math/015-lesseq.check.sh =================================================================== --- trunk/tests/language-behaviour/math/015-lesseq.check.sh (rev 0) +++ trunk/tests/language-behaviour/math/015-lesseq.check.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat 015-lesseq.out | grep true|| exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/math/015-lesseq.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/math/015-lesseq.clean.sh =================================================================== --- trunk/tests/language-behaviour/math/015-lesseq.clean.sh (rev 0) +++ trunk/tests/language-behaviour/math/015-lesseq.clean.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 015-lesseq-* 015-lesseq.*ml 015-lesseq.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/math/015-lesseq.clean.sh ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/tests/language-behaviour/math/015-lesseq.out.expected =================================================================== --- trunk/tests/language-behaviour/arithmetic/015-lesseq.out.expected 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/math/015-lesseq.out.expected 2011-06-22 14:58:34 UTC (rev 4652) @@ -1 +0,0 @@ -true Modified: trunk/tests/language-behaviour/math/015-lesseq.swift =================================================================== --- trunk/tests/language-behaviour/arithmetic/015-lesseq.swift 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/math/015-lesseq.swift 2011-06-22 14:58:34 UTC (rev 4652) @@ -1,9 +1,7 @@ type messagefile {} -(messagefile t) greeting(boolean m) { - app { +app (messagefile t) greeting(boolean m) { echo m stdout=@filename(t); - } } messagefile outfile <"015-lesseq.out">; Added: trunk/tests/language-behaviour/math/016-greatereq.check.sh =================================================================== --- trunk/tests/language-behaviour/math/016-greatereq.check.sh (rev 0) +++ trunk/tests/language-behaviour/math/016-greatereq.check.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat 016-greatereq.out | grep false|| exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/math/016-greatereq.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/math/016-greatereq.clean.sh =================================================================== --- trunk/tests/language-behaviour/math/016-greatereq.clean.sh (rev 0) +++ trunk/tests/language-behaviour/math/016-greatereq.clean.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 016-greatereq-* 016-greatereq.*ml 016-greatereq.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/math/016-greatereq.clean.sh ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/tests/language-behaviour/math/016-greatereq.out.expected =================================================================== --- trunk/tests/language-behaviour/arithmetic/016-greatereq.out.expected 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/math/016-greatereq.out.expected 2011-06-22 14:58:34 UTC (rev 4652) @@ -1 +0,0 @@ -false Modified: trunk/tests/language-behaviour/math/016-greatereq.swift =================================================================== --- trunk/tests/language-behaviour/arithmetic/016-greatereq.swift 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/math/016-greatereq.swift 2011-06-22 14:58:34 UTC (rev 4652) @@ -1,9 +1,7 @@ type messagefile {} -(messagefile t) greeting(boolean m) { - app { +app (messagefile t) greeting(boolean m) { echo m stdout=@filename(t); - } } messagefile outfile <"016-greatereq.out">; Added: trunk/tests/language-behaviour/math/017-greater.check.sh =================================================================== --- trunk/tests/language-behaviour/math/017-greater.check.sh (rev 0) +++ trunk/tests/language-behaviour/math/017-greater.check.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat 017-greater.out | grep false|| exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/math/017-greater.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/math/017-greater.clean.sh =================================================================== --- trunk/tests/language-behaviour/math/017-greater.clean.sh (rev 0) +++ trunk/tests/language-behaviour/math/017-greater.clean.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 017-greater-* 017-greater.*ml 017-greater.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/math/017-greater.clean.sh ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/tests/language-behaviour/math/017-greater.out.expected =================================================================== --- trunk/tests/language-behaviour/arithmetic/017-greater.out.expected 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/math/017-greater.out.expected 2011-06-22 14:58:34 UTC (rev 4652) @@ -1 +0,0 @@ -false Modified: trunk/tests/language-behaviour/math/017-greater.swift =================================================================== --- trunk/tests/language-behaviour/arithmetic/017-greater.swift 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/math/017-greater.swift 2011-06-22 14:58:34 UTC (rev 4652) @@ -1,9 +1,7 @@ type messagefile {} -(messagefile t) greeting(boolean m) { - app { +app (messagefile t) greeting(boolean m) { echo m stdout=@filename(t); - } } messagefile outfile <"017-greater.out">; Added: trunk/tests/language-behaviour/math/018-less.check.sh =================================================================== --- trunk/tests/language-behaviour/math/018-less.check.sh (rev 0) +++ trunk/tests/language-behaviour/math/018-less.check.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat 018-less.out | grep true|| exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/math/018-less.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/math/018-less.clean.sh =================================================================== --- trunk/tests/language-behaviour/math/018-less.clean.sh (rev 0) +++ trunk/tests/language-behaviour/math/018-less.clean.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 018-less-* 018-less.*ml 018-less.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/math/018-less.clean.sh ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/tests/language-behaviour/math/018-less.out.expected =================================================================== --- trunk/tests/language-behaviour/arithmetic/018-less.out.expected 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/math/018-less.out.expected 2011-06-22 14:58:34 UTC (rev 4652) @@ -1 +0,0 @@ -true Modified: trunk/tests/language-behaviour/math/018-less.swift =================================================================== --- trunk/tests/language-behaviour/arithmetic/018-less.swift 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/math/018-less.swift 2011-06-22 14:58:34 UTC (rev 4652) @@ -1,9 +1,7 @@ type messagefile {} -(messagefile t) greeting(boolean m) { - app { +app (messagefile t) greeting(boolean m) { echo m stdout=@filename(t); - } } messagefile outfile <"018-less.out">; Added: trunk/tests/language-behaviour/math/019-equals.check.sh =================================================================== --- trunk/tests/language-behaviour/math/019-equals.check.sh (rev 0) +++ trunk/tests/language-behaviour/math/019-equals.check.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat 019-equals.out | grep false|| exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/math/019-equals.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/math/019-equals.clean.sh =================================================================== --- trunk/tests/language-behaviour/math/019-equals.clean.sh (rev 0) +++ trunk/tests/language-behaviour/math/019-equals.clean.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 019-equals-* 019-equals.*ml 019-equals.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/math/019-equals.clean.sh ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/tests/language-behaviour/math/019-equals.out.expected =================================================================== --- trunk/tests/language-behaviour/arithmetic/019-equals.out.expected 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/math/019-equals.out.expected 2011-06-22 14:58:34 UTC (rev 4652) @@ -1 +0,0 @@ -false Modified: trunk/tests/language-behaviour/math/019-equals.swift =================================================================== --- trunk/tests/language-behaviour/arithmetic/019-equals.swift 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/math/019-equals.swift 2011-06-22 14:58:34 UTC (rev 4652) @@ -1,11 +1,8 @@ type messagefile {} -(messagefile t) greeting(boolean m) { - app { +app (messagefile t) greeting(boolean m) { echo m stdout=@filename(t); - } } - messagefile outfile <"019-equals.out">; boolean i = 7==9; Added: trunk/tests/language-behaviour/math/0191-not-equals.check.sh =================================================================== --- trunk/tests/language-behaviour/math/0191-not-equals.check.sh (rev 0) +++ trunk/tests/language-behaviour/math/0191-not-equals.check.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat 0191-not-equals.out | grep true || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/math/0191-not-equals.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/math/0191-not-equals.clean.sh =================================================================== --- trunk/tests/language-behaviour/math/0191-not-equals.clean.sh (rev 0) +++ trunk/tests/language-behaviour/math/0191-not-equals.clean.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 0191-not-equals-* 0191-not-equals.*ml 0191-not-equals.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/math/0191-not-equals.clean.sh ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/tests/language-behaviour/math/0191-not-equals.out.expected =================================================================== --- trunk/tests/language-behaviour/arithmetic/0191-not-equals.out.expected 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/math/0191-not-equals.out.expected 2011-06-22 14:58:34 UTC (rev 4652) @@ -1 +0,0 @@ -true Modified: trunk/tests/language-behaviour/math/0191-not-equals.swift =================================================================== --- trunk/tests/language-behaviour/arithmetic/0191-not-equals.swift 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/math/0191-not-equals.swift 2011-06-22 14:58:34 UTC (rev 4652) @@ -1,9 +1,7 @@ type messagefile {} -(messagefile t) greeting(boolean m) { - app { +app (messagefile t) greeting(boolean m) { echo m stdout=@filename(t); - } } messagefile outfile <"0191-not-equals.out">; Added: trunk/tests/language-behaviour/math/030-mix-float-int.check.sh =================================================================== --- trunk/tests/language-behaviour/math/030-mix-float-int.check.sh (rev 0) +++ trunk/tests/language-behaviour/math/030-mix-float-int.check.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat 030-mix-float-int.out | grep 54.3|| exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/math/030-mix-float-int.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/math/030-mix-float-int.clean.sh =================================================================== --- trunk/tests/language-behaviour/math/030-mix-float-int.clean.sh (rev 0) +++ trunk/tests/language-behaviour/math/030-mix-float-int.clean.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 030-mix-float-int-* 030-mix-float-int.*ml 030-mix-float-int.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/math/030-mix-float-int.clean.sh ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/tests/language-behaviour/math/030-mix-float-int.out.expected =================================================================== --- trunk/tests/language-behaviour/arithmetic/030-mix-float-int.out.expected 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/math/030-mix-float-int.out.expected 2011-06-22 14:58:34 UTC (rev 4652) @@ -1 +0,0 @@ -54.3 Modified: trunk/tests/language-behaviour/math/030-mix-float-int.swift =================================================================== --- trunk/tests/language-behaviour/arithmetic/030-mix-float-int.swift 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/math/030-mix-float-int.swift 2011-06-22 14:58:34 UTC (rev 4652) @@ -1,9 +1,7 @@ type messagefile {} -(messagefile t) greeting(float m) { - app { +app (messagefile t) greeting(float m) { echo m stdout=@filename(t); - } } messagefile outfile <"030-mix-float-int.out">; Added: trunk/tests/language-behaviour/math/031-add-float.check.sh =================================================================== --- trunk/tests/language-behaviour/math/031-add-float.check.sh (rev 0) +++ trunk/tests/language-behaviour/math/031-add-float.check.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat 031-add-float.out | grep 135.3|| exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/math/031-add-float.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/math/031-add-float.clean.sh =================================================================== --- trunk/tests/language-behaviour/math/031-add-float.clean.sh (rev 0) +++ trunk/tests/language-behaviour/math/031-add-float.clean.sh 2011-06-22 14:58:34 UTC (rev 4652) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 031-add-float-* 031-add-float.*ml 031-add-float.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/math/031-add-float.clean.sh ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/tests/language-behaviour/math/031-add-float.out.expected =================================================================== --- trunk/tests/language-behaviour/arithmetic/031-add-float.out.expected 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/math/031-add-float.out.expected 2011-06-22 14:58:34 UTC (rev 4652) @@ -1 +0,0 @@ -135.3 Modified: trunk/tests/language-behaviour/math/031-add-float.swift =================================================================== --- trunk/tests/language-behaviour/arithmetic/031-add-float.swift 2011-06-20 21:53:18 UTC (rev 4651) +++ trunk/tests/language-behaviour/math/031-add-float.swift 2011-06-22 14:58:34 UTC (rev 4652) @@ -1,9 +1,7 @@ type messagefile {} -(messagefile t) greeting(float m) { - app { +app (messagefile t) greeting(float m) { echo m stdout=@filename(t); - } } messagefile outfile <"031-add-float.out">; From achavez at ci.uchicago.edu Wed Jun 22 10:25:15 2011 From: achavez at ci.uchicago.edu (achavez at ci.uchicago.edu) Date: Wed, 22 Jun 2011 10:25:15 -0500 (CDT) Subject: [Swift-commit] r4653 - trunk/tests/language-behaviour/variables Message-ID: <20110622152515.72A359CFEC@svn.ci.uchicago.edu> Author: achavez Date: 2011-06-22 10:25:15 -0500 (Wed, 22 Jun 2011) New Revision: 4653 Added: trunk/tests/language-behaviour/variables/084-declare-many-at-once.clean.sh trunk/tests/language-behaviour/variables/120-local-vars.check.sh trunk/tests/language-behaviour/variables/120-local-vars.clean.sh trunk/tests/language-behaviour/variables/121-multi-return-vars.check.sh trunk/tests/language-behaviour/variables/121-multi-return-vars.clean.sh trunk/tests/language-behaviour/variables/122-multi-return-vars.clean.sh trunk/tests/language-behaviour/variables/123-global-vars.check.sh trunk/tests/language-behaviour/variables/123-global-vars.clean.sh trunk/tests/language-behaviour/variables/1232-global-separate-assign.check.sh trunk/tests/language-behaviour/variables/1232-global-separate-assign.clean.sh Removed: trunk/tests/language-behaviour/variables/120-local-vars.out.expected trunk/tests/language-behaviour/variables/121-multi-return-vars.first.out.expected trunk/tests/language-behaviour/variables/121-multi-return-vars.second.out.expected Modified: trunk/tests/language-behaviour/variables/084-declare-many-at-once.swift trunk/tests/language-behaviour/variables/120-local-vars.swift trunk/tests/language-behaviour/variables/121-multi-return-vars.swift trunk/tests/language-behaviour/variables/123-global-vars.swift trunk/tests/language-behaviour/variables/1232-global-separate-assign.swift Log: Clean and Check Shell scripts added. Files out expected were removed Added: trunk/tests/language-behaviour/variables/084-declare-many-at-once.clean.sh =================================================================== --- trunk/tests/language-behaviour/variables/084-declare-many-at-once.clean.sh (rev 0) +++ trunk/tests/language-behaviour/variables/084-declare-many-at-once.clean.sh 2011-06-22 15:25:15 UTC (rev 4653) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 084-declare-many-at-once-* 084-declare-many-at-once.*ml || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/variables/084-declare-many-at-once.clean.sh ___________________________________________________________________ Added: svn:executable + * Modified: trunk/tests/language-behaviour/variables/084-declare-many-at-once.swift =================================================================== --- trunk/tests/language-behaviour/variables/084-declare-many-at-once.swift 2011-06-22 14:58:34 UTC (rev 4652) +++ trunk/tests/language-behaviour/variables/084-declare-many-at-once.swift 2011-06-22 15:25:15 UTC (rev 4653) @@ -1,9 +1,7 @@ type messagefile {} -(messagefile t) greeting() { - app { +app (messagefile t) greeting() { echo "hello" stdout=@filename(t); - } } messagefile outfile = greeting(); Added: trunk/tests/language-behaviour/variables/120-local-vars.check.sh =================================================================== --- trunk/tests/language-behaviour/variables/120-local-vars.check.sh (rev 0) +++ trunk/tests/language-behaviour/variables/120-local-vars.check.sh 2011-06-22 15:25:15 UTC (rev 4653) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat 120-local-vars.out | grep hi|| exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/variables/120-local-vars.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/variables/120-local-vars.clean.sh =================================================================== --- trunk/tests/language-behaviour/variables/120-local-vars.clean.sh (rev 0) +++ trunk/tests/language-behaviour/variables/120-local-vars.clean.sh 2011-06-22 15:25:15 UTC (rev 4653) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 120-local-vars-* 120-local-vars.*ml 120-local-vars.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/variables/120-local-vars.clean.sh ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/tests/language-behaviour/variables/120-local-vars.out.expected =================================================================== --- trunk/tests/language-behaviour/variables/120-local-vars.out.expected 2011-06-22 14:58:34 UTC (rev 4652) +++ trunk/tests/language-behaviour/variables/120-local-vars.out.expected 2011-06-22 15:25:15 UTC (rev 4653) @@ -1 +0,0 @@ -hi Modified: trunk/tests/language-behaviour/variables/120-local-vars.swift =================================================================== --- trunk/tests/language-behaviour/variables/120-local-vars.swift 2011-06-22 14:58:34 UTC (rev 4652) +++ trunk/tests/language-behaviour/variables/120-local-vars.swift 2011-06-22 15:25:15 UTC (rev 4653) @@ -5,10 +5,8 @@ t=greeting(l); } -(messagefile t) greeting(string m) { - app { +app (messagefile t) greeting(string m) { echo m stdout=@filename(t); - } } messagefile outfile <"120-local-vars.out">; Added: trunk/tests/language-behaviour/variables/121-multi-return-vars.check.sh =================================================================== --- trunk/tests/language-behaviour/variables/121-multi-return-vars.check.sh (rev 0) +++ trunk/tests/language-behaviour/variables/121-multi-return-vars.check.sh 2011-06-22 15:25:15 UTC (rev 4653) @@ -0,0 +1,5 @@ +#!/bin/bash +set -x +cat 121-multi-return-vars.first.out | grep hi|| exit 1 +[ -e 121-multi-return-vars.second.out ] || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/variables/121-multi-return-vars.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/variables/121-multi-return-vars.clean.sh =================================================================== --- trunk/tests/language-behaviour/variables/121-multi-return-vars.clean.sh (rev 0) +++ trunk/tests/language-behaviour/variables/121-multi-return-vars.clean.sh 2011-06-22 15:25:15 UTC (rev 4653) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 121-multi-return-vars-* 121-multi-return-vars.*ml 121-multi-return-vars.*.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/variables/121-multi-return-vars.clean.sh ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/tests/language-behaviour/variables/121-multi-return-vars.first.out.expected =================================================================== --- trunk/tests/language-behaviour/variables/121-multi-return-vars.first.out.expected 2011-06-22 14:58:34 UTC (rev 4652) +++ trunk/tests/language-behaviour/variables/121-multi-return-vars.first.out.expected 2011-06-22 15:25:15 UTC (rev 4653) @@ -1 +0,0 @@ -hi Deleted: trunk/tests/language-behaviour/variables/121-multi-return-vars.second.out.expected =================================================================== Modified: trunk/tests/language-behaviour/variables/121-multi-return-vars.swift =================================================================== --- trunk/tests/language-behaviour/variables/121-multi-return-vars.swift 2011-06-22 14:58:34 UTC (rev 4652) +++ trunk/tests/language-behaviour/variables/121-multi-return-vars.swift 2011-06-22 15:25:15 UTC (rev 4653) @@ -1,9 +1,7 @@ type messagefile; -(messagefile a, messagefile b) greeting(string m) { - app { +app (messagefile a, messagefile b) greeting(string m) { echo m stdout=@filename(a) stderr=@filename(b); - } } messagefile firstfile <"121-multi-return-vars.first.out">; Added: trunk/tests/language-behaviour/variables/122-multi-return-vars.clean.sh =================================================================== --- trunk/tests/language-behaviour/variables/122-multi-return-vars.clean.sh (rev 0) +++ trunk/tests/language-behaviour/variables/122-multi-return-vars.clean.sh 2011-06-22 15:25:15 UTC (rev 4653) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 122-multi-return-vars-* 122-multi-return-vars.*ml|| exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/variables/122-multi-return-vars.clean.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/variables/123-global-vars.check.sh =================================================================== --- trunk/tests/language-behaviour/variables/123-global-vars.check.sh (rev 0) +++ trunk/tests/language-behaviour/variables/123-global-vars.check.sh 2011-06-22 15:25:15 UTC (rev 4653) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat 123-global-vars.out | grep hello|| exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/variables/123-global-vars.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/variables/123-global-vars.clean.sh =================================================================== --- trunk/tests/language-behaviour/variables/123-global-vars.clean.sh (rev 0) +++ trunk/tests/language-behaviour/variables/123-global-vars.clean.sh 2011-06-22 15:25:15 UTC (rev 4653) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 123-global-vars-* 123-global-vars.*ml 123-global-vars.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/variables/123-global-vars.clean.sh ___________________________________________________________________ Added: svn:executable + * Modified: trunk/tests/language-behaviour/variables/123-global-vars.swift =================================================================== --- trunk/tests/language-behaviour/variables/123-global-vars.swift 2011-06-22 14:58:34 UTC (rev 4652) +++ trunk/tests/language-behaviour/variables/123-global-vars.swift 2011-06-22 15:25:15 UTC (rev 4653) @@ -1,10 +1,8 @@ type messagefile; -(messagefile t) greeting() { - app { +app (messagefile t) greeting() { echo m stdout=@filename(t); - } } global string m = "hello"; Added: trunk/tests/language-behaviour/variables/1232-global-separate-assign.check.sh =================================================================== --- trunk/tests/language-behaviour/variables/1232-global-separate-assign.check.sh (rev 0) +++ trunk/tests/language-behaviour/variables/1232-global-separate-assign.check.sh 2011-06-22 15:25:15 UTC (rev 4653) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat 1232-global-separate-assign.out | grep hi|| exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/variables/1232-global-separate-assign.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/variables/1232-global-separate-assign.clean.sh =================================================================== --- trunk/tests/language-behaviour/variables/1232-global-separate-assign.clean.sh (rev 0) +++ trunk/tests/language-behaviour/variables/1232-global-separate-assign.clean.sh 2011-06-22 15:25:15 UTC (rev 4653) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 1232-global-separate-assign-* 1232-global-separate-assign.*ml 1232-global-separate-assign.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/variables/1232-global-separate-assign.clean.sh ___________________________________________________________________ Added: svn:executable + * Modified: trunk/tests/language-behaviour/variables/1232-global-separate-assign.swift =================================================================== --- trunk/tests/language-behaviour/variables/1232-global-separate-assign.swift 2011-06-22 14:58:34 UTC (rev 4652) +++ trunk/tests/language-behaviour/variables/1232-global-separate-assign.swift 2011-06-22 15:25:15 UTC (rev 4653) @@ -1,15 +1,11 @@ type messagefile; - - -(messagefile t) greeting() { - app { +app (messagefile t) greeting() { echo m stdout=@filename(t); - } } global string m; m = "hi"; -messagefile outfile <"1232-global-separate-assign.aout">; +messagefile outfile <"1232-global-separate-assign.out">; outfile = greeting(); From achavez at ci.uchicago.edu Wed Jun 22 12:33:36 2011 From: achavez at ci.uchicago.edu (achavez at ci.uchicago.edu) Date: Wed, 22 Jun 2011 12:33:36 -0500 (CDT) Subject: [Swift-commit] r4654 - trunk/tests/language-behaviour/strings Message-ID: <20110622173336.EA4799CFEC@svn.ci.uchicago.edu> Author: achavez Date: 2011-06-22 12:33:36 -0500 (Wed, 22 Jun 2011) New Revision: 4654 Added: trunk/tests/language-behaviour/strings/003-strcat.check.sh trunk/tests/language-behaviour/strings/003-strcat.clean.sh trunk/tests/language-behaviour/strings/0031-strcat-op.check.sh trunk/tests/language-behaviour/strings/0031-strcat-op.clean.sh trunk/tests/language-behaviour/strings/004-strcat-in-arg.check.sh trunk/tests/language-behaviour/strings/004-strcat-in-arg.clean.sh trunk/tests/language-behaviour/strings/005-strcut.check.sh trunk/tests/language-behaviour/strings/005-strcut.clean.sh trunk/tests/language-behaviour/strings/0051-regexp.check.sh trunk/tests/language-behaviour/strings/0051-regexp.clean.sh trunk/tests/language-behaviour/strings/0052-regexp.check.sh trunk/tests/language-behaviour/strings/0052-regexp.clean.sh trunk/tests/language-behaviour/strings/0053-toint.check.sh trunk/tests/language-behaviour/strings/0053-toint.clean.sh trunk/tests/language-behaviour/strings/0054-strsplit.check.sh trunk/tests/language-behaviour/strings/0054-strsplit.clean.sh trunk/tests/language-behaviour/strings/103-quote.check.sh trunk/tests/language-behaviour/strings/103-quote.clean.sh trunk/tests/language-behaviour/strings/1031-quote.check.sh trunk/tests/language-behaviour/strings/1031-quote.clean.sh trunk/tests/language-behaviour/strings/1032-singlequote.check.sh trunk/tests/language-behaviour/strings/1032-singlequote.clean.sh trunk/tests/language-behaviour/strings/1033-singlequote.check.sh trunk/tests/language-behaviour/strings/1033-singlequote.clean.sh trunk/tests/language-behaviour/strings/141-space-in-filename.check.sh trunk/tests/language-behaviour/strings/141-space-in-filename.clean.sh trunk/tests/language-behaviour/strings/142-space-and-quotes.check.sh trunk/tests/language-behaviour/strings/142-space-and-quotes.clean.sh trunk/tests/language-behaviour/strings/1421-space-and-quotes.check.sh trunk/tests/language-behaviour/strings/1421-space-and-quotes.clean.sh trunk/tests/language-behaviour/strings/143-newlines.check.sh trunk/tests/language-behaviour/strings/143-newlines.clean.sh trunk/tests/language-behaviour/strings/145-url.check.sh trunk/tests/language-behaviour/strings/145-url.clean.sh trunk/tests/language-behaviour/strings/161-star-dot.check.sh trunk/tests/language-behaviour/strings/161-star-dot.clean.sh Removed: trunk/tests/language-behaviour/strings/003-strcat.out.expected trunk/tests/language-behaviour/strings/0031-strcat-op.out.expected trunk/tests/language-behaviour/strings/004-strcat-in-arg.out.expected trunk/tests/language-behaviour/strings/005-strcut.out.expected trunk/tests/language-behaviour/strings/0051-regexp.out.expected trunk/tests/language-behaviour/strings/0052-regexp.out.expected trunk/tests/language-behaviour/strings/0053-toint.out.expected trunk/tests/language-behaviour/strings/0054-strsplit.out.expected trunk/tests/language-behaviour/strings/103-quote.out.expected trunk/tests/language-behaviour/strings/1032-singlequote.out.expected trunk/tests/language-behaviour/strings/1033-singlequote.out.expected trunk/tests/language-behaviour/strings/141-space-in-filename.space here.out.expected trunk/tests/language-behaviour/strings/142-space-and-quotes. space .out.expected trunk/tests/language-behaviour/strings/142-space-and-quotes.1.out.expected trunk/tests/language-behaviour/strings/142-space-and-quotes.2" space ".out.expected trunk/tests/language-behaviour/strings/142-space-and-quotes.2.out.expected trunk/tests/language-behaviour/strings/142-space-and-quotes.3' space '.out.expected trunk/tests/language-behaviour/strings/142-space-and-quotes.3.out.expected trunk/tests/language-behaviour/strings/142-space-and-quotes.out.expected trunk/tests/language-behaviour/strings/1421-space-and-quotes.''' ' ''' '' '''''' ' """"""""" ' ' ' """' "'".out.expected trunk/tests/language-behaviour/strings/1421-space-and-quotes.1.out.expected trunk/tests/language-behaviour/strings/1421-space-and-quotes.2 sp"ace .out.expected trunk/tests/language-behaviour/strings/1421-space-and-quotes.2" space .out.expected trunk/tests/language-behaviour/strings/1421-space-and-quotes.2' sp"ac"e .out.expected trunk/tests/language-behaviour/strings/1421-space-and-quotes.2.out.expected trunk/tests/language-behaviour/strings/1421-space-and-quotes.3 sp'ace .out.expected trunk/tests/language-behaviour/strings/1421-space-and-quotes.3' sp'ac'e .out.expected trunk/tests/language-behaviour/strings/1421-space-and-quotes.3' space .out.expected trunk/tests/language-behaviour/strings/1421-space-and-quotes.3.out.expected trunk/tests/language-behaviour/strings/1421-space-and-quotes.4.out.expected trunk/tests/language-behaviour/strings/1421-space-and-quotes.5.out.expected trunk/tests/language-behaviour/strings/1421-space-and-quotes.6.out.expected trunk/tests/language-behaviour/strings/1421-space-and-quotes.7.out.expected trunk/tests/language-behaviour/strings/143-newlines.out.expected trunk/tests/language-behaviour/strings/145-url.out.expected trunk/tests/language-behaviour/strings/161-star-dot.out.expected Modified: trunk/tests/language-behaviour/strings/003-strcat.swift trunk/tests/language-behaviour/strings/0031-strcat-op.swift trunk/tests/language-behaviour/strings/004-strcat-in-arg.swift trunk/tests/language-behaviour/strings/005-strcut.swift trunk/tests/language-behaviour/strings/0052-regexp.swift trunk/tests/language-behaviour/strings/0053-toint.swift trunk/tests/language-behaviour/strings/0054-strsplit.swift trunk/tests/language-behaviour/strings/103-quote.swift trunk/tests/language-behaviour/strings/1031-quote.swift trunk/tests/language-behaviour/strings/1032-singlequote.swift trunk/tests/language-behaviour/strings/1033-singlequote.swift trunk/tests/language-behaviour/strings/141-space-in-filename.swift trunk/tests/language-behaviour/strings/142-space-and-quotes.swift trunk/tests/language-behaviour/strings/1421-space-and-quotes.swift trunk/tests/language-behaviour/strings/143-newlines.swift trunk/tests/language-behaviour/strings/145-url.swift trunk/tests/language-behaviour/strings/161-star-dot.swift Log: String sub-category updated with clean and check scripts Added: trunk/tests/language-behaviour/strings/003-strcat.check.sh =================================================================== --- trunk/tests/language-behaviour/strings/003-strcat.check.sh (rev 0) +++ trunk/tests/language-behaviour/strings/003-strcat.check.sh 2011-06-22 17:33:36 UTC (rev 4654) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat 003-strcat.out | grep abcqux || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/strings/003-strcat.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/strings/003-strcat.clean.sh =================================================================== --- trunk/tests/language-behaviour/strings/003-strcat.clean.sh (rev 0) +++ trunk/tests/language-behaviour/strings/003-strcat.clean.sh 2011-06-22 17:33:36 UTC (rev 4654) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 003-strcat-* 003-strcat.*ml 003-strcat.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/strings/003-strcat.clean.sh ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/tests/language-behaviour/strings/003-strcat.out.expected =================================================================== --- trunk/tests/language-behaviour/strings/003-strcat.out.expected 2011-06-22 15:25:15 UTC (rev 4653) +++ trunk/tests/language-behaviour/strings/003-strcat.out.expected 2011-06-22 17:33:36 UTC (rev 4654) @@ -1 +0,0 @@ -abcqux Modified: trunk/tests/language-behaviour/strings/003-strcat.swift =================================================================== --- trunk/tests/language-behaviour/strings/003-strcat.swift 2011-06-22 15:25:15 UTC (rev 4653) +++ trunk/tests/language-behaviour/strings/003-strcat.swift 2011-06-22 17:33:36 UTC (rev 4654) @@ -1,9 +1,7 @@ type messagefile {} -(messagefile t) greeting(string m) { - app { +app (messagefile t) greeting(string m) { echo m stdout=@filename(t); - } } messagefile outfile <"003-strcat.out">; Added: trunk/tests/language-behaviour/strings/0031-strcat-op.check.sh =================================================================== --- trunk/tests/language-behaviour/strings/0031-strcat-op.check.sh (rev 0) +++ trunk/tests/language-behaviour/strings/0031-strcat-op.check.sh 2011-06-22 17:33:36 UTC (rev 4654) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat 0031-strcat-op.out | grep 'abc,qux'|| exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/strings/0031-strcat-op.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/strings/0031-strcat-op.clean.sh =================================================================== --- trunk/tests/language-behaviour/strings/0031-strcat-op.clean.sh (rev 0) +++ trunk/tests/language-behaviour/strings/0031-strcat-op.clean.sh 2011-06-22 17:33:36 UTC (rev 4654) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 0031-strcat-op-* 0031-strcat-op.*ml 0031-strcat-op.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/strings/0031-strcat-op.clean.sh ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/tests/language-behaviour/strings/0031-strcat-op.out.expected =================================================================== --- trunk/tests/language-behaviour/strings/0031-strcat-op.out.expected 2011-06-22 15:25:15 UTC (rev 4653) +++ trunk/tests/language-behaviour/strings/0031-strcat-op.out.expected 2011-06-22 17:33:36 UTC (rev 4654) @@ -1 +0,0 @@ -abc,qux Modified: trunk/tests/language-behaviour/strings/0031-strcat-op.swift =================================================================== --- trunk/tests/language-behaviour/strings/0031-strcat-op.swift 2011-06-22 15:25:15 UTC (rev 4653) +++ trunk/tests/language-behaviour/strings/0031-strcat-op.swift 2011-06-22 17:33:36 UTC (rev 4654) @@ -1,9 +1,7 @@ type messagefile {} -(messagefile t) greeting(string m) { - app { +app (messagefile t) greeting(string m) { echo m stdout=@filename(t); - } } messagefile outfile <"0031-strcat-op.out">; Added: trunk/tests/language-behaviour/strings/004-strcat-in-arg.check.sh =================================================================== --- trunk/tests/language-behaviour/strings/004-strcat-in-arg.check.sh (rev 0) +++ trunk/tests/language-behaviour/strings/004-strcat-in-arg.check.sh 2011-06-22 17:33:36 UTC (rev 4654) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat 004-strcat-in-arg.out | grep test004append|| exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/strings/004-strcat-in-arg.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/strings/004-strcat-in-arg.clean.sh =================================================================== --- trunk/tests/language-behaviour/strings/004-strcat-in-arg.clean.sh (rev 0) +++ trunk/tests/language-behaviour/strings/004-strcat-in-arg.clean.sh 2011-06-22 17:33:36 UTC (rev 4654) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 004-strcat-in-arg-* 004-strcat-in-arg.*ml 004-strcat-in-arg.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/strings/004-strcat-in-arg.clean.sh ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/tests/language-behaviour/strings/004-strcat-in-arg.out.expected =================================================================== --- trunk/tests/language-behaviour/strings/004-strcat-in-arg.out.expected 2011-06-22 15:25:15 UTC (rev 4653) +++ trunk/tests/language-behaviour/strings/004-strcat-in-arg.out.expected 2011-06-22 17:33:36 UTC (rev 4654) @@ -1 +0,0 @@ -test004append Modified: trunk/tests/language-behaviour/strings/004-strcat-in-arg.swift =================================================================== --- trunk/tests/language-behaviour/strings/004-strcat-in-arg.swift 2011-06-22 15:25:15 UTC (rev 4653) +++ trunk/tests/language-behaviour/strings/004-strcat-in-arg.swift 2011-06-22 17:33:36 UTC (rev 4654) @@ -1,9 +1,7 @@ type messagefile {} -(messagefile t) greeting(string m) { - app { +app (messagefile t) greeting(string m) { echo m stdout=@filename(t); - } } messagefile outfile <"004-strcat-in-arg.out">; Added: trunk/tests/language-behaviour/strings/005-strcut.check.sh =================================================================== --- trunk/tests/language-behaviour/strings/005-strcut.check.sh (rev 0) +++ trunk/tests/language-behaviour/strings/005-strcut.check.sh 2011-06-22 17:33:36 UTC (rev 4654) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat 005-strcut.out | grep def|| exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/strings/005-strcut.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/strings/005-strcut.clean.sh =================================================================== --- trunk/tests/language-behaviour/strings/005-strcut.clean.sh (rev 0) +++ trunk/tests/language-behaviour/strings/005-strcut.clean.sh 2011-06-22 17:33:36 UTC (rev 4654) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 005-strcut-* 005-strcut.*ml 005-strcut.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/strings/005-strcut.clean.sh ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/tests/language-behaviour/strings/005-strcut.out.expected =================================================================== --- trunk/tests/language-behaviour/strings/005-strcut.out.expected 2011-06-22 15:25:15 UTC (rev 4653) +++ trunk/tests/language-behaviour/strings/005-strcut.out.expected 2011-06-22 17:33:36 UTC (rev 4654) @@ -1 +0,0 @@ -def Modified: trunk/tests/language-behaviour/strings/005-strcut.swift =================================================================== --- trunk/tests/language-behaviour/strings/005-strcut.swift 2011-06-22 15:25:15 UTC (rev 4653) +++ trunk/tests/language-behaviour/strings/005-strcut.swift 2011-06-22 17:33:36 UTC (rev 4654) @@ -1,9 +1,7 @@ type messagefile {} -(messagefile t) greeting(string m) { - app { +app (messagefile t) greeting(string m) { echo m stdout=@filename(t); - } } messagefile outfile <"005-strcut.out">; @@ -11,4 +9,3 @@ string v = @strcut("abcdefghi", "abc(def)ghi"); outfile = greeting(v); - Added: trunk/tests/language-behaviour/strings/0051-regexp.check.sh =================================================================== --- trunk/tests/language-behaviour/strings/0051-regexp.check.sh (rev 0) +++ trunk/tests/language-behaviour/strings/0051-regexp.check.sh 2011-06-22 17:33:36 UTC (rev 4654) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat 0051-regexp.out | grep monkey|| exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/strings/0051-regexp.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/strings/0051-regexp.clean.sh =================================================================== --- trunk/tests/language-behaviour/strings/0051-regexp.clean.sh (rev 0) +++ trunk/tests/language-behaviour/strings/0051-regexp.clean.sh 2011-06-22 17:33:36 UTC (rev 4654) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 0051-regexp-* 0051-regexp.*ml 0051-regexp.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/strings/0051-regexp.clean.sh ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/tests/language-behaviour/strings/0051-regexp.out.expected =================================================================== --- trunk/tests/language-behaviour/strings/0051-regexp.out.expected 2011-06-22 15:25:15 UTC (rev 4653) +++ trunk/tests/language-behaviour/strings/0051-regexp.out.expected 2011-06-22 17:33:36 UTC (rev 4654) @@ -1 +0,0 @@ -monkey Added: trunk/tests/language-behaviour/strings/0052-regexp.check.sh =================================================================== --- trunk/tests/language-behaviour/strings/0052-regexp.check.sh (rev 0) +++ trunk/tests/language-behaviour/strings/0052-regexp.check.sh 2011-06-22 17:33:36 UTC (rev 4654) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat 0052-regexp.out | grep abmonkeyhi || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/strings/0052-regexp.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/strings/0052-regexp.clean.sh =================================================================== --- trunk/tests/language-behaviour/strings/0052-regexp.clean.sh (rev 0) +++ trunk/tests/language-behaviour/strings/0052-regexp.clean.sh 2011-06-22 17:33:36 UTC (rev 4654) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 0052-regexp-* 0052-regexp.*ml 0052-regexp.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/strings/0052-regexp.clean.sh ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/tests/language-behaviour/strings/0052-regexp.out.expected =================================================================== --- trunk/tests/language-behaviour/strings/0052-regexp.out.expected 2011-06-22 15:25:15 UTC (rev 4653) +++ trunk/tests/language-behaviour/strings/0052-regexp.out.expected 2011-06-22 17:33:36 UTC (rev 4654) @@ -1 +0,0 @@ -abmonkeyhi Modified: trunk/tests/language-behaviour/strings/0052-regexp.swift =================================================================== --- trunk/tests/language-behaviour/strings/0052-regexp.swift 2011-06-22 15:25:15 UTC (rev 4653) +++ trunk/tests/language-behaviour/strings/0052-regexp.swift 2011-06-22 17:33:36 UTC (rev 4654) @@ -1,9 +1,7 @@ type messagefile {} -(messagefile t) greeting(string m) { - app { +app (messagefile t) greeting(string m) { echo m stdout=@filename(t); - } } messagefile outfile <"0052-regexp.out">; Added: trunk/tests/language-behaviour/strings/0053-toint.check.sh =================================================================== --- trunk/tests/language-behaviour/strings/0053-toint.check.sh (rev 0) +++ trunk/tests/language-behaviour/strings/0053-toint.check.sh 2011-06-22 17:33:36 UTC (rev 4654) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat 0053-toint.out | grep 109|| exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/strings/0053-toint.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/strings/0053-toint.clean.sh =================================================================== --- trunk/tests/language-behaviour/strings/0053-toint.clean.sh (rev 0) +++ trunk/tests/language-behaviour/strings/0053-toint.clean.sh 2011-06-22 17:33:36 UTC (rev 4654) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 0053-toint-* 0053-toint.*ml 0053-toint.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/strings/0053-toint.clean.sh ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/tests/language-behaviour/strings/0053-toint.out.expected =================================================================== --- trunk/tests/language-behaviour/strings/0053-toint.out.expected 2011-06-22 15:25:15 UTC (rev 4653) +++ trunk/tests/language-behaviour/strings/0053-toint.out.expected 2011-06-22 17:33:36 UTC (rev 4654) @@ -1 +0,0 @@ -109 Modified: trunk/tests/language-behaviour/strings/0053-toint.swift =================================================================== --- trunk/tests/language-behaviour/strings/0053-toint.swift 2011-06-22 15:25:15 UTC (rev 4653) +++ trunk/tests/language-behaviour/strings/0053-toint.swift 2011-06-22 17:33:36 UTC (rev 4654) @@ -1,9 +1,7 @@ type messagefile; -(messagefile t) greeting(int m) { - app { +app (messagefile t) greeting(int m) { echo m stdout=@filename(t); - } } messagefile outfile <"0053-toint.out">; Added: trunk/tests/language-behaviour/strings/0054-strsplit.check.sh =================================================================== --- trunk/tests/language-behaviour/strings/0054-strsplit.check.sh (rev 0) +++ trunk/tests/language-behaviour/strings/0054-strsplit.check.sh 2011-06-22 17:33:36 UTC (rev 4654) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat 0054-strsplit.out | grep 'ab , c , def , ghij' || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/strings/0054-strsplit.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/strings/0054-strsplit.clean.sh =================================================================== --- trunk/tests/language-behaviour/strings/0054-strsplit.clean.sh (rev 0) +++ trunk/tests/language-behaviour/strings/0054-strsplit.clean.sh 2011-06-22 17:33:36 UTC (rev 4654) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 0054-strsplit-* 0054-strsplit.*ml 0054-strsplit.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/strings/0054-strsplit.clean.sh ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/tests/language-behaviour/strings/0054-strsplit.out.expected =================================================================== --- trunk/tests/language-behaviour/strings/0054-strsplit.out.expected 2011-06-22 15:25:15 UTC (rev 4653) +++ trunk/tests/language-behaviour/strings/0054-strsplit.out.expected 2011-06-22 17:33:36 UTC (rev 4654) @@ -1 +0,0 @@ -ab , c , def , ghij Modified: trunk/tests/language-behaviour/strings/0054-strsplit.swift =================================================================== --- trunk/tests/language-behaviour/strings/0054-strsplit.swift 2011-06-22 15:25:15 UTC (rev 4653) +++ trunk/tests/language-behaviour/strings/0054-strsplit.swift 2011-06-22 17:33:36 UTC (rev 4654) @@ -1,9 +1,7 @@ type messagefile {} -(messagefile t) greeting(string a, string b, string c, string d) { - app { +app (messagefile t) greeting(string a, string b, string c, string d) { echo a "," b "," c "," d stdout=@filename(t); - } } messagefile outfile <"0054-strsplit.out">; Added: trunk/tests/language-behaviour/strings/103-quote.check.sh =================================================================== --- trunk/tests/language-behaviour/strings/103-quote.check.sh (rev 0) +++ trunk/tests/language-behaviour/strings/103-quote.check.sh 2011-06-22 17:33:36 UTC (rev 4654) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat 103-quote.out | grep '\"'|| exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/strings/103-quote.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/strings/103-quote.clean.sh =================================================================== --- trunk/tests/language-behaviour/strings/103-quote.clean.sh (rev 0) +++ trunk/tests/language-behaviour/strings/103-quote.clean.sh 2011-06-22 17:33:36 UTC (rev 4654) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 103-quote-* 103-quote.*ml 103-quote.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/strings/103-quote.clean.sh ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/tests/language-behaviour/strings/103-quote.out.expected =================================================================== --- trunk/tests/language-behaviour/strings/103-quote.out.expected 2011-06-22 15:25:15 UTC (rev 4653) +++ trunk/tests/language-behaviour/strings/103-quote.out.expected 2011-06-22 17:33:36 UTC (rev 4654) @@ -1 +0,0 @@ -" Modified: trunk/tests/language-behaviour/strings/103-quote.swift =================================================================== --- trunk/tests/language-behaviour/strings/103-quote.swift 2011-06-22 15:25:15 UTC (rev 4653) +++ trunk/tests/language-behaviour/strings/103-quote.swift 2011-06-22 17:33:36 UTC (rev 4654) @@ -1,9 +1,7 @@ type messagefile; -(messagefile t) greeting() { - app { +app (messagefile t) greeting() { echo "\"" stdout=@filename(t); - } } messagefile outfile <"103-quote.out">; Added: trunk/tests/language-behaviour/strings/1031-quote.check.sh =================================================================== --- trunk/tests/language-behaviour/strings/1031-quote.check.sh (rev 0) +++ trunk/tests/language-behaviour/strings/1031-quote.check.sh 2011-06-22 17:33:36 UTC (rev 4654) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat 1031-quote.out | grep 'testing \"quotes\" in swift'|| exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/strings/1031-quote.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/strings/1031-quote.clean.sh =================================================================== --- trunk/tests/language-behaviour/strings/1031-quote.clean.sh (rev 0) +++ trunk/tests/language-behaviour/strings/1031-quote.clean.sh 2011-06-22 17:33:36 UTC (rev 4654) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 1031-quote-* 1031-quote.*ml 1031-quote.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/strings/1031-quote.clean.sh ___________________________________________________________________ Added: svn:executable + * Modified: trunk/tests/language-behaviour/strings/1031-quote.swift =================================================================== --- trunk/tests/language-behaviour/strings/1031-quote.swift 2011-06-22 15:25:15 UTC (rev 4653) +++ trunk/tests/language-behaviour/strings/1031-quote.swift 2011-06-22 17:33:36 UTC (rev 4654) @@ -1,9 +1,7 @@ type messagefile; -(messagefile t) greeting() { - app { +app (messagefile t) greeting() { echo "testing \"quotes\" in swift" stdout=@filename(t); - } } messagefile outfile <"1031-quote.out">; Added: trunk/tests/language-behaviour/strings/1032-singlequote.check.sh =================================================================== --- trunk/tests/language-behaviour/strings/1032-singlequote.check.sh (rev 0) +++ trunk/tests/language-behaviour/strings/1032-singlequote.check.sh 2011-06-22 17:33:36 UTC (rev 4654) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat 1032-singlequote.out | grep testing\ \'quotes\'\ in\ swift|| exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/strings/1032-singlequote.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/strings/1032-singlequote.clean.sh =================================================================== --- trunk/tests/language-behaviour/strings/1032-singlequote.clean.sh (rev 0) +++ trunk/tests/language-behaviour/strings/1032-singlequote.clean.sh 2011-06-22 17:33:36 UTC (rev 4654) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 1032-singlequote-* 1032-singlequote.*ml 1032-singlequote.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/strings/1032-singlequote.clean.sh ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/tests/language-behaviour/strings/1032-singlequote.out.expected =================================================================== --- trunk/tests/language-behaviour/strings/1032-singlequote.out.expected 2011-06-22 15:25:15 UTC (rev 4653) +++ trunk/tests/language-behaviour/strings/1032-singlequote.out.expected 2011-06-22 17:33:36 UTC (rev 4654) @@ -1 +0,0 @@ -testing 'quotes' in swift Modified: trunk/tests/language-behaviour/strings/1032-singlequote.swift =================================================================== --- trunk/tests/language-behaviour/strings/1032-singlequote.swift 2011-06-22 15:25:15 UTC (rev 4653) +++ trunk/tests/language-behaviour/strings/1032-singlequote.swift 2011-06-22 17:33:36 UTC (rev 4654) @@ -1,9 +1,7 @@ type messagefile; -(messagefile t) greeting() { - app { +app (messagefile t) greeting() { echo "testing 'quotes' in swift" stdout=@filename(t); - } } messagefile outfile <"1032-singlequote.out">; Added: trunk/tests/language-behaviour/strings/1033-singlequote.check.sh =================================================================== --- trunk/tests/language-behaviour/strings/1033-singlequote.check.sh (rev 0) +++ trunk/tests/language-behaviour/strings/1033-singlequote.check.sh 2011-06-22 17:33:36 UTC (rev 4654) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat 1033-singlequote.out | grep \'|| exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/strings/1033-singlequote.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/strings/1033-singlequote.clean.sh =================================================================== --- trunk/tests/language-behaviour/strings/1033-singlequote.clean.sh (rev 0) +++ trunk/tests/language-behaviour/strings/1033-singlequote.clean.sh 2011-06-22 17:33:36 UTC (rev 4654) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 1033-singlequote-* 1033-singlequote.*ml 1033-singlequote.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/strings/1033-singlequote.clean.sh ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/tests/language-behaviour/strings/1033-singlequote.out.expected =================================================================== --- trunk/tests/language-behaviour/strings/1033-singlequote.out.expected 2011-06-22 15:25:15 UTC (rev 4653) +++ trunk/tests/language-behaviour/strings/1033-singlequote.out.expected 2011-06-22 17:33:36 UTC (rev 4654) @@ -1 +0,0 @@ -' Modified: trunk/tests/language-behaviour/strings/1033-singlequote.swift =================================================================== --- trunk/tests/language-behaviour/strings/1033-singlequote.swift 2011-06-22 15:25:15 UTC (rev 4653) +++ trunk/tests/language-behaviour/strings/1033-singlequote.swift 2011-06-22 17:33:36 UTC (rev 4654) @@ -1,9 +1,7 @@ type messagefile; -(messagefile t) greeting() { - app { +app (messagefile t) greeting() { echo "'" stdout=@filename(t); - } } messagefile outfile <"1033-singlequote.out">; Added: trunk/tests/language-behaviour/strings/141-space-in-filename.check.sh =================================================================== --- trunk/tests/language-behaviour/strings/141-space-in-filename.check.sh (rev 0) +++ trunk/tests/language-behaviour/strings/141-space-in-filename.check.sh 2011-06-22 17:33:36 UTC (rev 4654) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat 141-space-in-filename.space\ here.out | grep hello|| exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/strings/141-space-in-filename.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/strings/141-space-in-filename.clean.sh =================================================================== --- trunk/tests/language-behaviour/strings/141-space-in-filename.clean.sh (rev 0) +++ trunk/tests/language-behaviour/strings/141-space-in-filename.clean.sh 2011-06-22 17:33:36 UTC (rev 4654) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 141-space-in-filename-* 141-space-in-filename.*ml 141-space-in-filename*.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/strings/141-space-in-filename.clean.sh ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/tests/language-behaviour/strings/141-space-in-filename.space here.out.expected =================================================================== --- trunk/tests/language-behaviour/strings/141-space-in-filename.space here.out.expected 2011-06-22 15:25:15 UTC (rev 4653) +++ trunk/tests/language-behaviour/strings/141-space-in-filename.space here.out.expected 2011-06-22 17:33:36 UTC (rev 4654) @@ -1 +0,0 @@ -hello Modified: trunk/tests/language-behaviour/strings/141-space-in-filename.swift =================================================================== --- trunk/tests/language-behaviour/strings/141-space-in-filename.swift 2011-06-22 15:25:15 UTC (rev 4653) +++ trunk/tests/language-behaviour/strings/141-space-in-filename.swift 2011-06-22 17:33:36 UTC (rev 4654) @@ -1,9 +1,7 @@ type messagefile; -(messagefile t) greeting() { - app { +app (messagefile t) greeting() { echo "hello" stdout=@filename(t); - } } messagefile outfile <"141-space-in-filename.space here.out">; Deleted: trunk/tests/language-behaviour/strings/142-space-and-quotes. space .out.expected =================================================================== Deleted: trunk/tests/language-behaviour/strings/142-space-and-quotes.1.out.expected =================================================================== Deleted: trunk/tests/language-behaviour/strings/142-space-and-quotes.2" space ".out.expected =================================================================== Deleted: trunk/tests/language-behaviour/strings/142-space-and-quotes.2.out.expected =================================================================== Deleted: trunk/tests/language-behaviour/strings/142-space-and-quotes.3' space '.out.expected =================================================================== Deleted: trunk/tests/language-behaviour/strings/142-space-and-quotes.3.out.expected =================================================================== Added: trunk/tests/language-behaviour/strings/142-space-and-quotes.check.sh =================================================================== --- trunk/tests/language-behaviour/strings/142-space-and-quotes.check.sh (rev 0) +++ trunk/tests/language-behaviour/strings/142-space-and-quotes.check.sh 2011-06-22 17:33:36 UTC (rev 4654) @@ -0,0 +1,7 @@ +#!/bin/bash +set -x +[ -f 142-space-and-quotes.out ] || exit 1 +[ -f 142-space-and-quotes.\ space\ .out ] || exit 1 +[ -f 142-space-and-quotes.2\"\ space\ \".out ] || exit 1 +[ -f 142-space-and-quotes.3\'\ space\ \'.out ] || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/strings/142-space-and-quotes.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/strings/142-space-and-quotes.clean.sh =================================================================== --- trunk/tests/language-behaviour/strings/142-space-and-quotes.clean.sh (rev 0) +++ trunk/tests/language-behaviour/strings/142-space-and-quotes.clean.sh 2011-06-22 17:33:36 UTC (rev 4654) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 142-space-and-quotes-* 142-space-and-quotes.*ml 142-space-and-quotes*.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/strings/142-space-and-quotes.clean.sh ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/tests/language-behaviour/strings/142-space-and-quotes.out.expected =================================================================== Modified: trunk/tests/language-behaviour/strings/142-space-and-quotes.swift =================================================================== --- trunk/tests/language-behaviour/strings/142-space-and-quotes.swift 2011-06-22 15:25:15 UTC (rev 4653) +++ trunk/tests/language-behaviour/strings/142-space-and-quotes.swift 2011-06-22 17:33:36 UTC (rev 4654) @@ -4,10 +4,8 @@ type messagefile; -(messagefile t) p() { - app { +app (messagefile t) p() { touch @filename(t); - } } messagefile outfile <"142-space-and-quotes.out">; Deleted: trunk/tests/language-behaviour/strings/1421-space-and-quotes.''' ' ''' '' '''''' ' """"""""" ' ' ' """' "'".out.expected =================================================================== Deleted: trunk/tests/language-behaviour/strings/1421-space-and-quotes.1.out.expected =================================================================== Deleted: trunk/tests/language-behaviour/strings/1421-space-and-quotes.2 sp"ace .out.expected =================================================================== Deleted: trunk/tests/language-behaviour/strings/1421-space-and-quotes.2" space .out.expected =================================================================== Deleted: trunk/tests/language-behaviour/strings/1421-space-and-quotes.2' sp"ac"e .out.expected =================================================================== Deleted: trunk/tests/language-behaviour/strings/1421-space-and-quotes.2.out.expected =================================================================== Deleted: trunk/tests/language-behaviour/strings/1421-space-and-quotes.3 sp'ace .out.expected =================================================================== Deleted: trunk/tests/language-behaviour/strings/1421-space-and-quotes.3' sp'ac'e .out.expected =================================================================== Deleted: trunk/tests/language-behaviour/strings/1421-space-and-quotes.3' space .out.expected =================================================================== Deleted: trunk/tests/language-behaviour/strings/1421-space-and-quotes.3.out.expected =================================================================== Deleted: trunk/tests/language-behaviour/strings/1421-space-and-quotes.4.out.expected =================================================================== Deleted: trunk/tests/language-behaviour/strings/1421-space-and-quotes.5.out.expected =================================================================== Deleted: trunk/tests/language-behaviour/strings/1421-space-and-quotes.6.out.expected =================================================================== Deleted: trunk/tests/language-behaviour/strings/1421-space-and-quotes.7.out.expected =================================================================== Added: trunk/tests/language-behaviour/strings/1421-space-and-quotes.check.sh =================================================================== --- trunk/tests/language-behaviour/strings/1421-space-and-quotes.check.sh (rev 0) +++ trunk/tests/language-behaviour/strings/1421-space-and-quotes.check.sh 2011-06-22 17:33:36 UTC (rev 4654) @@ -0,0 +1,10 @@ +#!/bin/bash +set -x +[ -f 1421-space-and-quotes.2\"\ space\ .out ] || exit 1 +[ -f 1421-space-and-quotes.3\'\ space\ .out ] || exit 1 +[ -f 1421-space-and-quotes.2\ sp\"ace\ .out ] || exit 1 +[ -f 1421-space-and-quotes.3\ sp\'ace\ .out ] || exit 1 +[ -f 1421-space-and-quotes.2\'\ sp\"ac\"e\ .out ] || exit 1 +[ -f 1421-space-and-quotes.3\'\ sp\'ac\'e\ .out ] || exit 1 +[ -f 1421-space-and-quotes.\'\'\'\ \'\ \'\'\'\ \'\'\ \'\'\'\'\'\'\ \'\ \"\"\"\"\"\"\"\"\"\ \'\ \ \ \ \'\ \ \'\ \"\"\"\'\ \"\'\".out ] || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/strings/1421-space-and-quotes.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/strings/1421-space-and-quotes.clean.sh =================================================================== --- trunk/tests/language-behaviour/strings/1421-space-and-quotes.clean.sh (rev 0) +++ trunk/tests/language-behaviour/strings/1421-space-and-quotes.clean.sh 2011-06-22 17:33:36 UTC (rev 4654) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 1421-space-and-quotes-* 1421-space-and-quotes.*ml 1421-space-and-quotes*.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/strings/1421-space-and-quotes.clean.sh ___________________________________________________________________ Added: svn:executable + * Modified: trunk/tests/language-behaviour/strings/1421-space-and-quotes.swift =================================================================== --- trunk/tests/language-behaviour/strings/1421-space-and-quotes.swift 2011-06-22 15:25:15 UTC (rev 4653) +++ trunk/tests/language-behaviour/strings/1421-space-and-quotes.swift 2011-06-22 17:33:36 UTC (rev 4654) @@ -4,10 +4,8 @@ type messagefile; -(messagefile t) p() { - app { +app (messagefile t) p() { touch @filename(t); - } } messagefile outfileC <"1421-space-and-quotes.2\" space .out">; Added: trunk/tests/language-behaviour/strings/143-newlines.check.sh =================================================================== --- trunk/tests/language-behaviour/strings/143-newlines.check.sh (rev 0) +++ trunk/tests/language-behaviour/strings/143-newlines.check.sh 2011-06-22 17:33:36 UTC (rev 4654) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat 143-newlines.out | grep 'hello world'|| exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/strings/143-newlines.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/strings/143-newlines.clean.sh =================================================================== --- trunk/tests/language-behaviour/strings/143-newlines.clean.sh (rev 0) +++ trunk/tests/language-behaviour/strings/143-newlines.clean.sh 2011-06-22 17:33:36 UTC (rev 4654) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 143-newlines-* 143-newlines.*ml 143-newlines.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/strings/143-newlines.clean.sh ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/tests/language-behaviour/strings/143-newlines.out.expected =================================================================== --- trunk/tests/language-behaviour/strings/143-newlines.out.expected 2011-06-22 15:25:15 UTC (rev 4653) +++ trunk/tests/language-behaviour/strings/143-newlines.out.expected 2011-06-22 17:33:36 UTC (rev 4654) @@ -1 +0,0 @@ -hello world Modified: trunk/tests/language-behaviour/strings/143-newlines.swift =================================================================== --- trunk/tests/language-behaviour/strings/143-newlines.swift 2011-06-22 15:25:15 UTC (rev 4653) +++ trunk/tests/language-behaviour/strings/143-newlines.swift 2011-06-22 17:33:36 UTC (rev 4654) @@ -1,10 +1,8 @@ type messagefile; -(messagefile t) greeting() { - app { +app (messagefile t) greeting() { echo "hello" "world" stdout=@filename(t); - } } messagefile outfile <"143-newlines.out">; Added: trunk/tests/language-behaviour/strings/145-url.check.sh =================================================================== --- trunk/tests/language-behaviour/strings/145-url.check.sh (rev 0) +++ trunk/tests/language-behaviour/strings/145-url.check.sh 2011-06-22 17:33:36 UTC (rev 4654) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat 145-url.out | grep 'hello' || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/strings/145-url.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/strings/145-url.clean.sh =================================================================== --- trunk/tests/language-behaviour/strings/145-url.clean.sh (rev 0) +++ trunk/tests/language-behaviour/strings/145-url.clean.sh 2011-06-22 17:33:36 UTC (rev 4654) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 145-url-* 145-url.*ml 145-url.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/strings/145-url.clean.sh ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/tests/language-behaviour/strings/145-url.out.expected =================================================================== --- trunk/tests/language-behaviour/strings/145-url.out.expected 2011-06-22 15:25:15 UTC (rev 4653) +++ trunk/tests/language-behaviour/strings/145-url.out.expected 2011-06-22 17:33:36 UTC (rev 4654) @@ -1 +0,0 @@ -hello Modified: trunk/tests/language-behaviour/strings/145-url.swift =================================================================== --- trunk/tests/language-behaviour/strings/145-url.swift 2011-06-22 15:25:15 UTC (rev 4653) +++ trunk/tests/language-behaviour/strings/145-url.swift 2011-06-22 17:33:36 UTC (rev 4654) @@ -1,9 +1,7 @@ type messagefile; -(messagefile t) greeting() { - app { +app (messagefile t) greeting() { echo "hello" stdout=@filename(t); - } } messagefile outfile <"file://localhost/145-url.out">; Added: trunk/tests/language-behaviour/strings/161-star-dot.check.sh =================================================================== --- trunk/tests/language-behaviour/strings/161-star-dot.check.sh (rev 0) +++ trunk/tests/language-behaviour/strings/161-star-dot.check.sh 2011-06-22 17:33:36 UTC (rev 4654) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat 161-star-dot.out | grep 'two\-C'|| exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/strings/161-star-dot.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/strings/161-star-dot.clean.sh =================================================================== --- trunk/tests/language-behaviour/strings/161-star-dot.clean.sh (rev 0) +++ trunk/tests/language-behaviour/strings/161-star-dot.clean.sh 2011-06-22 17:33:36 UTC (rev 4654) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 161-star-dot-* 161-star-dot.*ml 161-star-dot.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/strings/161-star-dot.clean.sh ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/tests/language-behaviour/strings/161-star-dot.out.expected =================================================================== --- trunk/tests/language-behaviour/strings/161-star-dot.out.expected 2011-06-22 15:25:15 UTC (rev 4653) +++ trunk/tests/language-behaviour/strings/161-star-dot.out.expected 2011-06-22 17:33:36 UTC (rev 4654) @@ -1 +0,0 @@ -two-C Modified: trunk/tests/language-behaviour/strings/161-star-dot.swift =================================================================== --- trunk/tests/language-behaviour/strings/161-star-dot.swift 2011-06-22 15:25:15 UTC (rev 4653) +++ trunk/tests/language-behaviour/strings/161-star-dot.swift 2011-06-22 17:33:36 UTC (rev 4654) @@ -1,9 +1,7 @@ type messagefile; -(messagefile t) greeting(string s) { - app { +app (messagefile t) greeting(string s) { echo s stdout=@filename(t); - } } messagefile outfile <"161-star-dot.out">; From achavez at ci.uchicago.edu Thu Jun 23 18:03:18 2011 From: achavez at ci.uchicago.edu (achavez at ci.uchicago.edu) Date: Thu, 23 Jun 2011 18:03:18 -0500 (CDT) Subject: [Swift-commit] r4681 - trunk/tests Message-ID: <20110623230318.B06C09CFF2@svn.ci.uchicago.edu> Author: achavez Date: 2011-06-23 18:03:18 -0500 (Thu, 23 Jun 2011) New Revision: 4681 Modified: trunk/tests/suite.sh Log: When -n or -k parameters were passed, suite.sh failed to show the summary of tests run, passed and failed. This issue has been fixed. Modified: trunk/tests/suite.sh =================================================================== --- trunk/tests/suite.sh 2011-06-23 22:22:13 UTC (rev 4680) +++ trunk/tests/suite.sh 2011-06-23 23:03:18 UTC (rev 4681) @@ -641,8 +641,9 @@ rm killed_test > /dev/null 2>&1 && sleep 5 verbose "killing monitor: $MONITOR_PID..." kill $MONITOR_PID + INDIVIDUAL_TEST_TIME=$(( STOP-START )) - echo "TOOK (seconds): $(( STOP-START ))" + echo "TOOK (seconds): $INDIVIDUAL_TEST_TIME" RESULT=$( result ) NOPASO="Failed" @@ -950,6 +951,7 @@ for ((i=0; $i<$ITERS_LOCAL; i=$i+1)); do script_test_case $TESTNAME (( $TESTCOUNT >= $NUMBER_OF_TESTS )) && return + (( $SHUTDOWN )) && return done end_row @@ -1064,7 +1066,7 @@ start_group "Group $GROUPCOUNT: $TITLE" test_group (( GROUPCOUNT++ )) - (( $TESTCOUNT >= $NUMBER_OF_TESTS )) && break + (( $TESTCOUNT >= $NUMBER_OF_TESTS )) && end_row | html_~tr | group_statistics && break (( $SHUTDOWN )) && break done From achavez at ci.uchicago.edu Fri Jun 24 14:16:50 2011 From: achavez at ci.uchicago.edu (achavez at ci.uchicago.edu) Date: Fri, 24 Jun 2011 14:16:50 -0500 (CDT) Subject: [Swift-commit] r4690 - trunk/tests Message-ID: <20110624191650.434309CCBF@svn.ci.uchicago.edu> Author: achavez Date: 2011-06-24 14:16:50 -0500 (Fri, 24 Jun 2011) New Revision: 4690 Modified: trunk/tests/suite.sh Log: HTML enhanced, it shows the amount of time it took to run each swift script, when a helper script is not present, it fills the gap with a NP, Not Present, Flag. Modified: trunk/tests/suite.sh =================================================================== --- trunk/tests/suite.sh 2011-06-24 18:51:26 UTC (rev 4689) +++ trunk/tests/suite.sh 2011-06-24 19:16:50 UTC (rev 4690) @@ -31,6 +31,8 @@ SKIP_CHECKOUT=0 ALWAYS_EXITONFAILURE=0 VERBOSE=0 +TOTAL_TIME=0 +INDIVIDUAL_TEST_TIME=0 # The directory in which to start: TOPDIR=$PWD @@ -334,14 +336,14 @@ # Create either HTML or plain text report. # $TEXTREPORT monitor whether the report will be plain text or HTML output_report() { + TYPE=$1 + LABEL="$2" # Text on link to output + CMD=$3 # Command issued (td title) + RESULT=$4 # Passed or Failed + if [ $TEXTREPORT == 1 ]; then if [ "$TYPE" == "test" ]; then - - LABEL="$2" # Text on link to output - CMD=$3 # Command issued (td title) - RESULT=$4 # Passed or Failed - if [ "$RESULT" == "Passed" ]; then printf %-10.10s "success">>$REPORT else @@ -357,11 +359,6 @@ fi else if [ "$TYPE" == "test" ]; then - - LABEL="$2" # Text on link to output - CMD=$3 # Command issued (td title) - RESULT=$4 # Passed or Failed - # WIDTH=$( width "$LABEL" ) if [ "$RESULT" == "Passed" ]; then html_td class "success" width 25 title "$CMD" @@ -373,7 +370,6 @@ html_a_href $TEST_LOG $LABEL fi html_~td - elif [ "$TYPE" == "package" ]; then BINPACKAGE=$2 else @@ -397,7 +393,7 @@ printf "\n">>$REPORT else html_tr group - html_th 3 + html_th 4 html "$G" html_~th html_~tr @@ -437,6 +433,9 @@ html_~tr html_~table html_~td + html_td align left + html "Execution Time: $INDIVIDUAL_TEST_TIME seconds" + html_~td html_~tr fi } @@ -641,12 +640,11 @@ rm killed_test > /dev/null 2>&1 && sleep 5 verbose "killing monitor: $MONITOR_PID..." kill $MONITOR_PID + INDIVIDUAL_TEST_TIME=$(( STOP-START )) - + TOTAL_TIME=$(( INDIVIDUAL_TEST_TIME+TOTAL_TIME )) echo "TOOK (seconds): $INDIVIDUAL_TEST_TIME" - RESULT=$( result ) - NOPASO="Failed" #Verifies the value of $RESULT, if the test was successful #increases $TESTSPASSED by 1, if the test Failed @@ -692,6 +690,10 @@ TEST_SHOULD_FAIL=0 if [ -x $GROUP/$SETUPSCRIPT ]; then script_exec $GROUP/$SETUPSCRIPT "S" + else + html_td class "neutral" width 25 + html "NP" + html_~td fi CDM= @@ -715,11 +717,19 @@ TEST_SHOULD_FAIL=0 if [ -x $GROUP/$CHECKSCRIPT ]; then script_exec $GROUP/$CHECKSCRIPT "√" + else + html_td class "neutral" width 25 + html "NP" + html_~td fi + if [ -x $GROUP/$CLEANSCRIPT ]; then script_exec $GROUP/$CLEANSCRIPT "C" + else + html_td class "neutral" width 25 + html "NP" + html_~td fi - echo } # Execute shell test case w/ setup, check, clean @@ -733,6 +743,10 @@ TEST_SHOULD_FAIL=0 if [ -x $GROUP/$SETUPSCRIPT ]; then script_exec $GROUP/$SETUPSCRIPT "S" + else + html_td class "neutral" width 25 + html "NP" + html_~td fi (( TESTCOUNT++ )) @@ -742,17 +756,34 @@ if [ -x $GROUP/$SETUPSCRIPT ]; then script_exec $GROUP/$SETUPSCRIPT "S" + else + html_td class "neutral" width 25 + html "NP" + html_~td fi if [ -x $GROUP/$SHELLSCRIPT ]; then script_exec $SHELLSCRIPT "X" + else + html_td class "neutral" width 25 + html "NP" + html_~td fi if [ -x $GROUP/$CHECKSCRIPT ]; then script_exec $GROUP/$CHECKSCRIPT "√" + else + html_td class "neutral" width 25 + html "NP" + html_~td fi + if [ -x $GROUP/$CLEANSCRIPT ]; then script_exec $GROUP/$CLEANSCRIPT "C" + else + html_td class "neutral" width 25 + html "NP" + html_~td fi } @@ -881,25 +912,22 @@ # Revision:001 group_statistics(){ if [ $TEXTREPORT == 1 ]; then - printf "\n $TESTCOUNT Tests run\t$TESTSFAILED Tests failed\t$TESTSPASSED Tests succeeded. \n\n">>$REPORT + printf "\n $TESTCOUNT Tests run\t$TESTSFAILED Tests failed\t$TESTSPASSED Tests succeeded.\tTotal time: $TOTAL_TIME seconds \n\n">>$REPORT else -# html_tr group -# html_td neutral -# html "$TESTCOUNT Tests run" -# html_~td -# html_td success -# html "$TESTSPASSED Tests succeeded" -# html_~td -# html_td failure -# html "$TESTSFAILED Tests failed" -# html_~td -# html_~tr - printf "">>$HTML - printf "">>$HTML - printf "">>$HTML - printf "">>$HTML - printf "">>$HTML - # printf "\n $TESTCOUNT Tests run\t$TESTSFAILED Tests failed\t$TESTSPASSED Tests succeeded. \n\n">>$HTML + html_tr class "group" + html_td class "neutral" + html "$TESTCOUNT Tests run" + html_~td + html_td class "success" + html "$TESTSPASSED Tests succeeded." + html_~td + html_td class "failure" + html "$TESTSFAILED Tests failed." + html_~td + html_td class "neutral" align left + html "Total Time: $TOTAL_TIME seconds" + html_~td + html_~tr fi } @@ -921,6 +949,7 @@ TESTNAME=$( basename $TEST ) echo -e "\nTest case: $TESTNAME" + cp -v $GROUP/$TESTNAME . TESTLINK=$TESTNAME start_row @@ -929,6 +958,9 @@ (( $TESTCOUNT >= $NUMBER_OF_TESTS )) && return (( $SHUTDOWN )) && return done +# html_td align right width 50 +# html $INDIVIDUAL_TEST_TIME +# html_~td end_row done group_statistics From achavez at ci.uchicago.edu Fri Jun 24 15:41:35 2011 From: achavez at ci.uchicago.edu (achavez at ci.uchicago.edu) Date: Fri, 24 Jun 2011 15:41:35 -0500 (CDT) Subject: [Swift-commit] r4692 - trunk/tests Message-ID: <20110624204135.7031B9CFED@svn.ci.uchicago.edu> Author: achavez Date: 2011-06-24 15:41:35 -0500 (Fri, 24 Jun 2011) New Revision: 4692 Modified: trunk/tests/suite.sh Log: Enhanced HTML report Modified: trunk/tests/suite.sh =================================================================== --- trunk/tests/suite.sh 2011-06-24 20:02:46 UTC (rev 4691) +++ trunk/tests/suite.sh 2011-06-24 20:41:35 UTC (rev 4692) @@ -397,6 +397,21 @@ html "$G" html_~th html_~tr + + html_tr group + html_td + html "#" + html_~td + html_td + html "Test name" + html_~td + html_td + html "Helper Scripts" + html_~td + html_td + html "Execution Time" + html_~td + html_~tr fi } @@ -410,7 +425,7 @@ html "$TESTCOUNT" html " " html_~td - html_td align right + html_td align left html " " if [[ -n $TESTLINK ]]; then html_a_href $TESTLINK $TESTNAME @@ -433,8 +448,8 @@ html_~tr html_~table html_~td - html_td align left - html "Execution Time: $INDIVIDUAL_TEST_TIME seconds" + html_td align right + html "$INDIVIDUAL_TEST_TIME seconds" html_~td html_~tr fi @@ -691,8 +706,8 @@ if [ -x $GROUP/$SETUPSCRIPT ]; then script_exec $GROUP/$SETUPSCRIPT "S" else - html_td class "neutral" width 25 - html "NP" + html_td width 25 + html "  " html_~td fi @@ -718,16 +733,16 @@ if [ -x $GROUP/$CHECKSCRIPT ]; then script_exec $GROUP/$CHECKSCRIPT "√" else - html_td class "neutral" width 25 - html "NP" + html_td width 25 + html "  " html_~td fi if [ -x $GROUP/$CLEANSCRIPT ]; then script_exec $GROUP/$CLEANSCRIPT "C" else - html_td class "neutral" width 25 - html "NP" + html_td width 25 + html "  " html_~td fi } @@ -744,8 +759,8 @@ if [ -x $GROUP/$SETUPSCRIPT ]; then script_exec $GROUP/$SETUPSCRIPT "S" else - html_td class "neutral" width 25 - html "NP" + html_td width 25 + html "  " html_~td fi @@ -757,32 +772,32 @@ if [ -x $GROUP/$SETUPSCRIPT ]; then script_exec $GROUP/$SETUPSCRIPT "S" else - html_td class "neutral" width 25 - html "NP" + html_td width 25 + html "  " html_~td fi if [ -x $GROUP/$SHELLSCRIPT ]; then script_exec $SHELLSCRIPT "X" else - html_td class "neutral" width 25 - html "NP" + html_td width 25 + html "  " html_~td fi if [ -x $GROUP/$CHECKSCRIPT ]; then script_exec $GROUP/$CHECKSCRIPT "√" else - html_td class "neutral" width 25 - html "NP" + html_td width 25 + html "  " html_~td fi if [ -x $GROUP/$CLEANSCRIPT ]; then script_exec $GROUP/$CLEANSCRIPT "C" else - html_td class "neutral" width 25 - html "NP" + html_td width 25 + html "  " html_~td fi } @@ -958,12 +973,10 @@ (( $TESTCOUNT >= $NUMBER_OF_TESTS )) && return (( $SHUTDOWN )) && return done -# html_td align right width 50 -# html $INDIVIDUAL_TEST_TIME -# html_~td end_row done group_statistics + TOTAL_TIME=0 TESTCOUNT=0 TESTSPASSED=0 TESTSFAILED=0 From hategan at ci.uchicago.edu Mon Jun 27 12:31:01 2011 From: hategan at ci.uchicago.edu (hategan at ci.uchicago.edu) Date: Mon, 27 Jun 2011 12:31:01 -0500 (CDT) Subject: [Swift-commit] r4696 - in trunk/src/org/griphyn/vdl: karajan/lib/swiftscript type Message-ID: <20110627173101.617D29CCF9@svn.ci.uchicago.edu> Author: hategan Date: 2011-06-27 12:31:01 -0500 (Mon, 27 Jun 2011) New Revision: 4696 Modified: trunk/src/org/griphyn/vdl/karajan/lib/swiftscript/WriteData.java trunk/src/org/griphyn/vdl/type/Type.java Log: fixed bug where writeData does not unwrap handles before printing to output stream Modified: trunk/src/org/griphyn/vdl/karajan/lib/swiftscript/WriteData.java =================================================================== --- trunk/src/org/griphyn/vdl/karajan/lib/swiftscript/WriteData.java 2011-06-27 15:33:59 UTC (rev 4695) +++ trunk/src/org/griphyn/vdl/karajan/lib/swiftscript/WriteData.java 2011-06-27 17:31:01 UTC (rev 4696) @@ -4,15 +4,10 @@ import java.io.File; import java.io.FileWriter; import java.io.IOException; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; -import java.util.Collection; import java.util.Comparator; import java.util.Iterator; +import java.util.Map; +import java.util.TreeMap; import org.apache.log4j.Logger; import org.globus.cog.karajan.arguments.Arg; @@ -118,12 +113,11 @@ private void writePrimitiveArray(BufferedWriter br, DSHandle src) throws IOException, ExecutionException { - Map m = ((AbstractDataNode) src).getArrayValue(); - Map c = new TreeMap(new ArrayIndexComparator()); + Map m = ((AbstractDataNode) src).getArrayValue(); + Map c = new TreeMap(new ArrayIndexComparator()); c.putAll(m); - Iterator i = c.values().iterator(); - while(i.hasNext()) { - br.write(((DSHandle)i.next()).toString()); + for (DSHandle h : c.values()) { + br.write(h.getValue().toString()); br.newLine(); } } @@ -131,34 +125,29 @@ private void writeStructArray(BufferedWriter br, DSHandle src) throws IOException, ExecutionException { writeStructHeader(src.getType().itemType(), br); - Map m = ((AbstractDataNode) src).getArrayValue(); - Map c = new TreeMap(new ArrayIndexComparator()); + Map m = ((AbstractDataNode) src).getArrayValue(); + Map c = new TreeMap(new ArrayIndexComparator()); c.putAll(m); - Iterator i = c.values().iterator(); - while(i.hasNext()) { - writeStruct(br, (DSHandle)i.next()); + for (DSHandle h : c.values()) { + writeStruct(br, h); } } private void writeStructHeader(Type type, BufferedWriter br) throws ExecutionException, IOException { - List l = type.getFieldNames(); - Iterator i = l.iterator(); - while(i.hasNext()) { - br.write(i.next().toString()); + for (String name : type.getFieldNames()) { + br.write(name); br.write(" "); } br.newLine(); } private void writeStruct(BufferedWriter br, DSHandle struct) throws IOException, ExecutionException { - List l = struct.getType().getFieldNames(); - Iterator i = l.iterator(); try { - while(i.hasNext()) { - DSHandle child = struct.getField(Path.EMPTY_PATH.addLast((String)i.next())); - br.write(child.toString()); + for (String name : struct.getType().getFieldNames()) { + DSHandle child = struct.getField(Path.EMPTY_PATH.addLast(name)); + br.write(child.getValue().toString()); br.write(" "); } br.newLine(); @@ -167,10 +156,10 @@ } } - class ArrayIndexComparator implements Comparator { - public int compare(Object o1, Object o2) { - int i1 = Integer.parseInt((String)o1); - int i2 = Integer.parseInt((String)o2); + class ArrayIndexComparator implements Comparator { + public int compare(String o1, String o2) { + int i1 = Integer.parseInt(o1); + int i2 = Integer.parseInt(o2); if(i1 < i2) return -1; if(i1 > i2) return 1; return 0; Modified: trunk/src/org/griphyn/vdl/type/Type.java =================================================================== --- trunk/src/org/griphyn/vdl/type/Type.java 2011-06-27 15:33:59 UTC (rev 4695) +++ trunk/src/org/griphyn/vdl/type/Type.java 2011-06-27 17:31:01 UTC (rev 4696) @@ -101,7 +101,7 @@ * * @return a list of strings */ - public List getFieldNames(); + public List getFieldNames(); /** * get all the fields in this type From davidk at ci.uchicago.edu Mon Jun 27 14:30:37 2011 From: davidk at ci.uchicago.edu (davidk at ci.uchicago.edu) Date: Mon, 27 Jun 2011 14:30:37 -0500 (CDT) Subject: [Swift-commit] r4697 - in SwiftApps: . modis modis/bin Message-ID: <20110627193037.B8D749CCF9@svn.ci.uchicago.edu> Author: davidk Date: 2011-06-27 14:30:37 -0500 (Mon, 27 Jun 2011) New Revision: 4697 Added: SwiftApps/modis/ SwiftApps/modis/MODIS_grid.gif SwiftApps/modis/bin/ SwiftApps/modis/bin/analyzelanduse.sh SwiftApps/modis/bin/analyzelanduse.sh.orig SwiftApps/modis/bin/analyzelanduse2.sh SwiftApps/modis/bin/analyzelandusep1.sh SwiftApps/modis/bin/assemble.sh SwiftApps/modis/bin/assemble.sh.orig SwiftApps/modis/bin/assemble.sh.v2 SwiftApps/modis/bin/assemble2.sh SwiftApps/modis/bin/colormodis.sh SwiftApps/modis/bin/getlanduse.sh SwiftApps/modis/bin/gray.png SwiftApps/modis/bin/grid.gif SwiftApps/modis/bin/imagehist.sh SwiftApps/modis/bin/markmap.sh SwiftApps/modis/bin/setborder.sh SwiftApps/modis/bin/setglobushost.sh SwiftApps/modis/cf SwiftApps/modis/coast1.xml SwiftApps/modis/coasters.xml SwiftApps/modis/demo3 SwiftApps/modis/demo4 SwiftApps/modis/demo5 SwiftApps/modis/g.gif SwiftApps/modis/geos.mapper.sh SwiftApps/modis/gridmap.gif SwiftApps/modis/markedGrid.gif SwiftApps/modis/modis.mapper SwiftApps/modis/modis.swift SwiftApps/modis/modis2.swift SwiftApps/modis/modis3.swift SwiftApps/modis/modis4.swift SwiftApps/modis/modis5.swift SwiftApps/modis/modisp1.swift SwiftApps/modis/mon.png SwiftApps/modis/rundemo.sh SwiftApps/modis/rundemo2.pbs.sh SwiftApps/modis/rundemo2.sh SwiftApps/modis/rundemop1.sh SwiftApps/modis/sico.xml SwiftApps/modis/sites.local.xml SwiftApps/modis/sites.xml SwiftApps/modis/sites.xml.pas.coasters SwiftApps/modis/tc SwiftApps/modis/tc.local SwiftApps/modis/tc.pbs SwiftApps/modis/white.png Log: Modis demo Added: SwiftApps/modis/MODIS_grid.gif =================================================================== (Binary files differ) Property changes on: SwiftApps/modis/MODIS_grid.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: SwiftApps/modis/bin/analyzelanduse.sh =================================================================== --- SwiftApps/modis/bin/analyzelanduse.sh (rev 0) +++ SwiftApps/modis/bin/analyzelanduse.sh 2011-06-27 19:30:37 UTC (rev 4697) @@ -0,0 +1,45 @@ +# +# Return (simple) stats and filenames for the tiles with the $num highest values of $field +# + +stats=$1 +tilelist=$2 +field=$3 +num=$4 +shift 4 + +grep " $field" $* | +sed -e 's/:/ /' | +sort -n -k +2 | +tail -${num} >$stats + +( awk '{print $1}' | + sed -e 's/landuse.//' -e 's/\..*/.tif/' -e 's,^,/home/wilde/bigdata/data/modis/2002/,' \ +) <$stats >$tilelist + +exit + +login1$ cat topurban.txt +landuse/h20v04.landuse.byfreq 67312 13 0d +landuse/h28v06.landuse.byfreq 82267 13 0d +landuse/h08v05.landuse.byfreq 92674 13 0d +landuse/h11v04.landuse.byfreq 93702 13 0d +landuse/h13v11.landuse.byfreq 104302 13 0d +landuse/h12v04.landuse.byfreq 110772 13 0d +landuse/h19v04.landuse.byfreq 120908 13 0d +landuse/h27v05.landuse.byfreq 128794 13 0d +landuse/h18v03.landuse.byfreq 142756 13 0d +landuse/h18v04.landuse.byfreq 146486 13 0d + +login1$ cat urbantiles.txt +/home/wilde/bigdata/data/modis/2002landuse/h20v04.tif +/home/wilde/bigdata/data/modis/2002landuse/h28v06.tif +/home/wilde/bigdata/data/modis/2002landuse/h08v05.tif +/home/wilde/bigdata/data/modis/2002landuse/h11v04.tif +/home/wilde/bigdata/data/modis/2002landuse/h13v11.tif +/home/wilde/bigdata/data/modis/2002landuse/h12v04.tif +/home/wilde/bigdata/data/modis/2002landuse/h19v04.tif +/home/wilde/bigdata/data/modis/2002landuse/h27v05.tif +/home/wilde/bigdata/data/modis/2002landuse/h18v03.tif +/home/wilde/bigdata/data/modis/2002landuse/h18v04.tif +login1$ fg Property changes on: SwiftApps/modis/bin/analyzelanduse.sh ___________________________________________________________________ Added: svn:executable + * Added: SwiftApps/modis/bin/analyzelanduse.sh.orig =================================================================== --- SwiftApps/modis/bin/analyzelanduse.sh.orig (rev 0) +++ SwiftApps/modis/bin/analyzelanduse.sh.orig 2011-06-27 19:30:37 UTC (rev 4697) @@ -0,0 +1,17 @@ +# +# Return (simple) stats and filenames for the tiles with the $num highest values of $field +# + +stats=$1 +tilelist=$2 +field=$3 +num=$4 +shift 4 + +grep " $field" $* | +sed -e 's/:/ /' | +sort -n -k +2 | +tail -${num} >$stats + +awk '{print $1}' | +sed -e 's/\..*/.tif/' -e 's,^,/home/wilde/bigdata/data/modis/,' <$stats >$tilelist Property changes on: SwiftApps/modis/bin/analyzelanduse.sh.orig ___________________________________________________________________ Added: svn:executable + * Added: SwiftApps/modis/bin/analyzelanduse2.sh =================================================================== --- SwiftApps/modis/bin/analyzelanduse2.sh (rev 0) +++ SwiftApps/modis/bin/analyzelanduse2.sh 2011-06-27 19:30:37 UTC (rev 4697) @@ -0,0 +1,173 @@ +# +# Return (simple) stats and filenames for the tiles with the $num highest values of $wanteduses +# + +stats=$1 +tilelist=$2 +wanteduses=$3 +num=$4 +shift 4 + +awk -v wanteduses="$wanteduses" ' + BEGIN { + sum = 0; + filename = ""; + + use["water"]=0 + use["evergreen needleleaf forest"]=1 + use["evergreen broadleaf forest"]=2 + use["deciduous needleleaf forest"]=3 + use["deciduous broadleaf forest"]=4 + use["mixed forests"]=5 + use["closed shrubland"]=6 + use["open shrublands"]=7 + use["woody savannas"]=8 + use["savannas"]=9 + use["grasslands"]=10 + use["permanent wetlands"]=11 + use["croplands"]=12 + use["urban and built-up"]=13 + use["cropland/natural vegetation mosaic"]=14 + use["snow and ice"]=15 + use["barren or sparsely vegetated"]=16 + use["unclassified"]=254 + + split(wanteduses,wants,"[ ,]+") + for (w in wants) { + for (u in use) { + if (index(u, wants[w])) { + wantuse[use[u]] = 1 + } + } + } + } + { + if (FNR==1) { + if(filename != "") { print filename, sum} + filename = FILENAME + sum = 0 + } + } + + wantuse[$2] { + sum += $1 + } + END { print filename, sum} ' $* | +sort -n -k +2 | +tail -${num} >$stats + +( awk '{print $1}' | + sed -e 's,^.*/,/,' -e 's/\..*/.tif/' -e 's,^,/home/wilde/bigdata/data/modis/2002/,' \ +# FIXME: dont hardcode dir path above +# sed -e 's/landuse.//' -e 's/\..*/.tif/' -e 's,^,/home/wilde/bigdata/data/modis/2002/,' \ +) <$stats >$tilelist + +exit + +login1$ cat topselected.txt +modis-2011.0102.1636-urban-50-9/h09v07.landuse.byfreq 5312 +modis-2011.0102.1636-urban-50-9/h08v07.landuse.byfreq 12555 +modis-2011.0102.1636-urban-50-9/h08v06.landuse.byfreq 14824 +modis-2011.0102.1636-urban-50-9/h10v04.landuse.byfreq 14852 +modis-2011.0102.1636-urban-50-9/h09v06.landuse.byfreq 21432 +modis-2011.0102.1636-urban-50-9/h09v04.landuse.byfreq 32954 +modis-2011.0102.1636-urban-50-9/h09v05.landuse.byfreq 38591 +modis-2011.0102.1636-urban-50-9/h10v05.landuse.byfreq 66613 +modis-2011.0102.1636-urban-50-9/h08v05.landuse.byfreq 92674 + +login1$ cat selectedtiles.txt +/home/wilde/bigdata/data/modis/2002/modis-2011.tif +/home/wilde/bigdata/data/modis/2002/modis-2011.tif +/home/wilde/bigdata/data/modis/2002/modis-2011.tif +/home/wilde/bigdata/data/modis/2002/modis-2011.tif +/home/wilde/bigdata/data/modis/2002/modis-2011.tif +/home/wilde/bigdata/data/modis/2002/modis-2011.tif +/home/wilde/bigdata/data/modis/2002/modis-2011.tif +/home/wilde/bigdata/data/modis/2002/modis-2011.tif +/home/wilde/bigdata/data/modis/2002/modis-2011.tif +login1$ + +--- + +login1$ cat topurban.txt +landuse/h20v04.landuse.byfreq 67312 13 0d +landuse/h28v06.landuse.byfreq 82267 13 0d +landuse/h08v05.landuse.byfreq 92674 13 0d +landuse/h11v04.landuse.byfreq 93702 13 0d +landuse/h13v11.landuse.byfreq 104302 13 0d +landuse/h12v04.landuse.byfreq 110772 13 0d +landuse/h19v04.landuse.byfreq 120908 13 0d +landuse/h27v05.landuse.byfreq 128794 13 0d +landuse/h18v03.landuse.byfreq 142756 13 0d +landuse/h18v04.landuse.byfreq 146486 13 0d + +login1$ cat urbantiles.txt +/home/wilde/bigdata/data/modis/2002landuse/h20v04.tif +/home/wilde/bigdata/data/modis/2002landuse/h28v06.tif +/home/wilde/bigdata/data/modis/2002landuse/h08v05.tif +/home/wilde/bigdata/data/modis/2002landuse/h11v04.tif +/home/wilde/bigdata/data/modis/2002landuse/h13v11.tif +/home/wilde/bigdata/data/modis/2002landuse/h12v04.tif +/home/wilde/bigdata/data/modis/2002landuse/h19v04.tif +/home/wilde/bigdata/data/modis/2002landuse/h27v05.tif +/home/wilde/bigdata/data/modis/2002landuse/h18v03.tif +/home/wilde/bigdata/data/modis/2002landuse/h18v04.tif +login1$ + + 0 water + 1 evergreen needleleaf forest + 2 evergreen broadleaf forest + 3 deciduous needleleaf forest + 4 deciduous broadleaf forest + 5 mixed forests + 6 closed shrubland + 7 open shrublands + 8 woody savannas + 9 savannas + 10 grasslands + 11 permanent wetlands + 12 croplands + 13 urban and built-up + 14 cropland/natural vegetation mosaic + 15 snow and ice + 16 barren or sparsely vegetated + 254 unclassified + + use["water"]=0 + use["evergreen needleleaf forest"]=1 + use["evergreen broadleaf forest"]=2 + use["deciduous needleleaf forest"]=3 + use["deciduous broadleaf forest"]=4 + use["mixed forests"]=5 + use["closed shrubland"]=6 + use["open shrublands"]=7 + use["woody savannas"]=8 + use["savannas"]=9 + use["grasslands"]=10 + use["permanent wetlands"]=11 + use["croplands"]=12 + use["urban and built-up"]=13 + use["cropland/natural vegetation mosaic"]=14 + use["snow and ice"]=15 + use["barren or sparsely vegetated"]=16 + use["unclassified"]=254 + + +use["water"]=0 +use["evergreenneedle"]=1 +use["evergreenleaf"]=2 +use["deciduousneedle"]=3 +use["deciduousleaf"]=4 +use["mixedforest"]=5 +use["closedshrub"]=6 +use["openshrub"]=7 +use["woody"]=8 +use["savanna"]=9 +use["grassland"]=10 +use["wetland"]=11 +use["cropland"]=12 +use["urban"]=13 +use["vegetation"]=14 +use["ice"]=15 +use["barren"]=16 +use["unclassified"]=17 Property changes on: SwiftApps/modis/bin/analyzelanduse2.sh ___________________________________________________________________ Added: svn:executable + * Added: SwiftApps/modis/bin/analyzelandusep1.sh =================================================================== --- SwiftApps/modis/bin/analyzelandusep1.sh (rev 0) +++ SwiftApps/modis/bin/analyzelandusep1.sh 2011-06-27 19:30:37 UTC (rev 4697) @@ -0,0 +1,146 @@ +# +# Return (simple) stats and filenames for the tiles with the $num highest values of $wanteduses +# + +stats=$1 +tilelist=$2 +wanteduses=$3 +num=$4 +shift 4 + +awk -v wanteduses="$wanteduses" ' + BEGIN { + sum = 0; + filename = ""; + + use["water"]=0 + use["evergreen needleleaf forest"]=1 + use["evergreen broadleaf forest"]=2 + use["deciduous needleleaf forest"]=3 + use["deciduous broadleaf forest"]=4 + use["mixed forests"]=5 + use["closed shrubland"]=6 + use["open shrublands"]=7 + use["woody savannas"]=8 + use["savannas"]=9 + use["grasslands"]=10 + use["permanent wetlands"]=11 + use["croplands"]=12 + use["urban and built-up"]=13 + use["cropland/natural vegetation mosaic"]=14 + use["snow and ice"]=15 + use["barren or sparsely vegetated"]=16 + use["unclassified"]=254 + + split(wanteduses,wants,"[ ,]+") + for (w in wants) { + for (u in use) { + if (index(u, wants[w])) { + wantuse[use[u]] = 1 + } + } + } + } + { + if (FNR==1) { + if(filename != "") { print filename, sum} + filename = FILENAME + sum = 0 + } + } + + wantuse[$2] { + sum += $1 + } + END { print filename, sum} ' $* | +sort -n -k +2 | +tail -${num} >$stats + +( awk '{print $1}' | + sed -e 's/landuse.//' -e 's/\..*/.tif/' -e 's,^,/home/wilde/bigdata/data/modis/2002/,' \ +) <$stats >$tilelist + +exit + +login1$ cat topurban.txt +landuse/h20v04.landuse.byfreq 67312 13 0d +landuse/h28v06.landuse.byfreq 82267 13 0d +landuse/h08v05.landuse.byfreq 92674 13 0d +landuse/h11v04.landuse.byfreq 93702 13 0d +landuse/h13v11.landuse.byfreq 104302 13 0d +landuse/h12v04.landuse.byfreq 110772 13 0d +landuse/h19v04.landuse.byfreq 120908 13 0d +landuse/h27v05.landuse.byfreq 128794 13 0d +landuse/h18v03.landuse.byfreq 142756 13 0d +landuse/h18v04.landuse.byfreq 146486 13 0d + +login1$ cat urbantiles.txt +/home/wilde/bigdata/data/modis/2002landuse/h20v04.tif +/home/wilde/bigdata/data/modis/2002landuse/h28v06.tif +/home/wilde/bigdata/data/modis/2002landuse/h08v05.tif +/home/wilde/bigdata/data/modis/2002landuse/h11v04.tif +/home/wilde/bigdata/data/modis/2002landuse/h13v11.tif +/home/wilde/bigdata/data/modis/2002landuse/h12v04.tif +/home/wilde/bigdata/data/modis/2002landuse/h19v04.tif +/home/wilde/bigdata/data/modis/2002landuse/h27v05.tif +/home/wilde/bigdata/data/modis/2002landuse/h18v03.tif +/home/wilde/bigdata/data/modis/2002landuse/h18v04.tif +login1$ + + 0 water + 1 evergreen needleleaf forest + 2 evergreen broadleaf forest + 3 deciduous needleleaf forest + 4 deciduous broadleaf forest + 5 mixed forests + 6 closed shrubland + 7 open shrublands + 8 woody savannas + 9 savannas + 10 grasslands + 11 permanent wetlands + 12 croplands + 13 urban and built-up + 14 cropland/natural vegetation mosaic + 15 snow and ice + 16 barren or sparsely vegetated + 254 unclassified + + use["water"]=0 + use["evergreen needleleaf forest"]=1 + use["evergreen broadleaf forest"]=2 + use["deciduous needleleaf forest"]=3 + use["deciduous broadleaf forest"]=4 + use["mixed forests"]=5 + use["closed shrubland"]=6 + use["open shrublands"]=7 + use["woody savannas"]=8 + use["savannas"]=9 + use["grasslands"]=10 + use["permanent wetlands"]=11 + use["croplands"]=12 + use["urban and built-up"]=13 + use["cropland/natural vegetation mosaic"]=14 + use["snow and ice"]=15 + use["barren or sparsely vegetated"]=16 + use["unclassified"]=254 + + +use["water"]=0 +use["evergreenneedle"]=1 +use["evergreenleaf"]=2 +use["deciduousneedle"]=3 +use["deciduousleaf"]=4 +use["mixedforest"]=5 +use["closedshrub"]=6 +use["openshrub"]=7 +use["woody"]=8 +use["savanna"]=9 +use["grassland"]=10 +use["wetland"]=11 +use["cropland"]=12 +use["urban"]=13 +use["vegetation"]=14 +use["ice"]=15 +use["barren"]=16 +use["unclassified"]=17 Property changes on: SwiftApps/modis/bin/analyzelandusep1.sh ___________________________________________________________________ Added: svn:executable + * Added: SwiftApps/modis/bin/assemble.sh =================================================================== --- SwiftApps/modis/bin/assemble.sh (rev 0) +++ SwiftApps/modis/bin/assemble.sh 2011-06-27 19:30:37 UTC (rev 4697) @@ -0,0 +1,13 @@ +output=$1 +shift +inputs=$(ls -1 $*) +labels="" +for f in $inputs; do + labels="$labels -label $(echo $f | sed -e 's/^.*\(h..v..\).*/\1/') $f" +done + +echo doing: +echo montage $labels -font Courier-Regular $inputs $output + +montage $labels -font Courier-Regular $output + Property changes on: SwiftApps/modis/bin/assemble.sh ___________________________________________________________________ Added: svn:executable + * Added: SwiftApps/modis/bin/assemble.sh.orig =================================================================== --- SwiftApps/modis/bin/assemble.sh.orig (rev 0) +++ SwiftApps/modis/bin/assemble.sh.orig 2011-06-27 19:30:37 UTC (rev 4697) @@ -0,0 +1,4 @@ +output=$1 +shift +inputs=$(ls -1 $*) +montage -label '%f' -font Courier-Regular $inputs $output \ No newline at end of file Property changes on: SwiftApps/modis/bin/assemble.sh.orig ___________________________________________________________________ Added: svn:executable + * Added: SwiftApps/modis/bin/assemble.sh.v2 =================================================================== --- SwiftApps/modis/bin/assemble.sh.v2 (rev 0) +++ SwiftApps/modis/bin/assemble.sh.v2 2011-06-27 19:30:37 UTC (rev 4697) @@ -0,0 +1,10 @@ +output=$1 +shift +inputs=$(ls -1 $*) +labels="" +for f in $inputs; do + labels="$labels -label $(echo $f | sed -e 's/^.*\(h..v..\).*/\1/') $f" +done + +montage $label -font Courier-Regular $inputs $output + Property changes on: SwiftApps/modis/bin/assemble.sh.v2 ___________________________________________________________________ Added: svn:executable + * Added: SwiftApps/modis/bin/assemble2.sh =================================================================== --- SwiftApps/modis/bin/assemble2.sh (rev 0) +++ SwiftApps/modis/bin/assemble2.sh 2011-06-27 19:30:37 UTC (rev 4697) @@ -0,0 +1,53 @@ +#! /bin/bash + +output=$(cd $(dirname $1); echo $(pwd)/$(basename $1)) # get full pathname of output file +selected=$(cd $(dirname $2); echo $(pwd)/$(basename $2)) # get full pathname of input file "selected" +indir=$(cd $(dirname $3); pwd) # get full pathname of input dir "geos" +webdir=$4 + +tmp=$(mktemp -d /tmp/modis3.assemble.XXXX) +bindir=$(cd $(dirname $0); pwd) +graytile=$bindir/gray.png + +# input files are expected to start with hNNvNN. +# we reverse this to form the final image + +cd $indir +for h in `seq -w 00 35`; do + for v in `seq -w 00 17`; do + hv=h${h}v${v} + vh=v${v}h${h} + if [ ! -f $hv*png ]; then + cp $graytile $tmp/$vh.png + elif grep $hv $selected >&/dev/null; then +echo "adding border to $hv" + # add red border + convert $hv*png -resize 290x290 $tmp/t.png + convert $tmp/t.png -bordercolor red -border 5x5 $tmp/$vh.png + else + cp $hv*png $tmp/$vh.png + fi + done +done + +montage -tile 36x18 -geometry +0+0 $tmp/v*png $tmp/bigmap.png +convert $tmp/bigmap.png -resize 20% $tmp/map.png +cp $tmp/map.png $output + +if [ -d "$webdir" ]; then + cp $tmp/map.png $webdir +fi + + +########### + +exit 0 + +inputs=$(ls -1 $*) +labels="" +for f in $inputs; do + labels="$labels -label $(echo $f | sed -e 's/^.*\(h..v..\).*/\1/') $f" +done + +montage $labels -font Courier-Regular $output + Property changes on: SwiftApps/modis/bin/assemble2.sh ___________________________________________________________________ Added: svn:executable + * Added: SwiftApps/modis/bin/colormodis.sh =================================================================== --- SwiftApps/modis/bin/colormodis.sh (rev 0) +++ SwiftApps/modis/bin/colormodis.sh 2011-06-27 19:30:37 UTC (rev 4697) @@ -0,0 +1,53 @@ +# +# Return a new modis files with the 0-16 pixel values changed to +# colors that reflect the land use of that region. (See legend) +# +# usage: colormodis.sh modis.tif recolored.tif +# + +infile=$1 +outfile=$2 +tmp=`mktemp /tmp/modis.$USER.XXXXXX` +mv $tmp $tmp.tif +tmp=$tmp.tif +map=`mktemp /tmp/colormap.$USER.XXXXXX` + +# Create color set + +( + cat | + sed -e 's/ c.=/ /g' -e 's/[^0-9 ]//g' | + awk '{printf("#%02x%02x%02x #%02x%02x%02x\n",NR-1,NR-1,NR-1,$1,$2,$3)}') >$map < + + + + + + + + + + + + + + + + +EOF + +cp $infile $tmp + +# output logged to stdout/error is ignored by swift for this app() + +while read mval color ; do + echo color $mval is $color + echo convert $tmp "-fill" "$color" "-opaque" "$mval" $tmp + convert $tmp "-fill" "$color" "-opaque" "$mval" $tmp +done <$map + +#cp $tmp $outfile +convert -thumbnail 300x300 $tmp $outfile + +# rm $tmp $map # Keep these for debugging, for now. Property changes on: SwiftApps/modis/bin/colormodis.sh ___________________________________________________________________ Added: svn:executable + * Added: SwiftApps/modis/bin/getlanduse.sh =================================================================== --- SwiftApps/modis/bin/getlanduse.sh (rev 0) +++ SwiftApps/modis/bin/getlanduse.sh 2011-06-27 19:30:37 UTC (rev 4697) @@ -0,0 +1,14 @@ +# +# Read a MODIS .tif file and return a histogram of pixel values. +# The pixel values signify land use for that region (see legend in notes) +# +# Usage: getlanduse.sh modisFile histogramFile +# + +#sleep 1 +convert $1 -format %c histogram:info:- 2>/dev/null | + grep '[0-9]' | + sort -nr | + sed -e 's/[^0-9 ]//g' | + awk '{print $1, $3, sprintf("%02x",$3)}' | + sort -n -k $2 Property changes on: SwiftApps/modis/bin/getlanduse.sh ___________________________________________________________________ Added: svn:executable + * Added: SwiftApps/modis/bin/gray.png =================================================================== (Binary files differ) Property changes on: SwiftApps/modis/bin/gray.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: SwiftApps/modis/bin/grid.gif =================================================================== (Binary files differ) Property changes on: SwiftApps/modis/bin/grid.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: SwiftApps/modis/bin/imagehist.sh =================================================================== --- SwiftApps/modis/bin/imagehist.sh (rev 0) +++ SwiftApps/modis/bin/imagehist.sh 2011-06-27 19:30:37 UTC (rev 4697) @@ -0,0 +1 @@ +convert $1 -format %c histogram:info:- 2>/dev/null | grep : | sort -nr Property changes on: SwiftApps/modis/bin/imagehist.sh ___________________________________________________________________ Added: svn:executable + * Added: SwiftApps/modis/bin/markmap.sh =================================================================== --- SwiftApps/modis/bin/markmap.sh (rev 0) +++ SwiftApps/modis/bin/markmap.sh 2011-06-27 19:30:37 UTC (rev 4697) @@ -0,0 +1,25 @@ +# markmap selectedTileFile outputMap + +bin=$(cd $(dirname $0); pwd) + +tilefile=$1 +outmap=$2 + +cp $bin/grid.gif $outmap +cat $tilefile | while read f ; do + hv=$(echo $f | sed -e 's,^.*/,,' -e 's/\..*//') + h=$(echo $hv | sed -e 's/h//' -e 's/v..//' -e 's/^0//') + v=$(echo $hv | sed -e 's/h..//' -e 's/v//' -e 's/^0//') + echo hv=$hv h=$h v=$v + convert $outmap -stroke red -linewidth 2 -fill transparent \ + -draw "rectangle $((34+$h*16)),$((51+$v*16)) $((34+14+$h*16)),$((51+14+$v*16))" $outmap +done + +exit + +# example: + +h=18 +v=8 +cp grid.gif g.gif +convert g.gif -stroke red -linewidth 2 -fill transparent -draw "rectangle $((34+$h*16)),$((51+$v*16)) $((34+14+$h*16)),$((51+14+$v*16))" g.gif Property changes on: SwiftApps/modis/bin/markmap.sh ___________________________________________________________________ Added: svn:executable + * Added: SwiftApps/modis/bin/setborder.sh =================================================================== --- SwiftApps/modis/bin/setborder.sh (rev 0) +++ SwiftApps/modis/bin/setborder.sh 2011-06-27 19:30:37 UTC (rev 4697) @@ -0,0 +1 @@ +convert $1 -bordercolor red -border 20 $2 Property changes on: SwiftApps/modis/bin/setborder.sh ___________________________________________________________________ Added: svn:executable + * Added: SwiftApps/modis/bin/setglobushost.sh =================================================================== --- SwiftApps/modis/bin/setglobushost.sh (rev 0) +++ SwiftApps/modis/bin/setglobushost.sh 2011-06-27 19:30:37 UTC (rev 4697) @@ -0,0 +1,2 @@ +ipaddr=`/sbin/ifconfig | grep inet | head -1 | cut -d ':' -f 2 |awk '{print $1}'` +export GLOBUS_HOSTNAME=$ipaddr Property changes on: SwiftApps/modis/bin/setglobushost.sh ___________________________________________________________________ Added: svn:executable + * Added: SwiftApps/modis/cf =================================================================== --- SwiftApps/modis/cf (rev 0) +++ SwiftApps/modis/cf 2011-06-27 19:30:37 UTC (rev 4697) @@ -0,0 +1,9 @@ +wrapperlog.always.transfer=true +sitedir.keep=true +execution.retries=0 +lazy.errors=false +status.mode=provider +use.provider.staging=false +provider.staging.pin.swiftfiles=false +#throttle.transfers=16 +#throttle.file.operations=16 Added: SwiftApps/modis/coast1.xml =================================================================== --- SwiftApps/modis/coast1.xml (rev 0) +++ SwiftApps/modis/coast1.xml 2011-06-27 19:30:37 UTC (rev 4697) @@ -0,0 +1,191 @@ + + + + + 8 + 3500 + 1 + 1 + 1 + + .31 + 10000 + /home/wilde/swiftwork/stomp + + + + + + + + Added: SwiftApps/modis/coasters.xml =================================================================== --- SwiftApps/modis/coasters.xml (rev 0) +++ SwiftApps/modis/coasters.xml 2011-06-27 19:30:37 UTC (rev 4697) @@ -0,0 +1,189 @@ + + + + + + 8 + 3500 + 1 + 1 + 1 + + + .07 + 10000 + /home/wilde/swiftwork/crush + + + + + 8 + 3500 + 1 + 1 + 1 + + .31 + 10000 + /home/wilde/swiftwork/thwomp + + + + + 8 + 3500 + 1 + 1 + 1 + + .31 + 10000 + /home/wilde/swiftwork/stomp + + + + + 8 + 3500 + 1 + 1 + 1 + + .31 + 10000 + /home/wilde/swiftwork/crush + + + + + 8 + 3500 + 1 + 1 + 1 + + .31 + 10000 + /home/wilde/swiftwork/crank + + + + + 8 + 3500 + 1 + 1 + 1 + + .31 + 10000 + /home/wilde/swiftwork/steamroller + + + + + 8 + 3500 + 1 + 1 + 1 + + .31 + 10000 + /home/wilde/swiftwork/grind + + + + + 8 + 3500 + 1 + 1 + 1 + + .31 + 10000 + /home/wilde/swiftwork/churn + + + + + 8 + 3500 + 1 + 1 + 1 + + .31 + 10000 + /home/wilde/swiftwork/trounce + + + + + 8 + 3500 + 1 + 1 + 1 + + .31 + 10000 + /home/wilde/swiftwork/thrash + + + + + 8 + 3500 + 1 + 1 + 1 + + .31 + 10000 + /home/wilde/swiftwork/vanquish + + + + + Added: SwiftApps/modis/demo3 =================================================================== --- SwiftApps/modis/demo3 (rev 0) +++ SwiftApps/modis/demo3 2011-06-27 19:30:37 UTC (rev 4697) @@ -0,0 +1,7 @@ +swift -tc.file tc.local \ + -sites.file sites.xml \ + modis3.swift -landtype=$1 -nfiles=$2 -nselect=$3 + +exit + +swift -tc.file tc.local -sites.file sites.local.xml modis2.swift -landtype=$1 -nfiles=$2 -nselect=$3 Property changes on: SwiftApps/modis/demo3 ___________________________________________________________________ Added: svn:executable + * Added: SwiftApps/modis/demo4 =================================================================== --- SwiftApps/modis/demo4 (rev 0) +++ SwiftApps/modis/demo4 2011-06-27 19:30:37 UTC (rev 4697) @@ -0,0 +1,18 @@ +# demo4 forest 50 5 pbs + +landtype=${1:-urban} +nfiles=${2:-50} +nselect=${3:-10} +site=${4:-local} + +runid=modis-$(date +%Y.%m%d.%H%M)-$landtype-$nfiles-$nselect + +echo runid=$runid + +swift -tc.file tc.$site \ + -sites.file sites.xml \ + modis4.swift -landtype=$landtype -nfiles=$nfiles -nselect=$nselect -runid=$runid \ + -MODISdir=/home/wilde/bigdata/data/modis/2002 -webdir=/home/wilde/public_html/geo +exit + +swift -tc.file tc.local -sites.file sites.local.xml modis2.swift -landtype=$1 -nfiles=$2 -nselect=$3 Property changes on: SwiftApps/modis/demo4 ___________________________________________________________________ Added: svn:executable + * Added: SwiftApps/modis/demo5 =================================================================== --- SwiftApps/modis/demo5 (rev 0) +++ SwiftApps/modis/demo5 2011-06-27 19:30:37 UTC (rev 4697) @@ -0,0 +1,18 @@ +# demo4 forest 50 5 pbs + +landtype=${1:-urban} +nfiles=${2:-50} +nselect=${3:-10} +site=${4:-local} + +runid=modis-$(date +%Y.%m%d.%H%M)-$landtype-$nfiles-$nselect + +echo runid=$runid + +swift -tc.file tc.$site \ + -sites.file sites.xml \ + modis5.swift -landtype=$landtype -nfiles=$nfiles -nselect=$nselect -runid=$runid \ + -MODISdir=/home/wilde/bigdata/data/modis/2002 -webdir=/home/wilde/public_html/geo +exit + +swift -tc.file tc.local -sites.file sites.local.xml modis2.swift -landtype=$1 -nfiles=$2 -nselect=$3 Property changes on: SwiftApps/modis/demo5 ___________________________________________________________________ Added: svn:executable + * Added: SwiftApps/modis/g.gif =================================================================== (Binary files differ) Property changes on: SwiftApps/modis/g.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: SwiftApps/modis/geos.mapper.sh =================================================================== --- SwiftApps/modis/geos.mapper.sh (rev 0) +++ SwiftApps/modis/geos.mapper.sh 2011-06-27 19:30:37 UTC (rev 4697) @@ -0,0 +1,20 @@ +#!/bin/bash + +# Usage: $0 -location dir -suffix .tif -site gsiftp://gridftp.pads.ci.uchicago.edu/ -n=999 + +while [ $# -gt 0 ]; do + case $1 in + -location) location=$2;; + -suffix) suffix=$2;; + -site) site=$2;; + -n) n=$2;; + *) echo "$0: bad mapper args" 1>&2 + exit 1;; + esac + shift 2 +done + +find $location -name '*'${suffix} -print | head -$n | +awk '{printf "[%d] '$site'/%s\n", NR, $1}' + + Property changes on: SwiftApps/modis/geos.mapper.sh ___________________________________________________________________ Added: svn:executable + * Added: SwiftApps/modis/gridmap.gif =================================================================== (Binary files differ) Property changes on: SwiftApps/modis/gridmap.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: SwiftApps/modis/markedGrid.gif =================================================================== (Binary files differ) Property changes on: SwiftApps/modis/markedGrid.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: SwiftApps/modis/modis.mapper =================================================================== --- SwiftApps/modis/modis.mapper (rev 0) +++ SwiftApps/modis/modis.mapper 2011-06-27 19:30:37 UTC (rev 4697) @@ -0,0 +1,20 @@ +#!/bin/bash + +# Usage: $0 -location dir -suffix .tif -site gsiftp://gridftp.pads.ci.uchicago.edu/ -n=999 + +while [ $# -gt 0 ]; do + case $1 in + -location) location=$2;; + -suffix) suffix=$2;; + -site) site=$2;; + -n) n=$2;; + *) echo "$0: bad mapper args" 1>&2 + exit 1;; + esac + shift 2 +done + +find $location -type f -name 'h??v??'${suffix} -print | head -$n | +awk '{printf "[%d] %s\n", NR-1, $1}' + + Property changes on: SwiftApps/modis/modis.mapper ___________________________________________________________________ Added: svn:executable + * Added: SwiftApps/modis/modis.swift =================================================================== --- SwiftApps/modis/modis.swift (rev 0) +++ SwiftApps/modis/modis.swift 2011-06-27 19:30:37 UTC (rev 4697) @@ -0,0 +1,71 @@ +# Declare dataset types + +type file; +type imagefile; +type landuse; + +# Define application program interfaces + +app (landuse output) getLandUse (imagefile input, int sortfield) +{ + getlanduse @input sortfield stdout=@output ; +} + +app (file output, file tilelist) analyzeLandUse (landuse input[], int usetype, int maxnum) +{ + analyzelanduse @output @tilelist usetype maxnum @filenames(input); +} + +app (imagefile output) colormodis (imagefile input) +{ + colormodis @input @output; +} + +app (imagefile output) assemble (imagefile input[]) +{ + assemble @output @filenames(input); +} + +# Declare datasets + +imagefile geos[]; +landuse land[]; + +# Find the land use of each MODIS tile + +foreach g,i in geos { + land[i] = getLandUse(g,1); +} + +# Find the top N most urban tiles (by area) + +int N = 12; +int UsageTypeURBAN=13; +file bigurban<"topurban.txt">; +file urbantiles<"urbantiles.txt">; +(bigurban, urbantiles) = analyzeLandUse(land, UsageTypeURBAN, N); + +# Map the files for the top urban tiles to an array + +string urbanfilenames[] = readData(urbantiles); +imagefile urbanfiles[] ; + +# Create a set of recolored images for just the urban tiles + +string odir = "/home/wilde/public_html/geo/"; + +imagefile recoloredImage[] ; + +foreach uf, i in urbanfiles { + #imagefile recoloredImage ; + recoloredImage[i] = colormodis(uf); +} + +# Assemble a montage of the top urban areas + +imagefile urbanMontage ; + +urbanMontage = assemble(recoloredImage); Added: SwiftApps/modis/modis2.swift =================================================================== --- SwiftApps/modis/modis2.swift (rev 0) +++ SwiftApps/modis/modis2.swift 2011-06-27 19:30:37 UTC (rev 4697) @@ -0,0 +1,78 @@ +# Declare dataset types + +type file; +type imagefile; +type landuse; + +# Define application program interfaces + +app (landuse output) getLandUse (imagefile input, int sortfield) +{ + getlanduse @input sortfield stdout=@output ; +} + +app (file output, file tilelist) analyzeLandUse (landuse input[], string usetype, int maxnum) +{ + analyzelanduse @output @tilelist usetype maxnum @filenames(input); +} + +app (imagefile output) colormodis (imagefile input) +{ + colormodis @input @output; +} + +app (imagefile output) assemble (imagefile input[]) +{ + assemble @output @filenames(input); +} + +# Declare datasets + +# imagefile geos[]; + +string location="/home/wilde/bigdata/data/modis/2002"; +string suffix=".tif"; + +int nfiles = @toint(@arg("nfiles","1000")); +int N = @toint(@arg("nselect","12")); +string UsageType=@arg("landtype","urban"); + +imagefile geos[]; # site=site +landuse land[]; + +# Find the land use of each MODIS tile + +foreach g,i in geos { + land[i] = getLandUse(g,1); +} + +# Find the top N tiles (by total area of selected landuse types) + +file topselected<"topselected.txt">; +file selectedtiles<"selectedtiles.txt">; +(topselected, selectedtiles) = analyzeLandUse(land, UsageType, N); + +# Map the files for the top selected tiles to an array + +string selectedfilenames[] = readData(selectedtiles); +imagefile selectedfiles[] ; + +# Create a set of recolored images for just the selected tiles + +string odir = "/home/wilde/public_html/geo/"; + +imagefile recoloredImage[] ; + +foreach sf, i in selectedfiles { + #imagefile recoloredImage ; + recoloredImage[i] = colormodis(sf); +} + +# Assemble a montage of the top selcted areas + +imagefile selectedMontage ; + +selectedMontage = assemble(recoloredImage); Added: SwiftApps/modis/modis3.swift =================================================================== --- SwiftApps/modis/modis3.swift (rev 0) +++ SwiftApps/modis/modis3.swift 2011-06-27 19:30:37 UTC (rev 4697) @@ -0,0 +1,71 @@ +# Declare dataset types + +type file; +type imagefile; +type landuse; + +# Define application program interfaces + +app (landuse output) getLandUse (imagefile input, int sortfield) +{ + getlanduse @input sortfield stdout=@output ; +} + +app (file output, file tilelist) analyzeLandUse (landuse input[], string usetype, int maxnum) +{ + analyzelanduse @output @tilelist usetype maxnum @filenames(input); +} + +app (imagefile output) colorMODIS (imagefile input) +{ + colormodis @input @output; +} + +app (imagefile output) assemble (file selected, imagefile image[]) +{ + assemble @output @selected @filenames(image); +} + +# Declare datasets + +# imagefile geos[]; + +string location="/home/wilde/bigdata/data/modis/2002"; +string suffix=".tif"; + +int nfiles = @toint(@arg("nfiles","1000")); +int N = @toint(@arg("nselect","12")); +string UsageType=@arg("landtype","urban"); + +imagefile geos[]; # site=site +landuse land[]; + +# Find the land use of each MODIS tile + +foreach g,i in geos { + land[i] = getLandUse(g,1); +} + +# Find the top N tiles (by total area of selected landuse types) + +file topSelected<"topselected.txt">; +file selectedTiles<"selectedtiles.txt">; +(topSelected, selectedTiles) = analyzeLandUse(land, UsageType, N); + +# Create multi-color images for all tiles + +string odir = "/home/wilde/public_html/geo/"; + +imagefile colorImage[] ; + +foreach g, i in geos { + colorImage[i] = colorMODIS(g); +} + +# Assemble a montage of the top selcted areas + +imagefile montage ; # @arg + +montage = assemble(selectedTiles,colorImage); Added: SwiftApps/modis/modis4.swift =================================================================== --- SwiftApps/modis/modis4.swift (rev 0) +++ SwiftApps/modis/modis4.swift 2011-06-27 19:30:37 UTC (rev 4697) @@ -0,0 +1,83 @@ +# Declare dataset types + +type file; +type imagefile; +type landuse; + +# Define application program interfaces + +app (landuse output) getLandUse (imagefile input, int sortfield) +{ + getlanduse @input sortfield stdout=@output ; +} + +app (file output, file tilelist) analyzeLandUse (landuse input[], string usetype, int maxnum) +{ + analyzelanduse @output @tilelist usetype maxnum @filenames(input); +} + +app (imagefile output) colorMODIS (imagefile input) +{ + colormodis @input @output; +} + +app (imagefile output) assemble (file selected, imagefile image[], string webdir) +{ + assemble @output @selected @filename(image[0]) webdir; +} + +# Constants and command line arguments + +int nFiles = @toint(@arg("nfiles","1000")); +int nSelect = @toint(@arg("nselect","12")); +string landType = @arg("landtype","urban"); +string runID = @arg("runid","modis-run"); +string MODISdir= @arg("modisdir","/home/wilde/bigdata/data/modis/2002"); +string webDir = @arg("webdir","/home/wilde/public_html/geo/"); + +string suffix=".tif"; + +# Datasets + +imagefile geos[]; # site=site + +# Find the land use of each MODIS tile + +landuse land[]; + +foreach g,i in geos { + land[i] = getLandUse(g,1); +} + +# Find the top N tiles (by total area of selected landuse types) + +file topSelected<"topselected.txt">; +file selectedTiles<"selectedtiles.txt">; +(topSelected, selectedTiles) = analyzeLandUse(land, landType, nSelect); + +# Create multi-color images for all tiles + +imagefile colorImage[] ; + +foreach g, i in geos { + colorImage[i] = colorMODIS(g); +} + +# Assemble a montage of the top selcted areas + +imagefile montage ; # @arg + +montage = assemble(selectedTiles,colorImage,webDir); + +# future args: + +int selectHiThreshold; +int selectLowThreshold; +string upperLeftTile; +string lowerRightTile; +float imageSizes[]; +string displayOptions; + +# imagefile geos[]; Added: SwiftApps/modis/modis5.swift =================================================================== --- SwiftApps/modis/modis5.swift (rev 0) +++ SwiftApps/modis/modis5.swift 2011-06-27 19:30:37 UTC (rev 4697) @@ -0,0 +1,93 @@ +type file; +type imagefile; +type landuse; + +# Define application program interfaces + +app (landuse output) getLandUse (imagefile input, int sortfield) +{ + getlanduse @input sortfield stdout=@output ; +} + +app (file output, file tilelist) analyzeLandUse + (landuse input[], string usetype, int maxnum) +{ + analyzelanduse @output @tilelist usetype maxnum @filenames(input); +} + +app (imagefile output) colorMODIS (imagefile input) +{ + colormodis @input @output; +} + +app (imagefile output) assemble + (file selected, imagefile image[], string webdir) +{ + assemble @output @selected @filename(image[0]) webdir; +} + +app (imagefile grid) markMap (file tilelist) +{ + markmap @tilelist @grid; +} + +# Constants and command line arguments + +int nFiles = @toint(@arg("nfiles","1000")); +int nSelect = @toint(@arg("nselect","12")); +string landType = @arg("landtype","urban"); +string runID = @arg("runid","modis-run"); +string MODISdir= @arg("modisdir","/home/wilde/bigdata/data/modis/2002"); +string webDir = @arg("webdir","/home/wilde/public_html/geo/"); + +string suffix=".tif"; + +# Input Dataset + +imagefile geos[] ; # site=site + +# Compute the land use summary of each MODIS tile + +landuse land[] ; + +foreach g,i in geos { + land[i] = getLandUse(g,1); +} + +# Find the top N tiles (by total area of selected landuse types) + +file topSelected<"topselected.txt">; +file selectedTiles<"selectedtiles.txt">; +(topSelected, selectedTiles) = analyzeLandUse(land, landType, nSelect); + +# Mark the top N tiles on a sinusoidal gridded map + +imagefile gridMap<"markedGrid.gif">; +gridMap = markMap(topSelected); + +# Create multi-color images for all tiles + +imagefile colorImage[] ; + +foreach g, i in geos { + colorImage[i] = colorMODIS(g); +} + +# Assemble a montage of the top selected areas + +imagefile montage ; # @arg +montage = assemble(selectedTiles,colorImage,webDir); + +# future args: + +int selectHiThreshold; +int selectLowThreshold; +string upperLeftTile; +string lowerRightTile; +float imageSizes[]; +string displayOptions; + Added: SwiftApps/modis/modisp1.swift =================================================================== --- SwiftApps/modis/modisp1.swift (rev 0) +++ SwiftApps/modis/modisp1.swift 2011-06-27 19:30:37 UTC (rev 4697) @@ -0,0 +1,73 @@ +# Declare dataset types + +type file; +type imagefile; +type landuse; + +# Define application program interfaces + +app (landuse output) getLandUse (imagefile input, int sortfield) +{ + getlanduse @input sortfield stdout=@output ; +} + +app (file output, file tilelist) analyzeLandUse (landuse input[], int usetype, int maxnum) +{ + analyzelanduse @output @tilelist usetype maxnum @filenames(input); +} + +app (imagefile output) colormodis (imagefile input) +{ + colormodis @input @output; +} + +app (imagefile output) assemble (imagefile input[]) +{ + assemble @output @filenames(input); +} + +# Declare datasets + +imagefile geos[]; +landuse land[]; + +int nfiles = @toint(@arg("nfiles","1000")); +int N = @toint(@arg("nselect","12")); +string UsageType=@arg("landtype","13"); + +# Find the land use of each MODIS tile + +foreach g,i in geos { + land[i] = getLandUse(g,1); +} + +# Find the top N most urban tiles (by area) + +file bigurban<"topurban.txt">; +file urbantiles<"urbantiles.txt">; +(bigurban, urbantiles) = analyzeLandUse(land, UsageType, N); + +# Map the files for the top urban tiles to an array + +string urbanfilenames[] = readData(urbantiles); +imagefile urbanfiles[] ; + +# Create a set of recolored images for just the urban tiles + +string odir = "/home/wilde/public_html/geo/"; + +imagefile recoloredImage[] ; + +foreach uf, i in urbanfiles { + #imagefile recoloredImage ; + recoloredImage[i] = colormodis(uf); +} + +# Assemble a montage of the top urban areas + +imagefile urbanMontage ; + +urbanMontage = assemble(recoloredImage); Added: SwiftApps/modis/mon.png =================================================================== (Binary files differ) Property changes on: SwiftApps/modis/mon.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: SwiftApps/modis/rundemo.sh =================================================================== --- SwiftApps/modis/rundemo.sh (rev 0) +++ SwiftApps/modis/rundemo.sh 2011-06-27 19:30:37 UTC (rev 4697) @@ -0,0 +1 @@ +swift -tc.file tc -sites.file sites.xml modis.swift Property changes on: SwiftApps/modis/rundemo.sh ___________________________________________________________________ Added: svn:executable + * Added: SwiftApps/modis/rundemo2.pbs.sh =================================================================== --- SwiftApps/modis/rundemo2.pbs.sh (rev 0) +++ SwiftApps/modis/rundemo2.pbs.sh 2011-06-27 19:30:37 UTC (rev 4697) @@ -0,0 +1,7 @@ +swift -tc.file tc.pbs \ + -sites.file sites.xml \ + modis2.swift -landtype=$1 -nfiles=$2 -nselect=$3 + +exit + +swift -tc.file tc.local -sites.file sites.local.xml modis2.swift -landtype=$1 -nfiles=$2 -nselect=$3 Property changes on: SwiftApps/modis/rundemo2.pbs.sh ___________________________________________________________________ Added: svn:executable + * Added: SwiftApps/modis/rundemo2.sh =================================================================== --- SwiftApps/modis/rundemo2.sh (rev 0) +++ SwiftApps/modis/rundemo2.sh 2011-06-27 19:30:37 UTC (rev 4697) @@ -0,0 +1,7 @@ +swift -tc.file tc.local \ + -sites.file sites.xml \ + modis2.swift -landtype=$1 -nfiles=$2 -nselect=$3 + +exit + +swift -tc.file tc.local -sites.file sites.local.xml modis2.swift -landtype=$1 -nfiles=$2 -nselect=$3 Property changes on: SwiftApps/modis/rundemo2.sh ___________________________________________________________________ Added: svn:executable + * Added: SwiftApps/modis/rundemop1.sh =================================================================== --- SwiftApps/modis/rundemop1.sh (rev 0) +++ SwiftApps/modis/rundemop1.sh 2011-06-27 19:30:37 UTC (rev 4697) @@ -0,0 +1 @@ +swift -tc.file tc -sites.file sites.xml modisp1.swift -nselect=9 -nfiles=100 -landtype=13 Property changes on: SwiftApps/modis/rundemop1.sh ___________________________________________________________________ Added: svn:executable + * Added: SwiftApps/modis/sico.xml =================================================================== --- SwiftApps/modis/sico.xml (rev 0) +++ SwiftApps/modis/sico.xml 2011-06-27 19:30:37 UTC (rev 4697) @@ -0,0 +1,17 @@ + + + + + + passive + + 6 + .07 + 10000 + + + /home/wilde/swiftwork + + + + Added: SwiftApps/modis/sites.local.xml =================================================================== --- SwiftApps/modis/sites.local.xml (rev 0) +++ SwiftApps/modis/sites.local.xml 2011-06-27 19:30:37 UTC (rev 4697) @@ -0,0 +1,11 @@ + + + + + .31 + 10000 + + /home/wilde/swift/lab/go/work + + + Added: SwiftApps/modis/sites.xml =================================================================== --- SwiftApps/modis/sites.xml (rev 0) +++ SwiftApps/modis/sites.xml 2011-06-27 19:30:37 UTC (rev 4697) @@ -0,0 +1,38 @@ + + + + + .31 + 10000 + + /home/wilde/swift/lab/go/work + + + + + + /home/wilde/swiftwork + + + + + + 1 + 3600 + 00:02:00 + 64 + 1 + 1 + fast + + .63 + 10000 + + + /home/wilde/swift/lab/go/work + /scratch/local/wilde + + + + + Added: SwiftApps/modis/sites.xml.pas.coasters =================================================================== --- SwiftApps/modis/sites.xml.pas.coasters (rev 0) +++ SwiftApps/modis/sites.xml.pas.coasters 2011-06-27 19:30:37 UTC (rev 4697) @@ -0,0 +1,28 @@ + + + + + + /home/wilde/swiftwork + + + + + + 1 + 3600 + 00:02:00 + 64 + 1 + 1 + fast + + .63 + 10000 + + + /home/wilde/swiftwork + /scratch/local/wilde + + + Added: SwiftApps/modis/tc =================================================================== --- SwiftApps/modis/tc (rev 0) +++ SwiftApps/modis/tc 2011-06-27 19:30:37 UTC (rev 4697) @@ -0,0 +1,34 @@ +#This is the transformation catalog. +# +#It comes pre-configured with a number of simple transformations with +#paths that are likely to work on a linux box. However, on some systems, +#the paths to these executables will be different (for example, sometimes +#some of these programs are found in /usr/bin rather than in /bin) +# +#NOTE WELL: fields in this file must be separated by tabs, not spaces; and +#there must be no trailing whitespace at the end of each line. +# +# site transformation path obsolete fields for compatibility + +localhost echo /bin/echo null null null +localhost cat /bin/cat null null null +localhost ls /bin/ls null null null +localhost grep /bin/grep null null null +localhost sort /bin/sort null null null +localhost paste /bin/paste null null null +localhost pwd /bin/pwd null null null + +# For cluster usage + +pbs convert /usr/bin/convert null null null +pbs getlanduse /home/wilde/swift/demo/modis/bin/getlanduse.sh null null null +pbs analyzelanduse /home/wilde/swift/demo/modis/bin/analyzelandusep1.sh null null null +pbs colormodis /home/wilde/swift/demo/modis/bin/colormodis.sh null null null +pbs assemble /home/wilde/swift/demo/modis/bin/assemble.sh null null null + +# For localhost testing + +#localhost convert /usr/bin/convert null null null +#localhost getlanduse /home/wilde/bigdata/bin/getlanduse.sh null null null +#localhost analyzelanduse /home/wilde/bigdata/bin/analyzelanduse.sh null null null +#localhost colormodis /home/wilde/bigdata/bin/colormodis.sh null null null Added: SwiftApps/modis/tc.local =================================================================== --- SwiftApps/modis/tc.local (rev 0) +++ SwiftApps/modis/tc.local 2011-06-27 19:30:37 UTC (rev 4697) @@ -0,0 +1,34 @@ +#This is the transformation catalog. +# +#It comes pre-configured with a number of simple transformations with +#paths that are likely to work on a linux box. However, on some systems, +#the paths to these executables will be different (for example, sometimes +#some of these programs are found in /usr/bin rather than in /bin) +# +#NOTE WELL: fields in this file must be separated by tabs, not spaces; and +#there must be no trailing whitespace at the end of each line. +# +# site transformation path obsolete fields for compatibility + +localhost echo /bin/echo null null null +localhost cat /bin/cat null null null +localhost ls /bin/ls null null null +localhost grep /bin/grep null null null +localhost sort /bin/sort null null null +localhost paste /bin/paste null null null +localhost pwd /bin/pwd null null null + +# For cluster usage + +#pbs getlanduse /home/wilde/swift/demo/modis/bin/getlanduse.sh null null null +#pbs analyzelanduse /home/wilde/swift/demo/modis/bin/analyzelanduse.sh null null null +#pbs colormodis /home/wilde/swift/demo/modis/bin/colormodis.sh null null null +#pbs assemble /home/wilde/swift/demo/modis/bin/assemble.sh null null null + +# For localhost testing + +localhost getlanduse /home/wilde/swift/demo/modis/bin/getlanduse.sh null null null +localhost analyzelanduse /home/wilde/swift/demo/modis/bin/analyzelanduse2.sh null null null +localhost colormodis /home/wilde/swift/demo/modis/bin/colormodis.sh null null null +localhost assemble /home/wilde/swift/demo/modis/bin/assemble2.sh null null null +localhost markmap /home/wilde/swift/demo/modis/bin/markmap.sh null null null Added: SwiftApps/modis/tc.pbs =================================================================== --- SwiftApps/modis/tc.pbs (rev 0) +++ SwiftApps/modis/tc.pbs 2011-06-27 19:30:37 UTC (rev 4697) @@ -0,0 +1,35 @@ +#This is the transformation catalog. +# +#It comes pre-configured with a number of simple transformations with +#paths that are likely to work on a linux box. However, on some systems, +#the paths to these executables will be different (for example, sometimes +#some of these programs are found in /usr/bin rather than in /bin) +# +#NOTE WELL: fields in this file must be separated by tabs, not spaces; and +#there must be no trailing whitespace at the end of each line. +# +# site transformation path obsolete fields for compatibility + +localhost echo /bin/echo null null null +localhost cat /bin/cat null null null +localhost ls /bin/ls null null null +localhost grep /bin/grep null null null +localhost sort /bin/sort null null null +localhost paste /bin/paste null null null +localhost pwd /bin/pwd null null null + +# For cluster usage + +pbs convert /usr/bin/convert null null null +pbs getlanduse /home/wilde/swift/demo/modis/bin/getlanduse.sh null null null +pbs analyzelanduse /home/wilde/swift/demo/modis/bin/analyzelanduse2.sh null null null +pbs colormodis /home/wilde/swift/demo/modis/bin/colormodis.sh null null null +pbs assemble /home/wilde/swift/demo/modis/bin/assemble2.sh null null null +pbs markmap /home/wilde/swift/demo/modis/bin/markmap.sh null null null + +# For localhost testing + +#localhost convert /usr/bin/convert null null null +#localhost getlanduse /home/wilde/bigdata/bin/getlanduse.sh null null null +#localhost analyzelanduse /home/wilde/bigdata/bin/analyzelanduse.sh null null null +#localhost colormodis /home/wilde/bigdata/bin/colormodis.sh null null null Added: SwiftApps/modis/white.png =================================================================== (Binary files differ) Property changes on: SwiftApps/modis/white.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream From achavez at ci.uchicago.edu Tue Jun 28 12:45:59 2011 From: achavez at ci.uchicago.edu (achavez at ci.uchicago.edu) Date: Tue, 28 Jun 2011 12:45:59 -0500 (CDT) Subject: [Swift-commit] r4698 - trunk/tests Message-ID: <20110628174559.118A19CCC5@svn.ci.uchicago.edu> Author: achavez Date: 2011-06-28 12:45:58 -0500 (Tue, 28 Jun 2011) New Revision: 4698 Modified: trunk/tests/suite.sh Log: most updated suite.sh file Modified: trunk/tests/suite.sh =================================================================== --- trunk/tests/suite.sh 2011-06-27 19:30:37 UTC (rev 4697) +++ trunk/tests/suite.sh 2011-06-28 17:45:58 UTC (rev 4698) @@ -746,7 +746,6 @@ html_~td fi } - # Execute shell test case w/ setup, check, clean script_test_case() { SHELLSCRIPT=$1 From achavez at ci.uchicago.edu Tue Jun 28 14:52:22 2011 From: achavez at ci.uchicago.edu (achavez at ci.uchicago.edu) Date: Tue, 28 Jun 2011 14:52:22 -0500 (CDT) Subject: [Swift-commit] r4700 - trunk/tests/groups Message-ID: <20110628195222.9AA779CCCB@svn.ci.uchicago.edu> Author: achavez Date: 2011-06-28 14:52:22 -0500 (Tue, 28 Jun 2011) New Revision: 4700 Modified: trunk/tests/groups/group-all-local.sh Log: Newest groups added Modified: trunk/tests/groups/group-all-local.sh =================================================================== --- trunk/tests/groups/group-all-local.sh 2011-06-28 17:53:57 UTC (rev 4699) +++ trunk/tests/groups/group-all-local.sh 2011-06-28 19:52:22 UTC (rev 4700) @@ -1,22 +1,25 @@ # GROUPLIST definition to run all local tests -GROUPLIST=( $TESTDIR/language-behaviour \ - # $TESTDIR/language/working \ - # $TESTDIR/local \ - # $TESTDIR/language/should-not-work \ +GROUPLIST=( $TESTDIR/language/working \ + $TESTDIR/local \ + $TESTDIR/language/should-not-work \ # $TESTDIR/cdm \ # $TESTDIR/cdm/ps \ # $TESTDIR/cdm/star $TESTDIR/language-behaviour/arrays \ - $TESTDIR/language-behaviour/mappers \ + $TESTDIR/language-behaviour/broken \ + $TESTDIR/language-behaviour/compounds \ + $TESTDIR/language-behaviour/control_structures \ $TESTDIR/language-behaviour/IO \ $TESTDIR/language-behaviour/iterators \ $TESTDIR/language-behaviour/logic \ - $TESTDIR/language-behaviour/control_structures \ - $TESTDIR/language-behaviour/procedures \ - $TESTDIR/language-behaviour/arithmetic \ + $TESTDIR/language-behaviour/mappers \ + $TESTDIR/language-behaviour/math \ + $TESTDIR/language-behaviour/params \ + $TESTDIR/language-behaviour/procedures \ $TESTDIR/language-behaviour/strings \ + $TESTDIR/language-behaviour/variables \ $TESTDIR/documentation/ \ # $TESTDIR/cdm/ps/pinned # $TESTDIR/site/intrepid From achavez at ci.uchicago.edu Wed Jun 29 08:51:34 2011 From: achavez at ci.uchicago.edu (achavez at ci.uchicago.edu) Date: Wed, 29 Jun 2011 08:51:34 -0500 (CDT) Subject: [Swift-commit] r4701 - trunk/tests/language-behaviour Message-ID: <20110629135134.BC82B9CCA2@svn.ci.uchicago.edu> Author: achavez Date: 2011-06-29 08:51:34 -0500 (Wed, 29 Jun 2011) New Revision: 4701 Added: trunk/tests/language-behaviour/foreach/ Log: Adding subfolder From achavez at ci.uchicago.edu Wed Jun 29 08:51:59 2011 From: achavez at ci.uchicago.edu (achavez at ci.uchicago.edu) Date: Wed, 29 Jun 2011 08:51:59 -0500 (CDT) Subject: [Swift-commit] r4702 - trunk/tests/language-behaviour/foreach Message-ID: <20110629135159.3BC5C9CCA2@svn.ci.uchicago.edu> Author: achavez Date: 2011-06-29 08:51:59 -0500 (Wed, 29 Jun 2011) New Revision: 4702 Added: trunk/tests/language-behaviour/foreach/066-many.check.sh trunk/tests/language-behaviour/foreach/066-many.clean.sh trunk/tests/language-behaviour/foreach/066-many.setup.sh trunk/tests/language-behaviour/foreach/066-many.swift trunk/tests/language-behaviour/foreach/066-many.time trunk/tests/language-behaviour/foreach/066-many.timeout trunk/tests/language-behaviour/foreach/086-iterate-concurrent.check.sh trunk/tests/language-behaviour/foreach/086-iterate-concurrent.clean.sh trunk/tests/language-behaviour/foreach/086-iterate-concurrent.setup.sh trunk/tests/language-behaviour/foreach/086-iterate-concurrent.swift trunk/tests/language-behaviour/foreach/087-iterate-previous.check.sh trunk/tests/language-behaviour/foreach/087-iterate-previous.clean.sh trunk/tests/language-behaviour/foreach/087-iterate-previous.setup.sh trunk/tests/language-behaviour/foreach/087-iterate-previous.swift Log: Adding subfolder Copied: trunk/tests/language-behaviour/foreach/066-many.check.sh (from rev 4653, trunk/tests/language-behaviour/066-many.check.sh) =================================================================== --- trunk/tests/language-behaviour/foreach/066-many.check.sh (rev 0) +++ trunk/tests/language-behaviour/foreach/066-many.check.sh 2011-06-29 13:51:59 UTC (rev 4702) @@ -0,0 +1,7 @@ +#!/bin/bash + +set -x + +[ -f nop ] || exit 1 + +exit 0 Copied: trunk/tests/language-behaviour/foreach/066-many.clean.sh (from rev 4653, trunk/tests/language-behaviour/066-many.clean.sh) =================================================================== --- trunk/tests/language-behaviour/foreach/066-many.clean.sh (rev 0) +++ trunk/tests/language-behaviour/foreach/066-many.clean.sh 2011-06-29 13:51:59 UTC (rev 4702) @@ -0,0 +1,7 @@ +#!/bin/bash + +set -x + +rm -v nop || exit 1 + +exit 0 Copied: trunk/tests/language-behaviour/foreach/066-many.setup.sh (from rev 4653, trunk/tests/language-behaviour/066-many.setup.sh) =================================================================== --- trunk/tests/language-behaviour/foreach/066-many.setup.sh (rev 0) +++ trunk/tests/language-behaviour/foreach/066-many.setup.sh 2011-06-29 13:51:59 UTC (rev 4702) @@ -0,0 +1,7 @@ +#!/bin/bash + +set -x + +touch nop || exit 1 + +exit 0 Copied: trunk/tests/language-behaviour/foreach/066-many.swift (from rev 4653, trunk/tests/language-behaviour/066-many.swift) =================================================================== --- trunk/tests/language-behaviour/foreach/066-many.swift (rev 0) +++ trunk/tests/language-behaviour/foreach/066-many.swift 2011-06-29 13:51:59 UTC (rev 4702) @@ -0,0 +1,11 @@ +type file; + +app p(file f) +{ + touch @f; +} + +foreach i in [1:3000] { + file f<"nop">; + p(f); +} Copied: trunk/tests/language-behaviour/foreach/066-many.time (from rev 4653, trunk/tests/language-behaviour/066-many.time) =================================================================== --- trunk/tests/language-behaviour/foreach/066-many.time (rev 0) +++ trunk/tests/language-behaviour/foreach/066-many.time 2011-06-29 13:51:59 UTC (rev 4702) @@ -0,0 +1 @@ +300 Copied: trunk/tests/language-behaviour/foreach/066-many.timeout (from rev 4653, trunk/tests/language-behaviour/066-many.timeout) =================================================================== --- trunk/tests/language-behaviour/foreach/066-many.timeout (rev 0) +++ trunk/tests/language-behaviour/foreach/066-many.timeout 2011-06-29 13:51:59 UTC (rev 4702) @@ -0,0 +1 @@ +600 Copied: trunk/tests/language-behaviour/foreach/086-iterate-concurrent.check.sh (from rev 4698, trunk/tests/language-behaviour/086-iterate-concurrent.check.sh) =================================================================== --- trunk/tests/language-behaviour/foreach/086-iterate-concurrent.check.sh (rev 0) +++ trunk/tests/language-behaviour/foreach/086-iterate-concurrent.check.sh 2011-06-29 13:51:59 UTC (rev 4702) @@ -0,0 +1,8 @@ +#!/bin/sh + +set -x + +LINES=$( cat _concurrent/outfile-* | grep -c hello ) +[[ ${LINES} == 12 ]] || exit 1 + +exit 0 Copied: trunk/tests/language-behaviour/foreach/086-iterate-concurrent.clean.sh (from rev 4698, trunk/tests/language-behaviour/086-iterate-concurrent.clean.sh) =================================================================== --- trunk/tests/language-behaviour/foreach/086-iterate-concurrent.clean.sh (rev 0) +++ trunk/tests/language-behaviour/foreach/086-iterate-concurrent.clean.sh 2011-06-29 13:51:59 UTC (rev 4702) @@ -0,0 +1,7 @@ +#!/bin/sh + +set -x + +rm -rfv _concurrent + +exit 0 Copied: trunk/tests/language-behaviour/foreach/086-iterate-concurrent.setup.sh (from rev 4698, trunk/tests/language-behaviour/086-iterate-concurrent.setup.sh) =================================================================== --- trunk/tests/language-behaviour/foreach/086-iterate-concurrent.setup.sh (rev 0) +++ trunk/tests/language-behaviour/foreach/086-iterate-concurrent.setup.sh 2011-06-29 13:51:59 UTC (rev 4702) @@ -0,0 +1,7 @@ +#!/bin/sh + +set -x + +rm -rfv _concurrent + +exit 0 Copied: trunk/tests/language-behaviour/foreach/086-iterate-concurrent.swift (from rev 4653, trunk/tests/language-behaviour/086-iterate-concurrent.swift) =================================================================== --- trunk/tests/language-behaviour/foreach/086-iterate-concurrent.swift (rev 0) +++ trunk/tests/language-behaviour/foreach/086-iterate-concurrent.swift 2011-06-29 13:51:59 UTC (rev 4702) @@ -0,0 +1,12 @@ +type messagefile; + +app (messagefile t) greeting() { + echo "hello" stdout=@filename(t); +} + +iterate i { + messagefile outfile; + outfile = greeting(); +} until(i>10); + + Copied: trunk/tests/language-behaviour/foreach/087-iterate-previous.check.sh (from rev 4698, trunk/tests/language-behaviour/087-iterate-previous.check.sh) =================================================================== --- trunk/tests/language-behaviour/foreach/087-iterate-previous.check.sh (rev 0) +++ trunk/tests/language-behaviour/foreach/087-iterate-previous.check.sh 2011-06-29 13:51:59 UTC (rev 4702) @@ -0,0 +1,8 @@ +#!/bin/sh + +set -x + +LINES=$( cat file-*.txt | grep -c HOWDY ) +[[ ${LINES} == 7 ]] || exit 1 + +exit 0 Copied: trunk/tests/language-behaviour/foreach/087-iterate-previous.clean.sh (from rev 4698, trunk/tests/language-behaviour/087-iterate-previous.clean.sh) =================================================================== --- trunk/tests/language-behaviour/foreach/087-iterate-previous.clean.sh (rev 0) +++ trunk/tests/language-behaviour/foreach/087-iterate-previous.clean.sh 2011-06-29 13:51:59 UTC (rev 4702) @@ -0,0 +1,7 @@ +#!/bin/sh + +set -x + +rm -fv file-*.txt + +exit 0 Copied: trunk/tests/language-behaviour/foreach/087-iterate-previous.setup.sh (from rev 4698, trunk/tests/language-behaviour/087-iterate-previous.setup.sh) =================================================================== --- trunk/tests/language-behaviour/foreach/087-iterate-previous.setup.sh (rev 0) +++ trunk/tests/language-behaviour/foreach/087-iterate-previous.setup.sh 2011-06-29 13:51:59 UTC (rev 4702) @@ -0,0 +1,7 @@ +#!/bin/sh + +set -x + +echo HOWDY > file-0.txt + +exit 0 Copied: trunk/tests/language-behaviour/foreach/087-iterate-previous.swift (from rev 4698, trunk/tests/language-behaviour/087-iterate-previous.swift) =================================================================== --- trunk/tests/language-behaviour/foreach/087-iterate-previous.swift (rev 0) +++ trunk/tests/language-behaviour/foreach/087-iterate-previous.swift 2011-06-29 13:51:59 UTC (rev 4702) @@ -0,0 +1,16 @@ +type file; + +app (file o) copy(file i) { + cp @i @o; +} + +file input<"file-0.txt">; + +iterate i { + string si = @strcat("file-",i,".txt"); + int j = i+1; + string sj = @strcat("file-",j,".txt"); + file fi; + file fj; + fj = copy(fi); +} until(i==5); From achavez at ci.uchicago.edu Wed Jun 29 08:54:28 2011 From: achavez at ci.uchicago.edu (achavez at ci.uchicago.edu) Date: Wed, 29 Jun 2011 08:54:28 -0500 (CDT) Subject: [Swift-commit] r4703 - trunk/tests/language-behaviour Message-ID: <20110629135428.56E299CCA2@svn.ci.uchicago.edu> Author: achavez Date: 2011-06-29 08:54:28 -0500 (Wed, 29 Jun 2011) New Revision: 4703 Removed: trunk/tests/language-behaviour/foreach/ Log: Merged subcategories foreach and iterators From davidk at ci.uchicago.edu Wed Jun 29 09:06:02 2011 From: davidk at ci.uchicago.edu (davidk at ci.uchicago.edu) Date: Wed, 29 Jun 2011 09:06:02 -0500 (CDT) Subject: [Swift-commit] r4704 - www/support Message-ID: <20110629140602.436239CCBF@svn.ci.uchicago.edu> Author: davidk Date: 2011-06-29 09:06:02 -0500 (Wed, 29 Jun 2011) New Revision: 4704 Modified: www/support/index.php Log: Previous links to swift-user and swift-devel mailing lists were broken Updated to new URLs Modified: www/support/index.php =================================================================== --- www/support/index.php 2011-06-29 13:54:28 UTC (rev 4703) +++ www/support/index.php 2011-06-29 14:06:02 UTC (rev 4704) @@ -40,10 +40,10 @@ swift-user
    @@ -1178,7 +1178,7 @@

    Modified: SwiftApps/Montage/docs/API.pdf =================================================================== --- SwiftApps/Montage/docs/API.pdf 2011-06-16 22:56:36 UTC (rev 4626) +++ SwiftApps/Montage/docs/API.pdf 2011-06-17 02:19:13 UTC (rev 4627) @@ -491,21 +491,21 @@ /ProcSet [ /PDF /Text ] >> endobj 183 0 obj << -/Length 1788 +/Length 1794 /Filter /FlateDecode >> stream -x??YKs?6??W?H??|NO?4I???i?[???$3?H???????X?")?????A`??owqo?q????b??M??????????$?b/?1S??+??s????? ??KU??F????????; ?D -  PH?J??!??#N??D?m?z1?k&? -? /?X???`??r;???{+????,H????z??L???w3?}??(| ???d?!??? E?8B?&???????}?????\?E??[????LX??]??Ti?S???? ?????z????????:??t???U??????mU_?vt?F????????f??ri)l?le?????j?/??>n?&????p -???};????r. ????Y??'|?0??????????>?\?U??Y????R?yhZ???#??zq?:?b?(1tTn?mF?*k3`XUs?F5s????B4j?u??z?a???=0?H] c????^D????e??Hr0y5<-?G8?? ??????.???e????%?j??u??V?,?f`-??x?~?j!?@?U?(??ow?????$??[?#???^???*iz[???pSE-H8~'??7 ?5????G??AM?????\?pe??L????^?f@??E}?????d??vw??a -01;?v ??.??0s|?T@??X????1r??WU{??II %,x@?;??? #S???\???x????n?(A???c"?|????[`????????pM^???@??s???w?3????r-[cd?N???f????????`=???F?(N!?m?F??ri?F???i:?x?g?i?????a??O/a,????r2?8???????|?i???n#?Y?.?(?'????4??G??????0)??tc?oV?:v_&2'???w???????Q03r ?`?????????k???i??d????a -p???@g? ;?=?5?D}??%?u? -?Q??y?Q?xd\ ???`RxG?z????e at mz???0fZ{??R???#???:??>???2???????p)'?=?"V???0??cB`???zch??S? Q??'??>@?xJ?x?*?'?km??t???L????p9$??]d2??Z???U???7??@?b??e?(?@??y?????-9??#H???????\?8???$ppO???5????fVI??'??H?d??? ??3{:?U???sA?????V?`????jB2????Q???@4I??z??[X??j??m?-??m?.?????zGR?=y??bj?????N??????(S?]?O???x9??n???Z?t.?e??'???A???X????????Z??@?:ma??? -???5&>|(???%?4?l??.?8U8?~5j|?Q??\?fHj?? 4?????2|??W????@?:Q??w?M? ?o?]?w?????1*??S?jl?jD????rB7Q?????0???????#' ???>"?O?'?>#??E???=#?p??????s??$#S6)V??rD????H?F?q??^??O??wz????????????:???7'"NH,??'D???pq?????q3{:????[????u?O??L ??@_ -?6O??#S???????1}?$6???%??n??=??? -???'??iOwf??}*????t??yu?w???<:,/???. -??????E?~Y???^??s?"x??B?r?~Es??????x?~??~??f?& +x??Y?s?6 ?_???w K?%???[???m?????Sl?Q+K?$7???)K???u??C ? ???????W???7?R??@y????b/?1???+??}????Eq???l??????????{` ?(? ?8$?w!K??XX'? j.??^??? ?{??S?_? +?x?-?????o?=??4?? ???g?T?/????3n??G +<?T?Er?C?"??D(?[?}??s?????C???????;{????w$,????6o?Ti?S???? ?????z??????]??v?n??" e???F????/y;?a?K]gm^n?C??u??6u??eM[We???YA?U??K??$???a?v??????<(l??fm???#s??S|???Bo?UCc:???[MSd1???}?W%Mo??Q?????N4$W@k?E?Awli???Vk?z??2????????^?f??J????G 2-??()??????"F!4??8??^?? ?????!?9V!?c?_?VOD??^U???B??N%???\?;??? cS??? +??lk|H?Y?km?????G`?????????&/i?-????\????]??9?P4b?ek,????v??) +??z. ???j?B?T2??d?/??!a?????]?{`?}?0?8Az`???? &????d?q?q????1G??M??B???8J]???Ojwa??l1W???????@I??tcpV?:vd&6'???w??[????Q0'f?F?:???Ehu ??;??a??f?O-??????`??A????A.?????!6??I?? U??2???Pa?@?xG?z????"e?mz??Q??vb,??\???#???:f?>/?? ???????p)'??=?? +???0??cF`f?]?1???????B??????k??xR???u&O|??b#?*(?%????vHYre? ?T???1?3?}i=ro~??c??????????Un?Z????W??!^#?;??Y?IBE?Q?????4T???f?I?$?'??C??@=????xP?8%???o??Q-c?B<?e?\?T?.H]???I?5???vHoa?D? ?[???l7$?6???n{[R?=y??bj???????@]??? ??? ?#???|a? ?ww???\??7?/H??s?/?r???$?,??:?i ;??d????1??S?`??=??z;???????#??b?????|??5???3??|?N?????? +>???r??h????c??($??j??&?????x???????~, +????~Q? +P??? 9?*?????U%?? endstream endobj 182 0 obj << @@ -1604,136 +1604,133 @@ >> endobj 331 0 obj << /Length1 1630 -/Length2 15107 +/Length2 15197 /Length3 0 -/Length 15952 +/Length 16037 /Filter /FlateDecode >> stream -x???ctf]?&???m?N?N*?c??$?b??+?m'????o?>=???????c?5qM\s????U??M???v???? L<y #'e;y;n9ze?? ?K?GN.?4t???3t?4?&1?1?????? -G???p?03wP?)kP?????????h?????b???wCgG w??W?L????t ?s?c?? ?????\?-??? ????)R6aY1;? -????Z?&{?G????*?a?@?)?M~?}????????"??8'h0u?? [??Q??%?uR" +-???????i??z???N'?Xw?/?M$9?;?c7?? ?p???K?*???? -???k^`d5l\E?? ??:!???(?W?????j?? ??4f?#?????????4!-????+???d?A? )???^??????d??|???* ?h???DC?>/?x?$A? g?5Q????U?3??_??h?>?W???|??`?eu??u??d?????Y3????8S*0Da????????????u"?S???@?0?f?4{9D{^??Zi.?'EOF??????/??? 3????&???????t_???;k?l???y@???cO????? -?????0?RplE?t??C?ho?b_?{.?*L????bI?"??m -???ROG??8l?I? -??? ;????J5fN?????w???7??????x=N??k??>uri?`#?,???qp?#X?k?i??R|W 9S?{?&???w???????SP #C\I???#??}d???????[???e???(r}Cl!8Yzn?)|? -;?????g?7?C????9??;J???????*?Y?IB?nShI???e?q -?,jw?p?+}y????????i???8????????'U??8????O????B??[?zJ -????V)~(???????fG;??W?U F??????%??"pI??OC?-V??m??3F6??wI?R ???5f???HMD??r'???1?9?l??Z&I??JW??u??t??M??Et~???=A??)m?????,?$????F?$?(?????(^????G??b?L?^X??J??wJ? ?/???cu?474??????{8y???H????????J?l?@1_a\?YMH?????rT????y??=??Q?????????.szQ??|?_?'??(x?????q???+??????NK?D????A?t]??0m?7?]??????\?_ .??o???+???U??nbI,I??l^?F????? ? z{r??!X{??H??|?3?'????c|??k???U+K}ub?7?W&??.????D??f?F?+?*n??a?? `|????)??????H?p/??c_y??????a'8??????.??????wQs`???????V???e?h[??L??i??e?????M???iahy}uO^?????^?U\I+????@?2%?Q?O+:???2??c??x -k-?:z|rZ?2z "?P??*o?P?tIG? ?y??????%??p??5???D???o?|]2????HaT?'S?N?w2?h?????)?^i?{8 -7?A???u??FL??2??*?vLk?w?? ????6?y??????Z?D??k???e+?G?????z?WD[V?*lJI???t???a[???54$E}tS??'??D??.??MhM??N?.o.?"??_?D??Gb????f?.M??-? ??h2???)???????@?m??72?? ?[????#??l >e???Z?g??U??G????m????????k?E?[|?;V?}&??( ?=???g?^w???e??`a?????+>?]?????C?c?{?.T???,?"???TY -???h?U???O????t????"n?FA?S;?S??E@???????7Z?????^?P??????%(?7Ha?6!?r-D?? ?b?_*???N?(???,???"`G -??m????#??F8Z?n??\?Vkv?.??Y??Q?[]u?T?Rz4?)y??'???v?m?fj?D"?o?y????+?uo|??m?]??V??N????\?~aCuW?????"?"?9;??????? 7??`??z???P?????Uv?c??fU??s~???m???85??14? y??????x3/7????c???l?%<$ {?H?-rw/>e????RfO"*?0???]??#;E?w??&;??qG?IGCI?"nr????m?(F&o???-??z#,??D}/^.?f?%??Y???Q=???? =[Q??H??????????Q?? -?:Y?H??%q%?e?"???????!eZ??)Y'???^WEY3?A2?`?G????W-?$?%]W?;?[??????e???!,????gxv*??A?aZ???b?-)./??s?V????"P?@?6S??G???8?v,rG?:?D$?Y{;?=? - ????&lCd?q???|??i???????Xo??R??? ?u?m??]T?????????tf:??????=9!?ZeE?O?w -N??? ?????2j?8i?5.?1&XKMV?>bv%?_Y? -U?????y?Ey???9??k LU?Nwl??#0 -c?WB?X?|/[/? -,v??Y??9?S?z,_=Z?[A ???}@\??{N???\?3????L??!Bc\?%rI ?Z.n??????j?E??r?VJ? >BY?|???Zg|???!~????????c[\?Y_?;h???RPb\Sx???U??7?X???????[9?P1?|?Z'??????????\?j????p??g?A?$?|?J?????_?"?(P$u???E#?q????L?Q??|k??D?WI?2?? =??+^a? -??m?????p?$?? ~?????n1Zg??????7\???z???T???g???_d?!A:X??e?x?9???JAk-??????.A??d;xW?i5???+[?g??3??U??? -?J??Q? ?? -???)t??#?]?S|?Z?P??l -?????????@s???b??WwdEj??t5q??TP? {@???a?3?]?cN&U?Y\S?? ?? ???{???az?#?B?M? l???h=g?"?x???????mp??Q????t?????????ZKR,b?/w$?`? -??U??1^???!?%??L?fE?????e???\o???(Z???0?8fP?P??}q)?^7?4PZoY$??????g -??)??'???t???n????a?n^2Uv??$???%?!?q3?f%z??=?1 ?.OM??????N??T:3"+RL_;?Se?#?#;??y8??p??&]????Kca&Z?+3?? ?????????????kO3?h? ?`?X}90ivp???T?S????H??9 V?8?x?f?1??w ?xkV?????[V??F???B?Cs??l???n R $f?V;??'T?Z>?????l??~?{?e?????????? -???m[??????U6??g????????"??bs=l? K???????~?Xm_+P? -X?U?G}?P}?7??z?????????? -????l??Cb?? I?4????iP??0D???? ?d|d???I??~?~m???4kBH3&+?{???;????9??4?DU?|?Z???Q?h6?pW???[;?I?xa?;F*P?? -{?(??x?????Z-?g@????v?%G???uW??????q <????NK?j?2J,???B?%G{?`P'?V?K?]Tw`E????(??&?1?=???\?c?X5E??????K$6??H??:?3f r???5k???????9?'?Ek??'??bnb????????v?#?_C%'?D? ?q??W???a?????????M?p?T??n -????)????R`??f??ut????D{?? Wl??S????r !?????}|???????>"?l??,??>L(??????I?%??)????????????? -??????!?N2?,?z??B8%??:???;b{J????k?) x??+?5?e:o?a?w5a??Y???~???o?. s?0Q?&??J0^?J??Tr?|_?)M^?d?y?????7??$?J$?j??6?????{?Y????%??8j?? ??@AA] ??3 ?5?2????????V??^7???U????? ?v????M -s3-b#?C?CQa#?"???l?&,? ??1:O-5_o"?2 H???~?G??m?aO??"x>???.????????Er?t?w]!U???o???6?][???'?%nOx?X?t???V???"???b??BHK[????H8mr???/,?????Tq?M{I?Y?4N??y ?F?? ~?F?????a"?^?[H? U?H??????b$x?#???r???B?=?E_?a??|???\6>J - ?NL?????l???????? *v??/<;3???????pzq?;???DiN?WL????oc ????.G{Oh???}?V??v -?@???nMC??????T( ?N?T?cR?L???D?we??q?k??'??????`??lmF?????,F??yY????????A ???/ ?D??>????=2(?k?6???[?? -?????4?v|???6?1???k?B???u0enS?kY??,??\?????B???;H?n???|????X\?Q???l???WN?]?bgE?)?#?=?T?[8l?rA_D-??q+l:?tO?bkX"???x ?4U?? -y???] ??d?4??Y??0? ?k8??Q??"\?5w?])??p?o??%{?qA[????{Pt??S???WNs?G?????\???????_>?I??D ????N??? 0??E)??? -????1??6?]~????mfr??????a??N3lr???iY?OIN????FV-??K??:k?S???@?j?n?9?C??????d??Y??6???CE?j|?+9?a??t??Bu~???2?v?r\1??S53?0 ????D-?????^?d???Z2p??????=?G+F?,?6???y???$!??9??*DQGw??X?_????w?M???????B????5 ?V&?B???s?h{?g7G ??=??`??"(y~K?9t?|0N????\???)?q??c???H?3f??y?????? zN2??? -M??????xaYd?V??y0j ?x;p?!?????X?.+?y????????u???wm?U????'?:P??C(????5/k8.?q?!?.???$"*?E??V5??D??D-h?R???U?;?????Z+CV????A%?$???n[L? ap??o^C?@:?d-5?j?H?"}?G?=?,f?-Ua? ??}????R3???kE??\?f??">h?'??9*X(;????? ?ts?42l7f??7??Yb9?????????"YX??g@?2j?????l?[F??????F7?f??S[?4H??\??????;$4=a?}J???;??R????" -^?rp???\??G???B??????b?d??q?/?`??????| ??Y?F??q??ZG?Sq?q??9??{???)??C?? ?r!("?0??r?zfU???c?V?b1?d????z?G5kN? ???n???W???\?L? r??-EY^?i>y"?K[????6)ue?C?i?:????6??????-.?.???^e!G?????0??4mDr%:*YGz???Gj?????bm;M?s -x??*?,?V??XX?*??`S ???AJ"C9B?2?p%??A?E?4hA???F?h???? ??2???fU? -o????0?u?Dub??????}?I?B??^? -?5???\?:t?94?Q?M[?^?Q??;????]vI??s5??ajg/?H???K??W+??V??hf?????.?O+??????5v+?\???Os?W?s?u??F\?bax?l?P`????7???????./I??*wi5??-??mA?|?a??0???8?Q-/s?4:)?O????&-????D??w?4%=??+????R?Q?k??o??t?t???$?o2?B??PjH;p?/?GP??}????W at e}m????/?????[?o???a|guc7??????????L??????[??ZmdG' -\k????(~???LR?W+?v;/??F{g?Mi4 s?xar?r??X??&???^????E?0?mzf?;~??D?.L?R???W???W???wL??ql??e??N???(?>}RS?y??K???M??????%?J?\GN????K???????eB,?p?g????n?? ???g?????i?i?6?????+?????J???-???R5???6??????Gw8q??p/?r -V?\???'?????<7???????c>?e?L???w???9K?u6???OR???.??j????&n????[c?"????r??? -:??c?6#8 [+ IqtISA'?6k??O|??l"? ?+n>?a?B??h]Wk{??? }?~??B??8t??u???V????r6??????z??mfH???c??w"????,?J???V??'?? ??&??BF???r?r4?Y?V? -??????'??\$P??F??Q6*??^?gs?f!|??/???0?|????C????H?^?-o?D? ???S*??6???;D{W?CQfh??S7u????e??? -??rF?}Q????5W??? -5???YJ;RD?%?V???{?p??]???'??????G??????0N-?F?Q??|?mk$Z?HI???W|s>9?????;R56J?|?M???BZ?H???_!TUc?pG??mb@^?%??p"????w?(Gr ?Q???eGO???3?`?@?`Z??????N??+C8?? ???mW?&??+?dl?C? ?DX8?????^?? -:5??,?}(???S?????J"??f?X??3??Ky???0??'1???G????U?36?MJn0?+ ???McB,???>w9??3??^ ?????#????? ]6OM?45?????pWI*?*?(@1??X??[????T>??/8???4?NV?E???????=?g?g ??M?Z-Z?`%?"??????#??Z????????5??:??L9?ig?????]?F? -?'M?M??B?!/r??x??????Yb?????E???????l??)!v?m+[y??m?????7??A?D?L??????'??~? ??|bY?I{?1%\?TB??T5??O? -F?y?(c???:?y???Bb -???% b?j? b??L?H?????h????.?!??F??????7????B?_?gb?z?'A|?????YBAl1?q? t,|?\?? e?4??44???=\i??Z?p*{?n?5?w?? ???e?cP? ?d? -???ON?t?:? %?a`CZ?|???`(?D??<$???:.?D??P???s?1?;???c?Gz?!]??8??VL?_]y??2?Hg??X?2|9r??o????&???cfj????S??????????IO-???TK,h%Pk????{?L??Z?\$???xAO">?~??>???K4 g???U)?!L??&4?7????)??l0?w?J??t???;??3{?fB????ge???? -?sn> ?Yb?d -??5;Z.?+?V?w,?1??*r??-?!K[+???m?I?[?m?G?d????????|?2????k?I???????b?]3} ?1??$?!?E?????j?B?A?????d??M???1?R1??????6s/? ?;m{P -1??yz??2?k??????'?w???qZ???__?n???QZY@????OTD?hKo???w} ??:-?T?Qi6Mm???#?????"wa{M$?0ir?D?r???e??I~v:1t??)?\* ?"?>?? ???u?]g??o??????????G?r????_;?E$Q?;}?????7?#?$?.??c[f?#?*?! ?"?a?\xqJ>?7??Bp????8Jb???????&#?w`!??dS??????b????c??L?!?_???????w?^?/?? ??dJ??R6????>???v???t|??????????w06?(?x^??7?X]9???2???-???p???????M?"8??]D??U??Fa=e?T? -???M????Y?<"?!?????h???3?P+?w????c??i,v?.tk9k???U??Ap????J?=??@zzQ4?2ab??yx`T?/e?G?Q{c?>??s?3V??5?l???_?k?oA???C?d?&$????????!?b?\??? ?1? -X? &l8??*??+?Os??(????kFDC!W???f{???-a!???V?0??3? S ?Y??-???Q?3@??{?h,e|PM??T8???????K?~y?!?p:{l?B6???(????5q?{.rb%Uza3????+=3@?????E??N??[?^h???g?#'u?Z9???y?@3????`????#?:8z9[YX???U4?ii??S?? ????,#]?,??????v@{??????@ ??0??D???$T? +?I?=?????fbke +??2?????? S{3?Zsa??%?0?8M???=M??????@g;+???+????????:??Mm???)?????_9:;????k? ?????b?l?? +??UIL??u?Z????????`??????????e? ???jle?pz????0?rq?5????/??????ps????? +??@ cg3[???_????L????/?;:?z?+??_^??+W??93?????s[X??1??+???f???????t????????E?9??z???p? +?S???Xf??#???????[??#??r????\z.????oA?,l~????b?OY????????o&?u??~?)??q{S?VG????????O??fS7g??$????????=? 4?[]r0? +????tm?????c s,oV+) +?s? +?????6z?ch?????Z??$I?????o5???%?????&? ???x+????%? ???OT +*!???l??D3) +&.?Lem????l?????H1B +??U)?B?q?]?a?{@j?2s???G???????2Z0????i?6x??`??7=F???%?????Om@???i??T{lt8?P?;?????g/~/??? ??&\?u?k?I???-?sl?t???????????f???@3 +]mJ?[?U??3??S?f?Q.Gy?(G??+?K?[+iFZ?5 ?T*?+V?n?b^a?????????????H?UD ???^ E ?N??D???2?? +?L?04oOY +??@a?????1I????E?????????? +?m7V??6a?B???V?B????kw??P?^?t\A??T.L???P?(?v?2%\gA??Zi>?/?@F?????~???????lC+` v~???zKz dS???A??l?2??x??/WC? ???=>?'??[I3l??X/?????????A?D?t??\????r?C???ZC" +??4u??vI???Tur-?:3'o???????W???V?)Pj?>V ???3?&?,p??(k|?????vZv?? ?UcN?o??F???b?{?|??B???P???\I???c??d???s??C??%K ?*{??+? ??Q?p?<? ?????Q????;??v?i?w???-y?? a???U??,?J5V????'???{?? ???_?3`yI??????$???a?^??F??z3A?*[???Rit?r?m= Q??gOT3TG+?Q??8?%Ju?N?Wj-[???)?2???,b?6?i?? F?s??c-|??_?t????+5X +d??????????F?S=p??_6?Am?TCG???mM??t???Z???l??BP?3:7??;*Y6Hj+??MI??????????/?2???l???^Q??c(?2 ?N??2E?-?B??z.A7?qHt??? +C?'???Q?+?J????b???! +???QSk? ;??6c?#??-?xj??????????????ryU?????O*?U?(8U3????'????[PNK?Lk???C????/?i? n\^????????_.??????+M???S}/?$??AU>/?!#?#???? +???}?(b?>v>RS,?\@??S????zf??y????@I???w??p??{??~r< }???#???L??B ????F?? +?Ef?+??u???????"??? Gx???E???7?????\??f??n?o??D?????A?5!5w??0%0?3???K????? +D$??W!???xz?,???ma???Cpv?: `???.?>?-??,?{?905F??z8\?J????R?+????L????ps at z?Ir????o?qrzV???D:??QM????????EP5?!???WN???? +??j?? ?\ a????7?D6O?c?_?}?1?>???e?2??X??!???9???~d??VW?9?QNL????!?!??????@*Ds??#?Y5???@d?3O??{=|?)???R???(oWv???4?G?8???6??)?8? ??X?z??????r???'???`+?%$?p?K5d?<:A??x ??2??b?gakU,????p??3???-YA?q(H?????$2??h??j:??%?\fN??&?+?;??d J?_D?C=6Wo?? I?\?s?????l??rs???RV?.??B?:????? +?????????`?]%?A????2??l{"???????^????(?????t?? ????%?.9?n?n?"SN?3?3??,??)???? Z0????s(AS?f?6\?'????K?????<?p-k??Y??Hw7,????? $ye??J????~v=?u?~g??p??7?/??9??????? +?;?f +???r???YK??Q??NW???Mi5??i.R??_?Y????9?#R~)? ?V\??8????C?B?x????(?!$???K.??eM ????t?{?M?]\[4????'????H.???{ ?cf??O?S???>???P3m?4?n?D!e??c?^?G??| ????6?5????!m?k$s??,?? +?Lf?(#B?*?Ucv?+s???a?p?&oYr{~>R ?7?R&????A????q????????$??hK?hk????T?Sk*B?[s]]???wD??=|?Y??ogO????????? +?FdU?K&?t?v/???DL/?F?0???????-?[???{?4o??UC?Z???wO?;???Q???????$?)H?"?"???@~ n??v?????M(??+?&?d?V?R?????m ??"???? E???=;}(?hI???X]T??\f?????x^?s?{#??W??B?y$???p8???????h???'X??]?i;?X??N??Qc(?K?DG???L?+???C?k??2???? +??????(??0???m+???o?????B??c??9?Si?E +??r?{)R?(LH3?r?($?'v?U?9????J??)????????h?O?xU????y???????W??f#o}?Qj5J????eK??0?i?M??C,?`?MD?;??&o?Of???B?:?8????y%??Qe????????a( +-?%E?U~[~n?u?%?7h\8?n??bk??!?r+BQ?vvw???Y??5q}?? ????'0qj?@Sh7?f????;?q?????i??'L? ?D?xH@?L??;?p?~2|?nAU???TpaN!T?~-gv?Z???-v????,?N????%??!?m?? +Q?\?*}??m??f,??C^.?Uf?e??(;8W????? [??????k??1?U????m?? ????R???1??wH???2O?cR???]M2?wC ?????qa?? {]??m+I+?s5???$??,?nX??>??`I??\?lnZw"Y?:b???:?R?%C?X?&)fn%?_E?U?????y?]e???5??k8RM?Aob??#8 c?WB? X?? ?,? +,w?????9P?{?^:%???????`qe???|]?V#?????zJ??!?]^?~5 I???????????y?-'?,?z???T? ?? ?O?M-???"?9??7?p?Y?n?&k???1?V(?v?6,.d?=????R-??`r?F +?Z??9)??,K-?x at qC???g?M??z?V?0>F??|???Vwr???!i4???????cG\??P?7d???RPbRKx???C:?^?~a???f???????Y=Q???\????????R??n`c?D???1?Iq???????@???d?`??Qv/7?8?M?o????????????Q-l*?2n??ox?Av?^w]???J??U?t?????zz????8??J??p?v7}?s~7>?z??8k???d?ULZW1NvYRo?????????h8d?`P?@??? +??n_??? ^S^?eW?_V?????V??0????j????k?MC'b???i?u???? ????????!?jY=??j???F$A?Y???L?!3?1?m??? ?IcG^?#?C????s E?mH??ii?????Wl????n?K!?v?^?f4l??(??? +?M???Vk?~?G?h?? D5?? ?????A?"??.????Wl?Y?!??? ??? +???_5????_;?v???R??Hk_v??kNj*r?0?- +?)??  +K*??f?|?????????j??>E2y?d?6?b?$??m?h>Jm?} ?>???8"???????????z??!????2?????^&)'???*??x?m???fLS????-v????s +ik??wC?Y?)OP?j3??T???_????xe=? h???=e?by:b,??p?W00"???Bk~-??e|?Sj???&??<? +W?B~?-I +?x'??S??Z???hD7?Q?G????????f3?????4t??ZK???S?ob?T??="???????????mX?Y{??qp?2s?~/?,??????5;[v??g????7?QE????Z??u?Jx?5??{????v>???'k??*??^??*?OR? Z$???=??Y?9??J?K?(fHS;[Y6^<+??c74D0gw?????:d8???[O??d?)a??%??RG?&??Et?r[??r8??&??x?y?????T*zy?N??????s$??9wP[v?l???~yua???9??E?!??+?wo???_0qcf??Z0^?Z??Lr?b??Z??i?J????zL???V??c?Wi?y?zBj?q?h??Jv_=?????J?x?VXOt???6???"? ?Abg?BH??{??H8?r;?XQ?X?{&?8o???$??j'k??t?m??z+D2i???HC+/ ?m???:4?1$v??? ??X|.???D???=?P???+?]4?????4? ?H??Lx]??????y?p?m??f??r???? ???F?:?W??DNk???bU?*??N?P??"?j???Vq?????????82=??h[?O?W??Ra(?I???????/???#*?DRd?iu2aW?S?U??F??H>???L?c? ZC/g? +???( E????[???}2(??N?Q????L???A?|?][?8??5???7?Cu?R?Q?:?3w*?/?MW?p?<>?Q!?u???4F?]?????\^?????f?k0PM?[??`C?%?? ???\?W:f?zE?TF-??s?]????3?[?2d?#a??2n?34??R???{?????7??@?????B]?@??~K??4??b??m?+????.h?????!??7???j?>jo/m???????????????O??c?b[5>>??8E????U?5>?????k4??^1?va&?z????????4cfWN?????t?dJ)?N?d?????D{?sVu.[?d-?f??????TV??^??&?{:pV??5?jIyo???]??????!????+?;????( ?L????,???S?0>B???!?u #?i??LF ????;0z??v????-?d$ /,y?? ??z+?'J??0=????o)?.M??e?Xa?oX????1????6???x?p???SYc?|lA) +X?,?????qy????R+???M,??=???/?;?)?76?E??? +G?? ?|?(?Q_??? +?;? +??54???u?? +Y4r??8v?[??8)?g;????0???B??Z??mE?y??{9????????KEk?W???};(?Z???f(?C?7?????V;GV??????e???F?3!??04V????eh8?q??_-{?z???>?3??Q3???4X??q?!???\??y???&?a?r+rt ?]??@?,???l???@??X??}??i?,%???A?F?hc??,????_0?]7? AaaA6f?-#?}??s????U~H??Y +?Fr??\ +1?r???C??+??????????9???F????x 1 ??q?7?x, +???j+??,?G7hhr???+??7}?,m?|??g????????N?\?W1?q?Z?5"; ?$h?????_??{+?O^=Z??=e[???P?8???Y7???]a??q50?*?ju???QV??[???A??S?,(??k?h?l"?u>??;??Of??k?`Bh???#???N?/????obk?'?8H?H?H~#????=%xe?c??"!?E??F:?????%Eigo~????l ??U?g?~q?1,?= 3???_#?? ??v??`??7O?o~u?????i??"o????O?%?!???eA???e???8=!???K?sP*??(>??? ????i???TB?????T??_~#*?h?x(L*UK??8?????Y???,m??nE?Z?mu??1?&H]s?*???N?H??k5?@UJA??8^W?5r??????C?+???%s??7???Y j????????f?|~???b????s?C?Vl??**?'-&O!y???Oz???PQ8R???l?]Q??4A???,??yp??O??F???kmsL# +?A{?.Iy?Sp???5????B?W_?Y?I?Q?]????sY)???w9???#7?1mvf( +?n +?Uh^B??'?'ld?aC?X-=e?2??Z?8*?/l???}??C????|???56S???q?????p??U}?oC?,?'=?????m???4l???^????Q?NQ????PPF??????-5????6?(=I??Y?U?(%?D@????Er??z ???Cj??R?C>??6??)??D????????'?4?z'?v?9??rn?6??A?[q?? +?6g?S9?b??z??J???????_??!wY ?????P:??????Kq?!?i?j??????w???&$-?????2??zGD???&?????r???wTK?????,Q?j??u????W??X??Q?@??=??????~?NS???????Tq??~???`?2?g??h???????Z??.T???m?C???'????K?X??nu??~?#V???N?N???&n??Sg?4h???O8?????????c?h\?:W?N +L?QZ))?g~???l0e?S??|r?????w????? ??d??D?#aO?O????[????????.??X +L??s#?[??6J-x????]d?@???o????H??`?j????S??? )?DuS??D?Hz?b?T?q?????;?}????{?6?H,?3?wd3(>?-???%f?v,E? +zq +7??F??v}?%?`??[(??n????3'Rzb??F`S?^4? ?\?4?P???$&(?\??q?????;? T??%?c%l0_ EY???w??????Br'&l14\#?GU Ne?????H?"~?D??2??}??T4 +??#?????~E|?6t3 ?G???~??MN????cq???<?+??+S??`???8?=???nf?/?V>?zP?? ?I??k?????????U??????l\0?fFt~?P??Ppug{???`y???8S?J??????f?#??S2J,?????m???lDs?[P?.?)?"'6?????t?????z????Ko?a??m? ?j?|?aA??? +?(?zB1f%V?Y?????????????m??#???????????????*??"?r<?????fx?" ????????S l|o9???&???^??????Q??u??1q?PS??(???[????l.PO?a?c?Sj?N;.w??]?}??Q ??n?`}O6(?xc????,???1)??_ ???????????2??p?fm????#??0?K????b+?) ??h??.???i?w??H%,?D??? T?g?&?`x?S +"f^?F!r?(?????bC0>v?J???Q(?Tw??^ '?HBW??MZ?tT?u?v?O????,?#???@??????`?????????x{r??n?t_????4f?+,b??y#+?????? +?*?hu??m?=??;??.??$?U?L[??[?? ?d?B0h???)m?T?????bM??|????U??*v?X?^p?ri \???p +??? ??x????????&?0?-'^4 ?????&????M??????SW???oxf?8?F??Y?O???[??q??5,w??Z?"!????5(l????b??`???C3?x?(aso;??? +???7o??}hg??z??L??Q?? +???????????#D~W),?W:?r??? ?}?$?='L[?`????????94??h?f?^???????????#xZ??u??A???????r??????y|??C???G]?9G?B?hh??????J at X???? +????V9"??t?N!?}NV+??N?6]?+?f?ud????,gG4s?mI&<{? +C???9N?u??^ 7mO?3?O!?4J?tn??5??j?????^G4D7^???\??~[????`?)?TB?????????&^?e?M5???.?KCw???q?n? m?q +?N???_J?????D????*b??dNtU?[l7B?8%?Mv{MT??o?4????7?q ??{&?????9Ke?`~????d??y????M?n?1ua?a?LuB8???T?????,???W???pW??@?#?Sq??|^J?????????? -bF??I +y?w&?E??????????????v?a??* =S??#V??g???cN??P?O?PK?n'!?|?>5????'??????????It??'?x?3????k???|6??%???h>???o?? 6???"???????????]oH9S?qo????Sq?{I?> endobj 317 0 obj << /Type /Encoding -/Differences [2/fi/fl 34/quotedbl 40/parenleft/parenright 44/comma/hyphen/period/slash/zero/one/two/three/four/five/six/seven/eight/nine 59/semicolon 65/A/B/C/D/E/F/G/H/I/J 77/M/N/O/P 83/S/T 87/W 91/bracketleft 93/bracketright 95/underscore 97/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/braceleft 125/braceright] +/Differences [2/fi/fl 34/quotedbl 39/quoteright/parenleft/parenright 44/comma/hyphen/period/slash/zero/one/two/three/four/five/six/seven/eight/nine 59/semicolon 65/A/B/C/D/E/F/G/H/I/J 77/M/N/O/P 83/S/T 87/W 91/bracketleft 93/bracketright 95/underscore 97/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/braceleft 125/braceright] >> endobj 191 0 obj << /Type /Font @@ -1792,7 +1789,7 @@ 138 0 obj << /Type /Font /Subtype /Type1 -/BaseFont /PARFSI+NimbusRomNo9L-Regu +/BaseFont /SIGNJG+NimbusRomNo9L-Regu /FontDescriptor 332 0 R /FirstChar 2 /LastChar 122 @@ -2192,8 +2189,8 @@ >> endobj 368 0 obj << /Author()/Title(Swift Montage API)/Subject()/Creator(DBLaTeX-0.3)/Producer(pdfTeX-1.40.10)/Keywords() -/CreationDate (D:20110614204133-05'00') -/ModDate (D:20110614204133-05'00') +/CreationDate (D:20110616211653-05'00') +/ModDate (D:20110616211653-05'00') /Trapped /False /PTEX.Fullbanner (This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0) >> endobj @@ -2201,147 +2198,147 @@ 0 369 0000000000 65535 f 0000000015 00000 n -0000012366 00000 n -0000100075 00000 n +0000012372 00000 n +0000100188 00000 n 0000000060 00000 n 0000000086 00000 n -0000012486 00000 n -0000099966 00000 n +0000012492 00000 n +0000100079 00000 n 0000000131 00000 n 0000000166 00000 n -0000012605 00000 n -0000099857 00000 n +0000012611 00000 n +0000099970 00000 n 0000000216 00000 n 0000000240 00000 n -0000012725 00000 n -0000099783 00000 n +0000012731 00000 n +0000099896 00000 n 0000000296 00000 n 0000000320 00000 n -0000012967 00000 n -0000099696 00000 n +0000012973 00000 n +0000099809 00000 n 0000000376 00000 n 0000000401 00000 n -0000013210 00000 n -0000099609 00000 n +0000013216 00000 n +0000099722 00000 n 0000000457 00000 n 0000000481 00000 n -0000013452 00000 n -0000099522 00000 n +0000013458 00000 n +0000099635 00000 n 0000000537 00000 n 0000000560 00000 n -0000013695 00000 n -0000099435 00000 n +0000013701 00000 n +0000099548 00000 n 0000000616 00000 n 0000000641 00000 n -0000016332 00000 n -0000099348 00000 n +0000016338 00000 n +0000099461 00000 n 0000000697 00000 n 0000000732 00000 n -0000016940 00000 n -0000099274 00000 n +0000016946 00000 n +0000099387 00000 n 0000000788 00000 n 0000000817 00000 n -0000017609 00000 n -0000099148 00000 n +0000017615 00000 n +0000099261 00000 n 0000000868 00000 n 0000000901 00000 n -0000017730 00000 n -0000099074 00000 n +0000017736 00000 n +0000099187 00000 n 0000000957 00000 n 0000000980 00000 n -0000017970 00000 n -0000098987 00000 n +0000017976 00000 n +0000099100 00000 n 0000001036 00000 n 0000001066 00000 n -0000020757 00000 n -0000098900 00000 n +0000020763 00000 n +0000099013 00000 n 0000001122 00000 n 0000001149 00000 n -0000021000 00000 n -0000098813 00000 n +0000021006 00000 n +0000098926 00000 n 0000001205 00000 n 0000001234 00000 n -0000021243 00000 n -0000098726 00000 n +0000021249 00000 n +0000098839 00000 n 0000001290 00000 n 0000001314 00000 n -0000021486 00000 n -0000098639 00000 n +0000021492 00000 n +0000098752 00000 n 0000001370 00000 n 0000001397 00000 n -0000021729 00000 n -0000098552 00000 n +0000021735 00000 n +0000098665 00000 n 0000001453 00000 n 0000001481 00000 n -0000021971 00000 n -0000098465 00000 n +0000021977 00000 n +0000098578 00000 n 0000001537 00000 n 0000001563 00000 n -0000022214 00000 n -0000098378 00000 n +0000022220 00000 n +0000098491 00000 n 0000001619 00000 n 0000001646 00000 n -0000025050 00000 n -0000098291 00000 n +0000025056 00000 n +0000098404 00000 n 0000001703 00000 n 0000001727 00000 n -0000025293 00000 n -0000098204 00000 n +0000025299 00000 n +0000098317 00000 n 0000001784 00000 n 0000001812 00000 n -0000025534 00000 n -0000098117 00000 n +0000025540 00000 n +0000098230 00000 n 0000001869 00000 n 0000001896 00000 n -0000025777 00000 n -0000098030 00000 n +0000025783 00000 n +0000098143 00000 n 0000001953 00000 n 0000001982 00000 n -0000026019 00000 n -0000097941 00000 n +0000026025 00000 n +0000098054 00000 n 0000002039 00000 n 0000002066 00000 n -0000026262 00000 n -0000097850 00000 n +0000026268 00000 n +0000097963 00000 n 0000002124 00000 n 0000002161 00000 n -0000030202 00000 n -0000097772 00000 n +0000030208 00000 n +0000097885 00000 n 0000002219 00000 n 0000002264 00000 n -0000030446 00000 n -0000097657 00000 n +0000030452 00000 n +0000097770 00000 n 0000002316 00000 n 0000002350 00000 n -0000030568 00000 n -0000097578 00000 n +0000030574 00000 n +0000097691 00000 n 0000002407 00000 n 0000002443 00000 n -0000030872 00000 n -0000097485 00000 n +0000030878 00000 n +0000097598 00000 n 0000002500 00000 n 0000002530 00000 n -0000031177 00000 n -0000097392 00000 n +0000031183 00000 n +0000097505 00000 n 0000002587 00000 n 0000002620 00000 n -0000033752 00000 n -0000097299 00000 n +0000033758 00000 n +0000097412 00000 n 0000002677 00000 n 0000002706 00000 n -0000033996 00000 n -0000097220 00000 n +0000034002 00000 n +0000097333 00000 n 0000002763 00000 n 0000002796 00000 n 0000003146 00000 n 0000003388 00000 n 0000002849 00000 n 0000003265 00000 n -0000096703 00000 n -0000096358 00000 n +0000096816 00000 n +0000096471 00000 n 0000003327 00000 n -0000096187 00000 n -0000096876 00000 n +0000096300 00000 n +0000096989 00000 n 0000004865 00000 n 0000005015 00000 n 0000005166 00000 n @@ -2379,200 +2376,200 @@ 0000004470 00000 n 0000003486 00000 n 0000010143 00000 n -0000096529 00000 n -0000013938 00000 n -0000012185 00000 n +0000096642 00000 n +0000013944 00000 n +0000012191 00000 n 0000010316 00000 n -0000012304 00000 n -0000012425 00000 n -0000012545 00000 n -0000012664 00000 n -0000012784 00000 n -0000012845 00000 n -0000012906 00000 n -0000096016 00000 n -0000013027 00000 n -0000013088 00000 n -0000013149 00000 n -0000013270 00000 n -0000013330 00000 n -0000013391 00000 n -0000013512 00000 n -0000013573 00000 n -0000013634 00000 n -0000013755 00000 n -0000013816 00000 n -0000013877 00000 n -0000018213 00000 n -0000016151 00000 n -0000014049 00000 n -0000016270 00000 n -0000016392 00000 n -0000016453 00000 n -0000016514 00000 n -0000016575 00000 n -0000016636 00000 n -0000016696 00000 n -0000016757 00000 n -0000016818 00000 n -0000016879 00000 n -0000017000 00000 n -0000017061 00000 n -0000017122 00000 n -0000017183 00000 n -0000017244 00000 n -0000017305 00000 n -0000017366 00000 n -0000017427 00000 n -0000017487 00000 n -0000017548 00000 n -0000017669 00000 n -0000017788 00000 n -0000017849 00000 n -0000017909 00000 n -0000018030 00000 n -0000018091 00000 n -0000018152 00000 n -0000022457 00000 n -0000020576 00000 n -0000018324 00000 n -0000020695 00000 n -0000020817 00000 n -0000020878 00000 n -0000020939 00000 n -0000021060 00000 n -0000021121 00000 n -0000021182 00000 n -0000021303 00000 n -0000021364 00000 n -0000021425 00000 n -0000021546 00000 n -0000021607 00000 n -0000021668 00000 n -0000021789 00000 n -0000021850 00000 n -0000021911 00000 n -0000022031 00000 n -0000022092 00000 n -0000022153 00000 n -0000022274 00000 n -0000022335 00000 n -0000022396 00000 n -0000026506 00000 n -0000024869 00000 n -0000022568 00000 n -0000024988 00000 n -0000025110 00000 n -0000025171 00000 n -0000025232 00000 n -0000025353 00000 n -0000025413 00000 n -0000025473 00000 n -0000025594 00000 n -0000025655 00000 n -0000025716 00000 n -0000025836 00000 n -0000025897 00000 n -0000025958 00000 n -0000026079 00000 n -0000026140 00000 n -0000026201 00000 n -0000026323 00000 n -0000026384 00000 n -0000026445 00000 n -0000028997 00000 n -0000031542 00000 n -0000028878 00000 n -0000026617 00000 n -0000030140 00000 n -0000030263 00000 n -0000030324 00000 n -0000030385 00000 n -0000030507 00000 n -0000030629 00000 n -0000030690 00000 n -0000030751 00000 n -0000030811 00000 n -0000030933 00000 n -0000030994 00000 n -0000031055 00000 n -0000031116 00000 n -0000031238 00000 n -0000031299 00000 n -0000031360 00000 n -0000031421 00000 n -0000031482 00000 n -0000096993 00000 n -0000029900 00000 n -0000030035 00000 n -0000030084 00000 n -0000034239 00000 n -0000033571 00000 n -0000031681 00000 n -0000033690 00000 n -0000033813 00000 n -0000033874 00000 n -0000033935 00000 n -0000034057 00000 n -0000034117 00000 n -0000034178 00000 n -0000095655 00000 n -0000034378 00000 n -0000034741 00000 n -0000035045 00000 n -0000035368 00000 n -0000035740 00000 n -0000036215 00000 n -0000050071 00000 n -0000050475 00000 n -0000061588 00000 n -0000061965 00000 n -0000069837 00000 n -0000070221 00000 n -0000078906 00000 n -0000079180 00000 n -0000095253 00000 n -0000097078 00000 n -0000097147 00000 n -0000100146 00000 n -0000100380 00000 n -0000100563 00000 n -0000100766 00000 n -0000100960 00000 n -0000101154 00000 n -0000101353 00000 n -0000101579 00000 n -0000101804 00000 n -0000102030 00000 n -0000102250 00000 n -0000102477 00000 n -0000102711 00000 n -0000102944 00000 n -0000103178 00000 n -0000103408 00000 n -0000103634 00000 n -0000103860 00000 n -0000104070 00000 n -0000104232 00000 n -0000104428 00000 n -0000104688 00000 n -0000104953 00000 n -0000105219 00000 n -0000105480 00000 n -0000105686 00000 n -0000105804 00000 n -0000105928 00000 n -0000106044 00000 n -0000106164 00000 n -0000106257 00000 n -0000106372 00000 n -0000106410 00000 n -0000106578 00000 n +0000012310 00000 n +0000012431 00000 n +0000012551 00000 n +0000012670 00000 n +0000012790 00000 n +0000012851 00000 n +0000012912 00000 n +0000096129 00000 n +0000013033 00000 n +0000013094 00000 n +0000013155 00000 n +0000013276 00000 n +0000013336 00000 n +0000013397 00000 n +0000013518 00000 n +0000013579 00000 n +0000013640 00000 n +0000013761 00000 n +0000013822 00000 n +0000013883 00000 n +0000018219 00000 n +0000016157 00000 n +0000014055 00000 n +0000016276 00000 n +0000016398 00000 n +0000016459 00000 n +0000016520 00000 n +0000016581 00000 n +0000016642 00000 n +0000016702 00000 n +0000016763 00000 n +0000016824 00000 n +0000016885 00000 n +0000017006 00000 n +0000017067 00000 n +0000017128 00000 n +0000017189 00000 n +0000017250 00000 n +0000017311 00000 n +0000017372 00000 n +0000017433 00000 n +0000017493 00000 n +0000017554 00000 n +0000017675 00000 n +0000017794 00000 n +0000017855 00000 n +0000017915 00000 n +0000018036 00000 n +0000018097 00000 n +0000018158 00000 n +0000022463 00000 n +0000020582 00000 n +0000018330 00000 n +0000020701 00000 n +0000020823 00000 n +0000020884 00000 n +0000020945 00000 n +0000021066 00000 n +0000021127 00000 n +0000021188 00000 n +0000021309 00000 n +0000021370 00000 n +0000021431 00000 n +0000021552 00000 n +0000021613 00000 n +0000021674 00000 n +0000021795 00000 n +0000021856 00000 n +0000021917 00000 n +0000022037 00000 n +0000022098 00000 n +0000022159 00000 n +0000022280 00000 n +0000022341 00000 n +0000022402 00000 n +0000026512 00000 n +0000024875 00000 n +0000022574 00000 n +0000024994 00000 n +0000025116 00000 n +0000025177 00000 n +0000025238 00000 n +0000025359 00000 n +0000025419 00000 n +0000025479 00000 n +0000025600 00000 n +0000025661 00000 n +0000025722 00000 n +0000025842 00000 n +0000025903 00000 n +0000025964 00000 n +0000026085 00000 n +0000026146 00000 n +0000026207 00000 n +0000026329 00000 n +0000026390 00000 n +0000026451 00000 n +0000029003 00000 n +0000031548 00000 n +0000028884 00000 n +0000026623 00000 n +0000030146 00000 n +0000030269 00000 n +0000030330 00000 n +0000030391 00000 n +0000030513 00000 n +0000030635 00000 n +0000030696 00000 n +0000030757 00000 n +0000030817 00000 n +0000030939 00000 n +0000031000 00000 n +0000031061 00000 n +0000031122 00000 n +0000031244 00000 n +0000031305 00000 n +0000031366 00000 n +0000031427 00000 n +0000031488 00000 n +0000097106 00000 n +0000029906 00000 n +0000030041 00000 n +0000030090 00000 n +0000034245 00000 n +0000033577 00000 n +0000031687 00000 n +0000033696 00000 n +0000033819 00000 n +0000033880 00000 n +0000033941 00000 n +0000034063 00000 n +0000034123 00000 n +0000034184 00000 n +0000095757 00000 n +0000034384 00000 n +0000034747 00000 n +0000035051 00000 n +0000035374 00000 n +0000035746 00000 n +0000036221 00000 n +0000050077 00000 n +0000050481 00000 n +0000061594 00000 n +0000061971 00000 n +0000069843 00000 n +0000070227 00000 n +0000078912 00000 n +0000079186 00000 n +0000095344 00000 n +0000097191 00000 n +0000097260 00000 n +0000100259 00000 n +0000100493 00000 n +0000100676 00000 n +0000100879 00000 n +0000101073 00000 n +0000101267 00000 n +0000101466 00000 n +0000101692 00000 n +0000101917 00000 n +0000102143 00000 n +0000102363 00000 n +0000102590 00000 n +0000102824 00000 n +0000103057 00000 n +0000103291 00000 n +0000103521 00000 n +0000103747 00000 n +0000103973 00000 n +0000104183 00000 n +0000104345 00000 n +0000104541 00000 n +0000104801 00000 n +0000105066 00000 n +0000105332 00000 n +0000105593 00000 n +0000105799 00000 n +0000105917 00000 n +0000106041 00000 n +0000106157 00000 n +0000106277 00000 n +0000106370 00000 n +0000106485 00000 n +0000106523 00000 n +0000106691 00000 n trailer << /Size 369 /Root 367 0 R /Info 368 0 R -/ID [<57EE3A74C467C6A64C657804FD027B5E> <57EE3A74C467C6A64C657804FD027B5E>] >> +/ID [<68998779D743C6E5BAFD2838B06BD2FA> <68998779D743C6E5BAFD2838B06BD2FA>] >> startxref -106898 +107011 %%EOF Modified: SwiftApps/Montage/docs/API.txt =================================================================== --- SwiftApps/Montage/docs/API.txt 2011-06-16 22:56:36 UTC (rev 4626) +++ SwiftApps/Montage/docs/API.txt 2011-06-17 02:19:13 UTC (rev 4627) @@ -14,7 +14,7 @@ Swift is a dataflow parallel scripting language. The language allows the user to parallelize a workflow that has been represented as a swiftscript. Swift implements the site execution model to allow for efficient use of available -resources for the users application. +resources for the user's application. NOTE: Both the Montage binaries as well as the Swift binaries must be included in your PATH environment variable for the wrappers to function properly. From jonmon at ci.uchicago.edu Fri Jun 17 14:28:46 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Fri, 17 Jun 2011 14:28:46 -0500 (CDT) Subject: [Swift-commit] r4628 - in usertools/plotter: . old_scripts samples/dual samples/lines src/plotter Message-ID: <20110617192846.658F99CCAC@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-17 14:28:46 -0500 (Fri, 17 Jun 2011) New Revision: 4628 Added: usertools/plotter/old_scripts/ usertools/plotter/old_scripts/dual.zsh usertools/plotter/old_scripts/lines.zsh usertools/plotter/src/plotter/Plotter.java usertools/plotter/swift_plotter.zsh Removed: usertools/plotter/dual.zsh usertools/plotter/lines.zsh Modified: usertools/plotter/README.txt usertools/plotter/build.xml usertools/plotter/samples/dual/About.txt usertools/plotter/samples/lines/About.txt usertools/plotter/src/plotter/Bits.java usertools/plotter/src/plotter/Dual.java usertools/plotter/src/plotter/LineReader.java usertools/plotter/src/plotter/Lines.java usertools/plotter/src/plotter/Plots.java usertools/plotter/src/plotter/Util.java Log: o moved the old lines.zsh and dual.zsh into the old_scripts directory. o Changes to the java source files, prints to stderr where appropriate. o Added Plotter class. Depending on what option you give at the command line will generate a single y-axis labeled(-s) or double y-axis labeled(-d) plot. o Added swift_plotter.zsh script that will call the Plotter class. o Added clean target to the build.xml script. Modified: usertools/plotter/README.txt =================================================================== --- usertools/plotter/README.txt 2011-06-17 02:19:13 UTC (rev 4627) +++ usertools/plotter/README.txt 2011-06-17 19:28:46 UTC (rev 4628) @@ -3,4 +3,4 @@ Produces EPS output from two-column data sets using JFreeChart. -User interface is lines.zsh +User interface is swift_plotter.zsh Modified: usertools/plotter/build.xml =================================================================== --- usertools/plotter/build.xml 2011-06-17 02:19:13 UTC (rev 4627) +++ usertools/plotter/build.xml 2011-06-17 19:28:46 UTC (rev 4628) @@ -1,5 +1,3 @@ - - @@ -13,13 +11,20 @@ depends="compile" /> - - - + + + + + + + + + Deleted: usertools/plotter/dual.zsh =================================================================== --- usertools/plotter/dual.zsh 2011-06-17 02:19:13 UTC (rev 4627) +++ usertools/plotter/dual.zsh 2011-06-17 19:28:46 UTC (rev 4628) @@ -1,16 +0,0 @@ -#!/bin/zsh - -# DUAL.ZSH - -# Create plot with two data sets, two Y axes -# Arguments passed directly to Dual.java - see there for details -# usage: dual.zsh * - -PLOTTERS=$( cd $( dirname $0 ) ; /bin/pwd ) - -# declare -p PLOTTERS - -source ${PLOTTERS}/classpath.zsh -[[ $? != 0 ]] && print "Could not build CLASSPATH!" && return 1 - -java -ea -cp ${CP} plotter.Dual ${*} Deleted: usertools/plotter/lines.zsh =================================================================== --- usertools/plotter/lines.zsh 2011-06-17 02:19:13 UTC (rev 4627) +++ usertools/plotter/lines.zsh 2011-06-17 19:28:46 UTC (rev 4628) @@ -1,14 +0,0 @@ -#!/bin/zsh - -# LINES.ZSH -# Arguments passed directly to Lines.java - see there for details -# usage: lines.zsh * - -PLOTTERS=$( cd $( dirname $0 ) ; /bin/pwd ) - -# declare -p PLOTTERS - -source ${PLOTTERS}/classpath.zsh -[[ $? != 0 ]] && print "Could not build CLASSPATH!" && return 1 - -java -ea -cp ${CP} plotter.Lines ${*} Added: usertools/plotter/old_scripts/dual.zsh =================================================================== --- usertools/plotter/old_scripts/dual.zsh (rev 0) +++ usertools/plotter/old_scripts/dual.zsh 2011-06-17 19:28:46 UTC (rev 4628) @@ -0,0 +1,16 @@ +#!/bin/zsh + +# DUAL.ZSH + +# Create plot with two data sets, two Y axes +# Arguments passed directly to Dual.java - see there for details +# usage: dual.zsh * + +PLOTTERS=$( cd $( dirname $0 ) ; /bin/pwd ) + +# declare -p PLOTTERS + +source ${PLOTTERS}/classpath.zsh +[[ $? != 0 ]] && print "Could not build CLASSPATH!" && return 1 + +java -ea -cp ${CP} plotter.Dual ${*} Property changes on: usertools/plotter/old_scripts/dual.zsh ___________________________________________________________________ Added: svn:executable + * Added: usertools/plotter/old_scripts/lines.zsh =================================================================== --- usertools/plotter/old_scripts/lines.zsh (rev 0) +++ usertools/plotter/old_scripts/lines.zsh 2011-06-17 19:28:46 UTC (rev 4628) @@ -0,0 +1,14 @@ +#!/bin/zsh + +# LINES.ZSH +# Arguments passed directly to Lines.java - see there for details +# usage: lines.zsh * + +PLOTTERS=$( cd $( dirname $0 ) ; /bin/pwd ) + +# declare -p PLOTTERS + +source ${PLOTTERS}/classpath.zsh +[[ $? != 0 ]] && print "Could not build CLASSPATH!" && return 1 + +java -ea -cp ${CP} plotter.Lines ${*} Property changes on: usertools/plotter/old_scripts/lines.zsh ___________________________________________________________________ Added: svn:executable + * Modified: usertools/plotter/samples/dual/About.txt =================================================================== --- usertools/plotter/samples/dual/About.txt 2011-06-17 02:19:13 UTC (rev 4627) +++ usertools/plotter/samples/dual/About.txt 2011-06-17 19:28:46 UTC (rev 4628) @@ -1,5 +1,5 @@ To run: -../../dual.zsh plot.cfg tmp.eps set*.data +../../swift_plotter.zsh -d plot.cfg tmp.eps set*.data Modified: usertools/plotter/samples/lines/About.txt =================================================================== --- usertools/plotter/samples/lines/About.txt 2011-06-17 02:19:13 UTC (rev 4627) +++ usertools/plotter/samples/lines/About.txt 2011-06-17 19:28:46 UTC (rev 4628) @@ -1,5 +1,5 @@ To run: -../../lines.zsh plot.cfg tmp.eps set*.data +../../swift_plotter.zsh -s plot.cfg tmp.eps set*.data Modified: usertools/plotter/src/plotter/Bits.java =================================================================== --- usertools/plotter/src/plotter/Bits.java 2011-06-17 02:19:13 UTC (rev 4627) +++ usertools/plotter/src/plotter/Bits.java 2011-06-17 19:28:46 UTC (rev 4628) @@ -10,141 +10,141 @@ public class Bits { - public static Random rng = null; - static boolean locked = false; - static boolean ready = false; + public static Random rng = null; + static boolean locked = false; + static boolean ready = false; - /** - If not locked, seed the generator with the clock. - */ - public static void init() - { - init(System.currentTimeMillis()); - } + /** + If not locked, seed the generator with the clock. + */ + public static void init() + { + init(System.currentTimeMillis()); + } - /** - If not locked, seed the generator with the clock mod 1000. - Useful for debugging. - @param print If true, print the seed. - */ - public static long init(boolean print) - { - long seed = System.currentTimeMillis() % 1000; - init(seed); + /** + If not locked, seed the generator with the clock mod 1000. + Useful for debugging. + @param print If true, print the seed. + */ + public static long init(boolean print) + { + long seed = System.currentTimeMillis() % 1000; + init(seed); - if (print) - System.out.println("Bits.seed: " + seed); + if (print) + System.out.println("Bits.seed: " + seed); - return seed; - } + return seed; + } - /** - If not locked, seed the generator - @param seed The seed. - */ - public static void init(long seed) - { - assert (!locked) : "Bits locked!"; - // System.out.println("Seeding RNG..."); - rng = new Random(seed); - ready = true; - } + /** + If not locked, seed the generator + @param seed The seed. + */ + public static void init(long seed) + { + assert (!locked) : "Bits locked!"; + // System.out.println("Seeding RNG..."); + rng = new Random(seed); + ready = true; + } - /** - Lock the generator to prevent seeding - */ - public static void lock() - { - locked = true; - } + /** + Lock the generator to prevent seeding + */ + public static void lock() + { + locked = true; + } - /** - Unlock the generator - */ - public static void unlock() - { - locked = false; - } + /** + Unlock the generator + */ + public static void unlock() + { + locked = false; + } - public static double nextDouble() - { - if (! ready) + public static double nextDouble() { - System.err.println("Bits not ready!"); - System.exit(2); + if (! ready) + { + System.err.println("Bits not ready!"); + System.exit(2); + } + return rng.nextDouble(); } - return rng.nextDouble(); - } - public static double nextDouble(double d) - { - return rng.nextDouble() * d; - } + public static double nextDouble(double d) + { + return rng.nextDouble() * d; + } - public static int nextInt() - { - if (! ready) + public static int nextInt() { - System.err.println("Bits not ready!"); - System.exit(2); + if (! ready) + { + System.err.println("Bits not ready!"); + System.exit(2); + } + return rng.nextInt(); } - return rng.nextInt(); - } - /** - Return a integer in [0..t). - */ - public static int nextInt(int t) - { - double d = nextDouble(); - int i = (new Double(d * t)).intValue(); - return i; - } + /** + Return a integer in [0..t). + */ + public static int nextInt(int t) + { + double d = nextDouble(); + int i = (new Double(d * t)).intValue(); + return i; + } - public static boolean nextBoolean() - { - if (! ready) + public static boolean nextBoolean() { - System.err.println("Bits not ready!"); - System.exit(2); + if (! ready) + { + System.err.println("Bits not ready!"); + System.exit(2); + } + return rng.nextBoolean(); } - return rng.nextBoolean(); - } - public static long nextLong() - { - if (! ready) + public static long nextLong() { - System.err.println("Bits not ready!"); - System.exit(2); + if (! ready) + { + System.err.println("Bits not ready!"); + System.exit(2); + } + return rng.nextLong(); } - return rng.nextLong(); - } - public static long nextLong(long t) - { - double d = nextDouble(); - long i = (new Double(d * t)).longValue(); - return i; - } + public static long nextLong(long t) + { + double d = nextDouble(); + long i = (new Double(d * t)).longValue(); + return i; + } - public static BigInteger nextBigInteger(BigInteger i) - { - if (i.equals(BigInteger.ZERO)) - return BigInteger.ZERO; - - int b = i.bitLength()+1; - BigInteger result; - do + public static BigInteger nextBigInteger(BigInteger i) { - result = BigInteger.valueOf(b); - } while (result.compareTo(i) >= 0); + if (i.equals(BigInteger.ZERO)) + return BigInteger.ZERO; - return result; - } + int b = i.bitLength()+1; + BigInteger result; + do + { + result = BigInteger.valueOf(b); + } while (result.compareTo(i) >= 0); - public static void nextBytes(byte[] bytes) - { - rng.nextBytes(bytes); - } + return result; + } + + public static void nextBytes(byte[] bytes) + { + rng.nextBytes(bytes); + } } Modified: usertools/plotter/src/plotter/Dual.java =================================================================== --- usertools/plotter/src/plotter/Dual.java 2011-06-17 02:19:13 UTC (rev 4627) +++ usertools/plotter/src/plotter/Dual.java 2011-06-17 19:28:46 UTC (rev 4628) @@ -27,405 +27,409 @@ * */ public class Dual { - static Properties properties; + static Properties properties; - public static boolean bw = false; + public static boolean bw = false; - static int width = 400; - static int height = 400; + static int width = 400; + static int height = 400; - // null indicates the value was not set by the user - static Double xmin = null; - static Double xmax = null; - static Double ymin1 = null; - static Double ymax1 = null; - static Double ymin2 = null; - static Double ymax2 = null; + // null indicates the value was not set by the user + static Double xmin = null; + static Double xmax = null; + static Double ymin1 = null; + static Double ymax1 = null; + static Double ymin2 = null; + static Double ymax2 = null; - /** - Generate simple plot - @param collection The x,y data - @param title Plot title - @param xlabel X label text - @param ylabel1 Y label text - @param ylabel2 Y label text - @param output EPS filename - */ - public static boolean plot(XYSeriesCollection[] collections, - String title, String xlabel, - String ylabel1, String ylabel2, - String output) - { - EPSDocumentGraphics2D g2d = null; - Rectangle2D.Double rectangle = null; - OutputStream out = null; - - try + /** + Generate simple plot + @param collection The x,y data + @param title Plot title + @param xlabel X label text + @param ylabel1 Y label text + @param ylabel2 Y label text + @param output EPS filename + @return true/false depending if the method completed without error or not + */ + public static boolean plot(XYSeriesCollection[] collections, + String title, String xlabel, + String ylabel1, String ylabel2, + String output) { - out = new FileOutputStream(output); - out = new BufferedOutputStream(out); + EPSDocumentGraphics2D g2d = null; + Rectangle2D.Double rectangle = null; + OutputStream out = null; - g2d = new EPSDocumentGraphics2D(false); - g2d.setGraphicContext - (new org.apache.xmlgraphics.java2d.GraphicContext()); + try + { + out = new FileOutputStream(output); + out = new BufferedOutputStream(out); - rectangle = new Rectangle2D.Double(0, 0, width, height); + g2d = new EPSDocumentGraphics2D(false); + g2d.setGraphicContext + (new org.apache.xmlgraphics.java2d.GraphicContext()); - g2d.setGraphicContext - (new org.apache.xmlgraphics.java2d.GraphicContext()); - g2d.setupDocument(out, width, height); - } - catch (IOException e) - { - System.out.println("Problem with file: " + output); - return false; - } + rectangle = new Rectangle2D.Double(0, 0, width, height); - final boolean withLegend = true; + g2d.setGraphicContext + (new org.apache.xmlgraphics.java2d.GraphicContext()); + g2d.setupDocument(out, width, height); + } + catch (IOException e) + { + System.err.println("Problem with file: " + output); + return false; + } - JFreeChart chart = - ChartFactory.createXYLineChart - (title, xlabel, ylabel1, collections[0], - PlotOrientation.VERTICAL, withLegend, false, false); + final boolean withLegend = true; - setupPlot(chart, collections, ylabel1, ylabel2); - chart.draw(g2d, rectangle); + JFreeChart chart = + ChartFactory.createXYLineChart + (title, xlabel, ylabel1, collections[0], + PlotOrientation.VERTICAL, withLegend, false, false); - try - { - g2d.finish(); - } - catch (Exception e) - { - System.out.println("Err!"); - } + setupPlot(chart, collections, ylabel1, ylabel2); + chart.draw(g2d, rectangle); - IOUtils.closeQuietly(out); - System.out.println("PLOTTED: " + output); + try + { + g2d.finish(); + } + catch (Exception e) + { + System.err.println("Err!" + e); + } - return true; - } + IOUtils.closeQuietly(out); + System.out.println("PLOTTED: " + output); - private static void setupPlot(JFreeChart chart, - XYSeriesCollection[] collections, - String ylabel1, String ylabel2) - { - XYPlot plot = chart.getXYPlot(); - XYLineAndShapeRenderer renderer1 = new XYLineAndShapeRenderer(); - XYLineAndShapeRenderer renderer2 = new XYLineAndShapeRenderer(); + return true; + } - int count = plot.getSeriesCount(); - if (bw) - for (int i = 0; i < count; i++) - { - renderer1.setSeriesPaint(i, Color.BLACK); - renderer2.setSeriesPaint(i, Color.BLACK); - } - Series series1 = collections[0].getSeries(0); - if (! showShape(series1.getDescription())) - renderer1.setSeriesShapesVisible(0, false); - Series series2 = collections[1].getSeries(0); - if (! showShape(series2.getDescription())) - renderer2.setSeriesShapesVisible(1, false); + private static void setupPlot(JFreeChart chart, + XYSeriesCollection[] collections, + String ylabel1, String ylabel2) + { + XYPlot plot = chart.getXYPlot(); + XYLineAndShapeRenderer renderer1 = new XYLineAndShapeRenderer(); + XYLineAndShapeRenderer renderer2 = new XYLineAndShapeRenderer(); - Plots.setupLegend(chart, properties); - setAxes(plot, ylabel1, ylabel2, collections[1]); - plot.setRenderer(0, renderer1); - plot.setRenderer(1, renderer2); - plot.setBackgroundPaint(Color.WHITE); - } + int count = plot.getSeriesCount(); + if (bw) + { + for (int i = 0; i < count; i++) + { + renderer1.setSeriesPaint(i, Color.BLACK); + renderer2.setSeriesPaint(i, Color.BLACK); + } + } - static void setAxes(XYPlot plot, String ylabel1, String ylabel2, - XYSeriesCollection collection) - { - plot.setDataset(1, collection); + Series series1 = collections[0].getSeries(0); + if (! showShape(series1.getDescription())) + renderer1.setSeriesShapesVisible(0, false); + Series series2 = collections[1].getSeries(0); + if (! showShape(series2.getDescription())) + renderer2.setSeriesShapesVisible(1, false); - // Actual values: modify if necessary - double axmin, axmax, aymin1, aymax1, aymin2, aymax2; - - if (xmin != null || xmax != null) - { - NumberAxis axis = new NumberAxis(); - plot.setDomainAxis(axis); - Range range = axis.getRange(); - axmin = range.getLowerBound(); - axmax = range.getUpperBound(); - if (xmin != null) axmin = xmin; - if (xmax != null) axmax = xmax; - axis.setRange(axmin, axmax); + Plots.setupLegend(chart, properties); + setAxes(plot, ylabel1, ylabel2, collections[1]); + plot.setRenderer(0, renderer1); + plot.setRenderer(1, renderer2); + plot.setBackgroundPaint(Color.WHITE); } - // Left Y axis - if (ymin1 != null || ymax1 != null) + static void setAxes(XYPlot plot, String ylabel1, String ylabel2, + XYSeriesCollection collection) { - NumberAxis axis = new NumberAxis(ylabel1); - plot.setRangeAxis(0, axis); - Range range = axis.getRange(); - aymin1 = range.getLowerBound(); - aymax1 = range.getUpperBound(); - if (ymin1 != null) aymin1 = ymin1; - if (ymax1 != null) aymax1 = ymax1; - axis.setRange(aymin1, aymax1); - } + plot.setDataset(1, collection); - // Right Y axis setup - Font font = plot.getRangeAxis().getLabelFont(); - final NumberAxis rightAxis = new NumberAxis(ylabel2); - rightAxis.setLabelFont(font); - plot.setRangeAxis(1, rightAxis); + // Actual values: modify if necessary + double axmin, axmax, aymin1, aymax1, aymin2, aymax2; - // Right Y axis - if (ymin2 != null || ymax2 != null) - { - Range range = rightAxis.getRange(); - aymin2 = range.getLowerBound(); - aymax2 = range.getUpperBound(); - if (ymin2 != null) aymin2 = ymin2; - if (ymax2 != null) aymax2 = ymax2; - rightAxis.setRange(aymin2, aymax2); - } + if (xmin != null || xmax != null) + { + NumberAxis axis = new NumberAxis(); + plot.setDomainAxis(axis); + Range range = axis.getRange(); + axmin = range.getLowerBound(); + axmax = range.getUpperBound(); + if (xmin != null) axmin = xmin; + if (xmax != null) axmax = xmax; + axis.setRange(axmin, axmax); + } - plot.mapDatasetToRangeAxis(0, 0); - plot.mapDatasetToRangeAxis(1, 1); - plot.configureRangeAxes(); - } + // Left Y axis + if (ymin1 != null || ymax1 != null) + { + NumberAxis axis = new NumberAxis(ylabel1); + plot.setRangeAxis(0, axis); + Range range = axis.getRange(); + aymin1 = range.getLowerBound(); + aymax1 = range.getUpperBound(); + if (ymin1 != null) aymin1 = ymin1; + if (ymax1 != null) aymax1 = ymax1; + axis.setRange(aymin1, aymax1); + } - /** - Args: Lines * - Reads settings from properties: see scanProperties() - Produces EPS output file - Data files are two-columns of numbers each - - see LineReader.read() and LineReader.array() - */ - public static void main(String[] args) - { - // Settings: - boolean verbose = false; + // Right Y axis setup + Font font = plot.getRangeAxis().getLabelFont(); + final NumberAxis rightAxis = new NumberAxis(ylabel2); + rightAxis.setLabelFont(font); + plot.setRangeAxis(1, rightAxis); - Getopt g = new Getopt("testprog", args, "v"); - int c = -1; - while ((c = g.getopt()) != -1) - { - switch (c) - { - case 'v': - verbose = true; - } + // Right Y axis + if (ymin2 != null || ymax2 != null) + { + Range range = rightAxis.getRange(); + aymin2 = range.getLowerBound(); + aymax2 = range.getUpperBound(); + if (ymin2 != null) aymin2 = ymin2; + if (ymax2 != null) aymax2 = ymax2; + rightAxis.setRange(aymin2, aymax2); + } + + plot.mapDatasetToRangeAxis(0, 0); + plot.mapDatasetToRangeAxis(1, 1); + plot.configureRangeAxes(); } - if (args.length < 3) + /** + Args: Lines * + Reads settings from properties: see scanProperties() + Produces EPS output file + Data files are two-columns of numbers each - + see LineReader.read() and LineReader.array() + */ + public void plotter(String[] args) { - System.out.println - ("usage: [] *"); - System.exit(2); - } + // Settings: + boolean verbose = false; - Bits.init(); - Util.verbose(verbose); + Getopt g = new Getopt("testprog", args, "v"); + int c = -1; + while ((c = g.getopt()) != -1) + { + switch (c) + { + case 'v': + verbose = true; + } + } - String propFile = args[0]; - String output = args[1]; - List names = new ArrayList(); - for (int i = 2; i < args.length; i++) - names.add(args[i]); + if (args.length < 3) + { + System.err.println + ("usage: [] *"); + System.exit(2); + } - String title = null; - String xlabel = null; - String ylabel1 = null; - String ylabel2 = null; - List data = new ArrayList(); - List labels = new ArrayList(); + Bits.init(); + Util.verbose(verbose); - properties = new Properties(); - load(propFile); - title = properties.getProperty("title"); - xlabel = properties.getProperty("xlabel"); - ylabel1 = properties.getProperty("ylabel1"); - ylabel2 = properties.getProperty("ylabel2"); + String propFile = args[0]; + String output = args[1]; + List names = new ArrayList(); + for (int i = 2; i < args.length; i++) + names.add(args[i]); - scanProperties(); + String title = null; + String xlabel = null; + String ylabel1 = null; + String ylabel2 = null; + List data = new ArrayList(); + List labels = new ArrayList(); - for (String name : names) - { - File file = new File(name); - Util.verbose("open: " + file); - List lines = null; - try - { - lines = LineReader.read(file); - } - catch (FileNotFoundException e) - { - System.out.println("not found: " + file); - System.exit(1); - } - double[][] array = LineReader.array(lines); - data.add(array); - addLabel(name, labels); - Util.verbose("array:\n" + toString(array)); - } + properties = new Properties(); + load(propFile); + title = properties.getProperty("title"); + xlabel = properties.getProperty("xlabel"); + ylabel1 = properties.getProperty("ylabel1"); + ylabel2 = properties.getProperty("ylabel2"); - XYSeriesCollection[] collections = - collections(data, labels, names); + scanProperties(); - plot(collections, title, xlabel, ylabel1, ylabel2, output); - } + for (String name : names) + { + File file = new File(name); + Util.verbose("open: " + file); + List lines = null; + try + { + lines = LineReader.read(file); + } + catch (FileNotFoundException e) + { + System.err.println("not found: " + file); + System.exit(1); + } + double[][] array = LineReader.array(lines); + data.add(array); + addLabel(name, labels); + Util.verbose("array:\n" + toString(array)); + } - static XYSeriesCollection[] collections(List data, - List labels, - List names) - { - final XYSeriesCollection[] result = new XYSeriesCollection[2]; - result[0] = new XYSeriesCollection(); - result[1] = new XYSeriesCollection(); + XYSeriesCollection[] collections = + collections(data, labels, names); - int count = 0; - for (int i = 0; i < 2; i++) + plot(collections, title, xlabel, ylabel1, ylabel2, output); + } + + static XYSeriesCollection[] collections(List data, + List labels, + List names) { - double[][] d = data.get(i); - String label = "data: " + count; - try - { - label = labels.get(count); - } - catch (IndexOutOfBoundsException e) - {} + final XYSeriesCollection[] result = new XYSeriesCollection[2]; + result[0] = new XYSeriesCollection(); + result[1] = new XYSeriesCollection(); - XYSeries series = new XYSeries(label); - for (int j = 0; j < d.length; j++) - { - series.add(d[j][0], d[j][1]); - } + int count = 0; + for (int i = 0; i < 2; i++) + { + double[][] d = data.get(i); + String label = "data: " + count; + try + { + label = labels.get(count); + } + catch (IndexOutOfBoundsException e) + {} - series.setDescription(names.get(count)); - result[i].addSeries(series); - count++; + XYSeries series = new XYSeries(label); + for (int j = 0; j < d.length; j++) + { + series.add(d[j][0], d[j][1]); + } + + series.setDescription(names.get(count)); + result[i].addSeries(series); + count++; + } + return result; } - return result; - } - static void load(String propFile) - { - try + static void load(String propFile) { - if (propFile.equals("-")) - properties.load(System.in); - else - properties.load(new FileInputStream(propFile)); + try + { + if (propFile.equals("-")) + properties.load(System.in); + else + properties.load(new FileInputStream(propFile)); + } + catch (FileNotFoundException e) + { + System.err.println(e); + System.exit(1); + } + catch (IOException e) + { + e.printStackTrace(); + System.exit(1); + } } - catch (FileNotFoundException e) - { - System.out.println(e); - System.exit(1); - } - catch (IOException e) - { - e.printStackTrace(); - System.exit(1); - } - } - /** - Various plot properties. All are currently optional + /** + Various plot properties. All are currently optional - Example. - Assume you want to plot a two-column table in file.data. - The first column is the x values and the second column - is the y values. See LineReader for details. + Example. + Assume you want to plot a two-column table in file.data. + The first column is the x values and the second column + is the y values. See LineReader for details. - Your properties may include: - title = Plot - xlabel = size - ylabel = speed - label.file.data = legend text - width (output image width) - height (output image height) - xmin, xmax, ymin1, ymax1, ymin2, ymax2 - (auto-selected if not given) - bw (Black and white, true/false, default false) - */ - static void scanProperties() - { - String tmp; - tmp = properties.getProperty("width"); - if (tmp != null) - width = Integer.parseInt(tmp.trim()); - tmp = properties.getProperty("height"); - if (tmp != null) - height = Integer.parseInt(tmp.trim()); - tmp = properties.getProperty("xmin"); - if (tmp != null) - xmin = Double.parseDouble(tmp); - tmp = properties.getProperty("xmax"); - if (tmp != null) - xmax = Double.parseDouble(tmp); - tmp = properties.getProperty("ymin1"); - if (tmp != null) - ymin1 = Double.parseDouble(tmp); - tmp = properties.getProperty("ymax1"); - if (tmp != null) - ymax1 = Double.parseDouble(tmp); - tmp = properties.getProperty("ymin2"); - if (tmp != null) - ymin2 = Double.parseDouble(tmp); - tmp = properties.getProperty("ymax2"); - if (tmp != null) - ymax2 = Double.parseDouble(tmp); + Your properties may include: + title = Plot + xlabel = size + ylabel = speed + label.file.data = legend text + width (output image width) + height (output image height) + xmin, xmax, ymin1, ymax1, ymin2, ymax2 + (auto-selected if not given) + bw (Black and white, true/false, default false) + */ + static void scanProperties() + { + String tmp; + tmp = properties.getProperty("width"); + if (tmp != null) + width = Integer.parseInt(tmp.trim()); + tmp = properties.getProperty("height"); + if (tmp != null) + height = Integer.parseInt(tmp.trim()); + tmp = properties.getProperty("xmin"); + if (tmp != null) + xmin = Double.parseDouble(tmp); + tmp = properties.getProperty("xmax"); + if (tmp != null) + xmax = Double.parseDouble(tmp); + tmp = properties.getProperty("ymin1"); + if (tmp != null) + ymin1 = Double.parseDouble(tmp); + tmp = properties.getProperty("ymax1"); + if (tmp != null) + ymax1 = Double.parseDouble(tmp); + tmp = properties.getProperty("ymin2"); + if (tmp != null) + ymin2 = Double.parseDouble(tmp); + tmp = properties.getProperty("ymax2"); + if (tmp != null) + ymax2 = Double.parseDouble(tmp); - tmp = properties.getProperty("bw"); - if (tmp != null) - bw = Boolean.parseBoolean(tmp); - } + tmp = properties.getProperty("bw"); + if (tmp != null) + bw = Boolean.parseBoolean(tmp); + } - /** - Arrays.copyOfRange is a Java 1.6 feature. - This has the same signature. - */ - /* - static String[] select(String[] s, int p, int q) - { - String[] result = new String[q-p]; - int j = 0; - for (int i = p; i < q; i++) + /** + Arrays.copyOfRange is a Java 1.6 feature. + This has the same signature. + */ + /* + static String[] select(String[] s, int p, int q) + { + String[] result = new String[q-p]; + int j = 0; + for (int i = p; i < q; i++) result[j++] = s[i]; - return result; - } - */ + return result; + } + */ - static void addLabel(String name, - List labels) - { - String label = properties.getProperty("label."+name); - if (label == null) - label = ""; - labels.add(label); - } + static void addLabel(String name, + List labels) + { + String label = properties.getProperty("label."+name); + if (label == null) + label = ""; + labels.add(label); + } - static boolean showShape(String name) - { - // System.out.println(name); - String mode = properties.getProperty("shape."+name); - // System.out.println(mode); - if ("none".equals(mode)) - return false; - return true; - } + static boolean showShape(String name) + { + // System.out.println(name); + String mode = properties.getProperty("shape."+name); + // System.out.println(mode); + if ("none".equals(mode)) + return false; + return true; + } - static String toString(double[][] array) - { - StringBuilder sb = new StringBuilder(); - for (int i = 0; i < array.length; i++) + static String toString(double[][] array) { - double[] row = array[i]; - for (int j = 0; j < row.length; j++) - { - sb.append(array[i][j]); - if (j < row.length-1) - sb.append(" "); - } - sb.append("\n"); + StringBuilder sb = new StringBuilder(); + for (int i = 0; i < array.length; i++) + { + double[] row = array[i]; + for (int j = 0; j < row.length; j++) + { + sb.append(array[i][j]); + if (j < row.length-1) + sb.append(" "); + } + sb.append("\n"); + } + return sb.toString(); } - return sb.toString(); - } } Modified: usertools/plotter/src/plotter/LineReader.java =================================================================== --- usertools/plotter/src/plotter/LineReader.java 2011-06-17 02:19:13 UTC (rev 4627) +++ usertools/plotter/src/plotter/LineReader.java 2011-06-17 19:28:46 UTC (rev 4628) @@ -1,6 +1,7 @@ package plotter; import java.util.*; +import java.io.*; /** * Utility to read a file into a List of String lines. @@ -11,148 +12,148 @@ * */ public class LineReader { - LineReader() - {} + LineReader() + {} - public static List read(java.io.File file) - throws java.io.FileNotFoundException - { - java.io.BufferedReader reader = - new java.io.BufferedReader(new java.io.FileReader(file)); - return read(reader); - } + public static List read(File file) + throws FileNotFoundException + { + BufferedReader reader = + new BufferedReader(new FileReader(file)); + return read(reader); + } - public static List read(String s) - { - java.io.BufferedReader reader = - new java.io.BufferedReader(new java.io.StringReader(s)); - return read(reader); - } + public static List read(String s) + { + BufferedReader reader = + new BufferedReader(new StringReader(s)); + return read(reader); + } - public static List read(java.io.BufferedReader reader) - { - List result = new ArrayList(); - try + public static List read(BufferedReader reader) { - String prevline = ""; - String line = ""; - while ((line = reader.readLine()) != null) - { - int hash = line.indexOf("#"); - if (hash >= 0) - line = line.substring(0,hash); - line = spaces(line); - line = (prevline + " " + line).trim(); - if (line.endsWith("\\")) + List result = new ArrayList(); + try { - line = line.substring(0, line.length()-2); - prevline = line; - continue; + String prevline = ""; + String line = ""; + while ((line = reader.readLine()) != null) + { + int hash = line.indexOf("#"); + if (hash >= 0) + line = line.substring(0,hash); + line = spaces(line); + line = (prevline + " " + line).trim(); + if (line.endsWith("\\")) + { + line = line.substring(0, line.length()-2); + prevline = line; + continue; + } + else + { + prevline = ""; + line = line.trim(); + if (line.length() > 0) + result.add(line); + } + } + reader.close(); } - else + catch (IOException e) { - prevline = ""; - line = line.trim(); - if (line.length() > 0) - result.add(line); + System.err.println("LineReader: I/O problem."); + return null; } - } - reader.close(); + return result; } - catch (java.io.IOException e) + + public static List tokens(List lines) { - System.out.println("LineReader: I/O problem."); - return null; + List result = new ArrayList(lines.size()); + for (String line : lines) + { + String[] tokens = tokenize(line); + result.add(tokens); + } + return result; } - return result; - } - public static List tokens(List lines) - { - List result = new ArrayList(lines.size()); - for (String line : lines) + public static int maxTokens(List tokens) { - String[] tokens = tokenize(line); - result.add(tokens); + int result = 0; + for (String[] t : tokens) + if (t.length > result) + result = t.length; + return result; } - return result; - } - public static int maxTokens(List tokens) - { - int result = 0; - for (String[] t : tokens) - if (t.length > result) - result = t.length; - return result; - } + /** + Take line-oriented data and produce an array of doubles. + */ + public static double[][] array(List lines) + { + List tokens = tokens(lines); + int columns = maxTokens(tokens); + int rows = lines.size(); + double[][] result = new double[rows][columns]; + for (int i = 0; i < rows; i++) + for (int j = 0; j < columns; j++) + { + try + { + String v = tokens.get(i)[j]; + double d = Double.parseDouble(v); + result[i][j] = d; + } + catch (NumberFormatException e) + { + throw new RuntimeException("Problem in row: " + i); + } + } + return result; + } - /** - Take line-oriented data and produce an array of doubles. - */ - public static double[][] array(List lines) - { - List tokens = tokens(lines); - int columns = maxTokens(tokens); - int rows = lines.size(); - double[][] result = new double[rows][columns]; - for (int i = 0; i < rows; i++) - for (int j = 0; j < columns; j++) - { - try + public static String spaces(String line) + { + String result = ""; + for (int i = 0; i < line.length(); i++) { - String v = tokens.get(i)[j]; - double d = Double.parseDouble(v); - result[i][j] = d; + if (line.charAt(i) == '=' && + line.charAt(i+1) != '=' && + line.charAt(i-1) != '=') + { + result += " = "; + } + else + result += line.substring(i,i+1); } - catch (NumberFormatException e) - { - throw new RuntimeException("Problem in row: " + i); - } - } - return result; - } + return result; + } - public static String spaces(String line) - { - String result = ""; - for (int i = 0; i < line.length(); i++) + public static String[] tokenize(String line) { - if (line.charAt(i) == '=' && - line.charAt(i+1) != '=' && - line.charAt(i-1) != '=') - { - result += " = "; - } - else - result += line.substring(i,i+1); + if (line == null) + return null; + List words = new ArrayList(); + String[] ws = line.split("\\s"); + for (int i = 0; i < ws.length; i++) + if (ws[i].length() > 0) + words.add(ws[i]); + String[] result = new String[words.size()]; + for (int i = 0; i < words.size(); i++) + result[i] = words.get(i); + return result; } - return result; - } - public static String[] tokenize(String line) - { - if (line == null) - return null; - List words = new ArrayList(); - String[] ws = line.split("\\s"); - for (int i = 0; i < ws.length; i++) - if (ws[i].length() > 0) - words.add(ws[i]); - String[] result = new String[words.size()]; - for (int i = 0; i < words.size(); i++) - result[i] = words.get(i); - return result; - } - - /* - public static List list(String line) - { - List result = new ArrayList(); - String[] tokens = tokenize(line); - for (int i = 0; i < tokens.length; i++) + /* + public static List list(String line) + { + List result = new ArrayList(); + String[] tokens = tokenize(line); + for (int i = 0; i < tokens.length; i++) result.add(tokens[i]); - return result; - } - */ + return result; + } + */ } Modified: usertools/plotter/src/plotter/Lines.java =================================================================== --- usertools/plotter/src/plotter/Lines.java 2011-06-17 02:19:13 UTC (rev 4627) +++ usertools/plotter/src/plotter/Lines.java 2011-06-17 19:28:46 UTC (rev 4628) @@ -24,326 +24,327 @@ * */ public class Lines { - static Properties properties; + static Properties properties; - public static boolean bw = false; + public static boolean bw = false; - static int width = 400; - static int height = 400; + static int width = 400; + static int height = 400; - // null indicates the value was not set by the user - static Double xmin = null; - static Double xmax = null; - static Double ymin = null; - static Double ymax = null; + // null indicates the value was not set by the user + static Double xmin = null; + static Double xmax = null; + static Double ymin = null; + static Double ymax = null; - static boolean withLegend = true; + static boolean withLegend = true; - /** - Generate simple plot. - @param collection The x,y data. - @param title Plot title. - @param xlabel X label text. - @param ylabel Y label text. - @param output EPS filename. - */ - public static boolean plot(XYSeriesCollection collection, - String title, String xlabel, - String ylabel, String output) - { - EPSDocumentGraphics2D g2d = null; - Rectangle2D.Double rectangle = null; - OutputStream out = null; - - try + /** + Generate simple plot. + @param collection The x,y data. + @param title Plot title. + @param xlabel X label text. + @param ylabel Y label text. + @param output EPS filename. + @return true/false depending if the method completed without error or not + */ + public static boolean plot(XYSeriesCollection collection, + String title, String xlabel, + String ylabel, String output) { - out = new FileOutputStream(output); - out = new BufferedOutputStream(out); + EPSDocumentGraphics2D g2d = null; + Rectangle2D.Double rectangle = null; + OutputStream out = null; - g2d = new EPSDocumentGraphics2D(false); - g2d.setGraphicContext - (new org.apache.xmlgraphics.java2d.GraphicContext()); + try + { + out = new FileOutputStream(output); + out = new BufferedOutputStream(out); - rectangle = new Rectangle2D.Double(0, 0, width, height); + g2d = new EPSDocumentGraphics2D(false); + g2d.setGraphicContext + (new org.apache.xmlgraphics.java2d.GraphicContext()); - g2d.setGraphicContext - (new org.apache.xmlgraphics.java2d.GraphicContext()); - g2d.setupDocument(out, width, height); - } - catch (IOException e) - { - System.out.println("Problem with file: " + output); - return false; - } + rectangle = new Rectangle2D.Double(0, 0, width, height); - JFreeChart chart = - ChartFactory.createXYLineChart - (title, xlabel, ylabel, collection, - PlotOrientation.VERTICAL, withLegend, false, false); + g2d.setGraphicContext + (new org.apache.xmlgraphics.java2d.GraphicContext()); + g2d.setupDocument(out, width, height); + } + catch (IOException e) + { + System.err.println("Problem with file: " + output); + return false; + } - setupPlot(chart, collection); - chart.draw(g2d, rectangle); + JFreeChart chart = + ChartFactory.createXYLineChart + (title, xlabel, ylabel, collection, + PlotOrientation.VERTICAL, withLegend, false, false); - try - { - g2d.finish(); - } - catch (Exception e) - { - System.out.println("Err!"); - } + setupPlot(chart, collection); + chart.draw(g2d, rectangle); - IOUtils.closeQuietly(out); - System.out.println("PLOTTED: " + output); + try + { + g2d.finish(); + } + catch (Exception e) + { + System.err.println("Err!" + e); + } - return true; - } + IOUtils.closeQuietly(out); + System.out.println("PLOTTED: " + output); - private static void setupPlot(JFreeChart chart, - XYSeriesCollection collection) - { - XYPlot plot = chart.getXYPlot(); - XYLineAndShapeRenderer renderer = new XYLineAndShapeRenderer(); - if (bw) - for (int i = 0; i < plot.getSeriesCount(); i++) - renderer.setSeriesPaint(i, Color.BLACK); - for (int i = 0; i < plot.getSeriesCount(); i++) - { - Series series = collection.getSeries(i); - if (! showShape(series.getDescription())) - renderer.setSeriesShapesVisible(i, false); + return true; } - Plots.setupLegend(chart, properties); - setAxes(plot); - plot.setRenderer(renderer); - plot.setBackgroundPaint(Color.WHITE); - } + private static void setupPlot(JFreeChart chart, + XYSeriesCollection collection) + { + XYPlot plot = chart.getXYPlot(); + XYLineAndShapeRenderer renderer = new XYLineAndShapeRenderer(); + if (bw) + for (int i = 0; i < plot.getSeriesCount(); i++) + renderer.setSeriesPaint(i, Color.BLACK); + for (int i = 0; i < plot.getSeriesCount(); i++) + { + Series series = collection.getSeries(i); + if (! showShape(series.getDescription())) + renderer.setSeriesShapesVisible(i, false); + } - static void setAxes(XYPlot plot) - { - // Actual values: modify if necessary - double axmin, axmax, aymin, aymax; - - if (xmin != null || xmax != null) - { - NumberAxis axis = (NumberAxis) plot.getDomainAxis(); - Range range = axis.getRange(); - axmin = range.getLowerBound(); - axmax = range.getUpperBound(); - if (xmin != null) axmin = xmin; - if (xmax != null) axmax = xmax; - axis.setRange(axmin, axmax); + Plots.setupLegend(chart, properties); + setAxes(plot); + plot.setRenderer(renderer); + plot.setBackgroundPaint(Color.WHITE); } - if (ymin != null || ymax != null) + static void setAxes(XYPlot plot) { - NumberAxis axis = (NumberAxis) plot.getRangeAxis(); - Range range = axis.getRange(); - aymin = range.getLowerBound(); - aymax = range.getUpperBound(); - if (ymin != null) aymin = ymin; - if (ymax != null) aymax = ymax; - axis.setRange(aymin, aymax); - } - } + // Actual values: modify if necessary + double axmin, axmax, aymin, aymax; - /** - Args: Lines * - Reads settings from properties: see scanProperties() - Produces EPS output file - Data files are two-columns of numbers each - - see LineReader.read() and LineReader.array() - */ - public static void main(String[] args) - { - // Settings: - boolean verbose = false; + if (xmin != null || xmax != null) + { + NumberAxis axis = (NumberAxis) plot.getDomainAxis(); + Range range = axis.getRange(); + axmin = range.getLowerBound(); + axmax = range.getUpperBound(); + if (xmin != null) axmin = xmin; + if (xmax != null) axmax = xmax; + axis.setRange(axmin, axmax); + } - Getopt g = new Getopt("testprog", args, "v"); - int c = -1; - while ((c = g.getopt()) != -1) - { - switch (c) - { - case 'v': - verbose = true; - } + if (ymin != null || ymax != null) + { + NumberAxis axis = (NumberAxis) plot.getRangeAxis(); + Range range = axis.getRange(); + aymin = range.getLowerBound(); + aymax = range.getUpperBound(); + if (ymin != null) aymin = ymin; + if (ymax != null) aymax = ymax; + axis.setRange(aymin, aymax); + } } - if (args.length < 3) + /** + Args: Lines * + Reads settings from properties: see scanProperties() + Produces EPS output file + Data files are two-columns of numbers each - + see LineReader.read() and LineReader.array() + */ + public void plotter(String[] args) { - System.out.println - ("usage: [] *"); - System.exit(2); - } + // Settings: + boolean verbose = false; - Bits.init(); - Util.verbose(verbose); + Getopt g = new Getopt("testprog", args, "v"); + int c = -1; + while ((c = g.getopt()) != -1) + { + switch (c) + { + case 'v': + verbose = true; + } + } - String propFile = args[0]; - String output = args[1]; - List names = new ArrayList(); - for (int i = 2; i < args.length; i++) - names.add(args[i]); + if (args.length < 3) + { + System.err.println + ("usage: [] *"); + System.exit(2); + } - String title = null; - String xlabel = null; - String ylabel = null; - List data = new ArrayList(); - List labels = new ArrayList(); + Bits.init(); + Util.verbose(verbose); - properties = new Properties(); - load(propFile); - title = properties.getProperty("title"); - xlabel = properties.getProperty("xlabel"); - ylabel = properties.getProperty("ylabel"); + String propFile = args[0]; + String output = args[1]; + List names = new ArrayList(); + for (int i = 2; i < args.length; i++) + names.add(args[i]); - scanProperties(); + String title = null; + String xlabel = null; + String ylabel = null; + List data = new ArrayList(); + List labels = new ArrayList(); - for (String name : names) - { - File file = new File(name); - Util.verbose("open: " + file); - List lines = null; - try - { - lines = LineReader.read(file); - } - catch (FileNotFoundException e) - { - System.out.println("not found: " + file); - System.exit(1); - } - double[][] array = LineReader.array(lines); - data.add(array); - addLabel(name, labels); - Util.verbose("array:\n" + toString(array)); - } + properties = new Properties(); + load(propFile); + title = properties.getProperty("title"); + xlabel = properties.getProperty("xlabel"); + ylabel = properties.getProperty("ylabel"); - XYSeriesCollection collection = Util.collection(data, labels, - names); + scanProperties(); - plot(collection, title, xlabel, ylabel, output); - } + for (String name : names) + { + File file = new File(name); + Util.verbose("open: " + file); + List lines = null; + try + { + lines = LineReader.read(file); + } + catch (FileNotFoundException e) + { + System.err.println("not found: " + file); + System.exit(1); + } + double[][] array = LineReader.array(lines); + data.add(array); + addLabel(name, labels); + Util.verbose("array:\n" + toString(array)); + } - static void load(String propFile) - { - try - { - if (propFile.equals("-")) - properties.load(System.in); - else - properties.load(new FileInputStream(propFile)); + XYSeriesCollection collection = Util.collection(data, labels, + names); + + plot(collection, title, xlabel, ylabel, output); } - catch (FileNotFoundException e) + + static void load(String propFile) { - System.out.println(e); - System.exit(1); + try + { + if (propFile.equals("-")) + properties.load(System.in); + else + properties.load(new FileInputStream(propFile)); + } + catch (FileNotFoundException e) + { + System.err.println(e); + System.exit(1); + } + catch (IOException e) + { + e.printStackTrace(); + System.exit(1); + } } - catch (IOException e) - { - e.printStackTrace(); - System.exit(1); - } - } - /** - Various plot properties. All are currently optional + /** + Various plot properties. All are currently optional - Example. - Assume you want to plot a two-column table in file.data. - The first column is the x values and the second column - is the y values. See LineReader for details. + Example. + Assume you want to plot a two-column table in file.data. + The first column is the x values and the second column + is the y values. See LineReader for details. - Your properties may include: - title = Plot - xlabel = size - ylabel = speed - label.file.data = legend text - width (output image width) - height (output image height) - xmin, xmax, ymin, ymax (auto-selected if not given) - bw (Black and white, true/false, default false) - legend.enabled (true/false, default true) - */ - static void scanProperties() - { - String tmp; - tmp = properties.getProperty("width"); - if (tmp != null) - width = Integer.parseInt(tmp.trim()); - tmp = properties.getProperty("height"); - if (tmp != null) - height = Integer.parseInt(tmp.trim()); - tmp = properties.getProperty("xmin"); - if (tmp != null) - xmin = Double.parseDouble(tmp); - tmp = properties.getProperty("xmax"); - if (tmp != null) - xmax = Double.parseDouble(tmp); - tmp = properties.getProperty("ymin"); - if (tmp != null) - ymin = Double.parseDouble(tmp); - tmp = properties.getProperty("ymax"); - if (tmp != null) - ymax = Double.parseDouble(tmp); - tmp = properties.getProperty("bw"); - if (tmp != null) - bw = Boolean.parseBoolean(tmp); - tmp = properties.getProperty("legend.enabled"); - if (tmp != null) - withLegend = Boolean.parseBoolean(tmp); - } + Your properties may include: + title = Plot + xlabel = size + ylabel = speed + label.file.data = legend text + width (output image width) + height (output image height) + xmin, xmax, ymin, ymax (auto-selected if not given) + bw (Black and white, true/false, default false) + legend.enabled (true/false, default true) + */ + static void scanProperties() + { + String tmp; + tmp = properties.getProperty("width"); + if (tmp != null) + width = Integer.parseInt(tmp.trim()); + tmp = properties.getProperty("height"); + if (tmp != null) + height = Integer.parseInt(tmp.trim()); + tmp = properties.getProperty("xmin"); + if (tmp != null) + xmin = Double.parseDouble(tmp); + tmp = properties.getProperty("xmax"); + if (tmp != null) + xmax = Double.parseDouble(tmp); + tmp = properties.getProperty("ymin"); + if (tmp != null) + ymin = Double.parseDouble(tmp); + tmp = properties.getProperty("ymax"); + if (tmp != null) + ymax = Double.parseDouble(tmp); + tmp = properties.getProperty("bw"); + if (tmp != null) + bw = Boolean.parseBoolean(tmp); + tmp = properties.getProperty("legend.enabled"); + if (tmp != null) + withLegend = Boolean.parseBoolean(tmp); + } - /** - Arrays.copyOfRange is a Java 1.6 feature. - This has the same signature. - */ - /* - static String[] select(String[] s, int p, int q) - { - String[] result = new String[q-p]; - int j = 0; - for (int i = p; i < q; i++) + /** + Arrays.copyOfRange is a Java 1.6 feature. + This has the same signature. + */ + /* + static String[] select(String[] s, int p, int q) + { + String[] result = new String[q-p]; + int j = 0; + for (int i = p; i < q; i++) result[j++] = s[i]; - return result; - } - */ + return result; + } + */ - static void addLabel(String name, - List labels) - { - String label = properties.getProperty("label."+name); - if (label == null) - label = ""; - labels.add(label); - } + static void addLabel(String name, + List labels) + { + String label = properties.getProperty("label."+name); + if (label == null) + label = ""; + labels.add(label); + } - static boolean showShape(String name) - { - // System.out.println(name); - String mode = properties.getProperty("shape."+name); - // System.out.println(mode); - if ("none".equals(mode)) - return false; - return true; - } + static boolean showShape(String name) + { + // System.out.println(name); + String mode = properties.getProperty("shape."+name); + // System.out.println(mode); + if ("none".equals(mode)) + return false; + return true; + } - static String toString(double[][] array) - { - StringBuilder sb = new StringBuilder(); - for (int i = 0; i < array.length; i++) + static String toString(double[][] array) { - double[] row = array[i]; - for (int j = 0; j < row.length; j++) - { - sb.append(array[i][j]); - if (j < row.length-1) - sb.append(" "); - } - sb.append("\n"); + StringBuilder sb = new StringBuilder(); + for (int i = 0; i < array.length; i++) + { + double[] row = array[i]; + for (int j = 0; j < row.length; j++) + { + sb.append(array[i][j]); + if (j < row.length-1) + sb.append(" "); + } + sb.append("\n"); + } + return sb.toString(); } - return sb.toString(); - } } Modified: usertools/plotter/src/plotter/Plots.java =================================================================== --- usertools/plotter/src/plotter/Plots.java 2011-06-17 02:19:13 UTC (rev 4627) +++ usertools/plotter/src/plotter/Plots.java 2011-06-17 19:28:46 UTC (rev 4628) @@ -13,22 +13,22 @@ */ public class Plots { - static void setupLegend(JFreeChart chart, - Properties properties) - { - LegendTitle legend = chart.getLegend(); - Font font = getLegendFont(properties); - if (font != null) - legend.setItemFont(font); - } + static void setupLegend(JFreeChart chart, + Properties properties) + { + LegendTitle legend = chart.getLegend(); + Font font = getLegendFont(properties); + if (font != null) + legend.setItemFont(font); + } - static Font getLegendFont(Properties properties) - { - Font result = null; - String name = properties.getProperty("legend.font"); - if (name == null) - return null; - result = new Font(name, Font.PLAIN, 12); - return result; - } + static Font getLegendFont(Properties properties) + { + Font result = null; + String name = properties.getProperty("legend.font"); + if (name == null) + return null; + result = new Font(name, Font.PLAIN, 12); + return result; + } } Added: usertools/plotter/src/plotter/Plotter.java =================================================================== --- usertools/plotter/src/plotter/Plotter.java (rev 0) +++ usertools/plotter/src/plotter/Plotter.java 2011-06-17 19:28:46 UTC (rev 4628) @@ -0,0 +1,46 @@ +package plotter; + +import plotter.Lines; +import plotter.Dual; + +public class Plotter +{ + public static void main(String[] args) + { + if (args.length < 4 ) + { + usage(); + } + + /* Gather the arguments except the first one */ + String[] tmp = new String[args.length - 1]; + for( int i = 0; i < tmp.length; ++i ) + { + tmp[i] = args[i+1]; + } + + /* If asking for a single labeled Y-axis */ + if (args[0].equalsIgnoreCase( "-s" )) + { + Lines l = new Lines(); + l.plotter(tmp); + } + /* If asking for a dual labeled Y-axis */ + else if (args[0].equalsIgnoreCase( "-d" )) + { + Dual d = new Dual(); + d.plotter(tmp); + } + /* Do not understand option for what graph */ + else + { + usage(); + } + } + + public static void usage() + { + System.err.println( "usage: [-s,-d] [] *" ); + System.exit(2); + } +} Modified: usertools/plotter/src/plotter/Util.java =================================================================== --- usertools/plotter/src/plotter/Util.java 2011-06-17 02:19:13 UTC (rev 4627) +++ usertools/plotter/src/plotter/Util.java 2011-06-17 19:28:46 UTC (rev 4628) @@ -11,54 +11,54 @@ public class Util { - static boolean v = false; + static boolean v = false; - /** - Stores the label as the Series key. - Stores the filename as the Series description. - */ - static XYSeriesCollection collection(List data, - List labels, - List names) - { - final XYSeriesCollection collection = new XYSeriesCollection(); - - int count = 0; - for (double[][] d : data) + /** + Stores the label as the Series key. + Stores the filename as the Series description. + */ + static XYSeriesCollection collection(List data, + List labels, + List names) { - String label = "data: " + count; - try - { - label = labels.get(count); - } - catch (IndexOutOfBoundsException e) - {} + final XYSeriesCollection collection = new XYSeriesCollection(); - XYSeries series = new XYSeries(label); - for (int i = 0; i < d.length; i++) - series.add(d[i][0], d[i][1]); + int count = 0; + for (double[][] d : data) + { + String label = "data: " + count; + try + { + label = labels.get(count); + } + catch (IndexOutOfBoundsException e) + {} - series.setDescription(names.get(count)); - collection.addSeries(series); - count++; + XYSeries series = new XYSeries(label); + for (int i = 0; i < d.length; i++) + series.add(d[i][0], d[i][1]); + + series.setDescription(names.get(count)); + collection.addSeries(series); + count++; + } + return collection; } - return collection; - } - public static void fatal(String s) - { - System.out.println(s); - System.exit(2); - } + public static void fatal(String s) + { + System.err.println(s); + System.exit(2); + } - public static void verbose(String s) - { - if (v) - System.out.println(s); - } + public static void verbose(String s) + { + if (v) + System.out.println(s); + } - public static void verbose(boolean status) - { - v = status; - } + public static void verbose(boolean status) + { + v = status; + } } Added: usertools/plotter/swift_plotter.zsh =================================================================== --- usertools/plotter/swift_plotter.zsh (rev 0) +++ usertools/plotter/swift_plotter.zsh 2011-06-17 19:28:46 UTC (rev 4628) @@ -0,0 +1,10 @@ +#!/bin/zsh + +PLOTTERS=$( cd $( dirname $0 ) ; /bin/pwd ) + +# declare -p PLOTTERS + +source ${PLOTTERS}/classpath.zsh +[[ $? != 0 ]] && print "Could not build CLASSPATH!" && return 1 + +java -ea -cp ${CP} plotter.Plotter ${*} Property changes on: usertools/plotter/swift_plotter.zsh ___________________________________________________________________ Added: svn:executable + * From hategan at ci.uchicago.edu Fri Jun 17 16:27:14 2011 From: hategan at ci.uchicago.edu (hategan at ci.uchicago.edu) Date: Fri, 17 Jun 2011 16:27:14 -0500 (CDT) Subject: [Swift-commit] r4631 - trunk/src/org/griphyn/vdl/mapping Message-ID: <20110617212714.1CE799CCAC@svn.ci.uchicago.edu> Author: hategan Date: 2011-06-17 16:27:14 -0500 (Fri, 17 Jun 2011) New Revision: 4631 Modified: trunk/src/org/griphyn/vdl/mapping/AbstractDataNode.java Log: fixed deadlock in handle notification Modified: trunk/src/org/griphyn/vdl/mapping/AbstractDataNode.java =================================================================== --- trunk/src/org/griphyn/vdl/mapping/AbstractDataNode.java 2011-06-17 20:23:23 UTC (rev 4630) +++ trunk/src/org/griphyn/vdl/mapping/AbstractDataNode.java 2011-06-17 21:27:14 UTC (rev 4631) @@ -400,11 +400,14 @@ } } - public synchronized void closeShallow() { - if (this.closed) { - return; + public void closeShallow() { + synchronized(this) { + if (this.closed) { + return; + } + this.closed = true; } - this.closed = true; + // closed notifyListeners(); if (logger.isInfoEnabled()) { logger.debug("closed " + this.getIdentifyingString()); @@ -571,18 +574,22 @@ return handles; } - public synchronized void addListener(DSHandleListener listener) { + public void addListener(DSHandleListener listener) { if (logger.isDebugEnabled()) { logger.debug("Adding handle listener \"" + listener + "\" to \"" + getIdentifyingString() + "\""); } - if (listeners == null) { - listeners = new ArrayList(); + synchronized(this) { + if (listeners == null) { + listeners = new ArrayList(); + } + listeners.add(listener); + if (!closed) { + return; + } } - listeners.add(listener); - if (closed) { - notifyListeners(); - } + // listeners != null, closed + notifyListeners(); } protected void notifyListeners() { From jonmon at ci.uchicago.edu Mon Jun 20 09:44:45 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Mon, 20 Jun 2011 09:44:45 -0500 (CDT) Subject: [Swift-commit] r4633 - trunk/docs/userguide Message-ID: <20110620144445.D597F9CC8D@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-20 09:44:45 -0500 (Mon, 20 Jun 2011) New Revision: 4633 Modified: trunk/docs/userguide/app_procedures Log: added description for @tofloat and @length functions Modified: trunk/docs/userguide/app_procedures =================================================================== --- trunk/docs/userguide/app_procedures 2011-06-17 23:34:08 UTC (rev 4632) +++ trunk/docs/userguide/app_procedures 2011-06-20 14:44:45 UTC (rev 4633) @@ -375,6 +375,18 @@ used with @arg to pass input parameters to a SwiftScript program as integers. + at tofloat +~~~~~~ + at tofloat(input) will parse its input string into a floating point number. This can be +used with @arg to pass input parameters to a SwiftScript program as +floating point numbers. + + at length +~~~~~~ + at length(array) will return the length of an array in Swift. This function will wait for all elements in the array to be written before returning the lennth. + + + Built-in procedure reference ---------------------------- This section details built-in procedures that are available for use in From jonmon at ci.uchicago.edu Mon Jun 20 14:45:11 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Mon, 20 Jun 2011 14:45:11 -0500 (CDT) Subject: [Swift-commit] r4636 - in usertools/plotter: . build etc old_scripts src/plotter Message-ID: <20110620194511.E84659CFF1@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-20 14:45:11 -0500 (Mon, 20 Jun 2011) New Revision: 4636 Added: usertools/plotter/build/ usertools/plotter/build/plotter/ usertools/plotter/etc/ usertools/plotter/etc/manifest usertools/plotter/old_scripts/classpath.zsh usertools/plotter/old_scripts/manifest.old Removed: usertools/plotter/classpath.zsh Modified: usertools/plotter/build.xml usertools/plotter/src/plotter/LineReader.java usertools/plotter/src/plotter/Lines.java usertools/plotter/src/plotter/Plotter.java usertools/plotter/src/plotter/Util.java usertools/plotter/swift_plotter.zsh Log: o fixed a bug where labels were being set to "" o added functionality to compile into jar Modified: usertools/plotter/build.xml =================================================================== --- usertools/plotter/build.xml 2011-06-20 14:59:48 UTC (rev 4635) +++ usertools/plotter/build.xml 2011-06-20 19:45:11 UTC (rev 4636) @@ -11,8 +11,9 @@ depends="compile" /> - + + + + - + + + Deleted: usertools/plotter/classpath.zsh =================================================================== --- usertools/plotter/classpath.zsh 2011-06-20 14:59:48 UTC (rev 4635) +++ usertools/plotter/classpath.zsh 2011-06-20 19:45:11 UTC (rev 4636) @@ -1,17 +0,0 @@ - -# Source this to set up classpath for plotter runs -# classpath stored in ${CP} - -if [[ $( uname ) == CYGWIN* ]] -then - typeset -T CP cp ";" - cp+=c:/cygwin${PLOTTERS}/src - for jar in ${PLOTTERS}/lib/*.jar - do - cp+=c:/cygwin${jar} - done -else - typeset -T CP cp - CP=${CLASSPATH}:${PLOTTERS}/src - cp+=( ${PLOTTERS}/lib/*.jar ) -fi Added: usertools/plotter/etc/manifest =================================================================== --- usertools/plotter/etc/manifest (rev 0) +++ usertools/plotter/etc/manifest 2011-06-20 19:45:11 UTC (rev 4636) @@ -0,0 +1,10 @@ +Class-Path: build + colt.jar + java-getopt-1.0.13.jar + jfreechart-1.0.13.jar + xmlgraphics-commons-1.4svn.jar + commons-io-1.4.jar + jcommon-1.0.16.jar + junit.jar +Main-Class: Plotter + Copied: usertools/plotter/old_scripts/classpath.zsh (from rev 4635, usertools/plotter/classpath.zsh) =================================================================== --- usertools/plotter/old_scripts/classpath.zsh (rev 0) +++ usertools/plotter/old_scripts/classpath.zsh 2011-06-20 19:45:11 UTC (rev 4636) @@ -0,0 +1,17 @@ + +# Source this to set up classpath for plotter runs +# classpath stored in ${CP} + +if [[ $( uname ) == CYGWIN* ]] +then + typeset -T CP cp ";" + cp+=c:/cygwin${PLOTTERS}/src + for jar in ${PLOTTERS}/lib/*.jar + do + cp+=c:/cygwin${jar} + done +else + typeset -T CP cp + CP=${CLASSPATH}:${PLOTTERS}/src + cp+=( ${PLOTTERS}/lib/*.jar ) +fi Added: usertools/plotter/old_scripts/manifest.old =================================================================== --- usertools/plotter/old_scripts/manifest.old (rev 0) +++ usertools/plotter/old_scripts/manifest.old 2011-06-20 19:45:11 UTC (rev 4636) @@ -0,0 +1,10 @@ +Class-Path: /Users/jonmon/Library/Swift/usertools/plotter/plotter + /Users/jonmon/Library/Swift/usertools/plotter/lib/colt.jar + /Users/jonmon/Library/Swift/usertools/plotter/lib/java-getopt-1.0.13.jar + /Users/jonmon/Library/Swift/usertools/plotter/lib/jfreechart-1.0.13.jar + /Users/jonmon/Library/Swift/usertools/plotter/lib/xmlgraphics-commons-1.4svn.jar + /Users/jonmon/Library/Swift/usertools/plotter/lib/commons-io-1.4.jar + /Users/jonmon/Library/Swift/usertools/plotter/lib/jcommon-1.0.16.jar + /Users/jonmon/Library/Swift/usertools/plotter/lib/junit.jar +Main-Class: plotter.Plotter + Modified: usertools/plotter/src/plotter/LineReader.java =================================================================== --- usertools/plotter/src/plotter/LineReader.java 2011-06-20 14:59:48 UTC (rev 4635) +++ usertools/plotter/src/plotter/LineReader.java 2011-06-20 19:45:11 UTC (rev 4636) @@ -12,9 +12,6 @@ * */ public class LineReader { - LineReader() - {} - public static List read(File file) throws FileNotFoundException { Modified: usertools/plotter/src/plotter/Lines.java =================================================================== --- usertools/plotter/src/plotter/Lines.java 2011-06-20 14:59:48 UTC (rev 4635) +++ usertools/plotter/src/plotter/Lines.java 2011-06-20 19:45:11 UTC (rev 4636) @@ -9,6 +9,7 @@ import org.apache.commons.io.IOUtils; import org.apache.xmlgraphics.java2d.ps.EPSDocumentGraphics2D; +import org.apache.xmlgraphics.java2d.GraphicContext; import org.jfree.chart.ChartFactory; import org.jfree.chart.JFreeChart; import org.jfree.chart.axis.NumberAxis; @@ -26,6 +27,7 @@ { static Properties properties; + // defualt this is not a Black and White plot public static boolean bw = false; static int width = 400; @@ -40,6 +42,92 @@ static boolean withLegend = true; /** + Args: Lines * + Reads settings from properties: see scanProperties() + Produces EPS output file + Data files are two-columns of numbers each - + see LineReader.read() and LineReader.array() + */ + public void plotter(String[] args) + { + // Settings: + boolean verbose = false; + + Getopt g = new Getopt("testprog", args, "v"); + int c = -1; + while ((c = g.getopt()) != -1) + { + switch (c) + { + case 'v': + verbose = true; + } + } + + if (args.length < 3) + { + System.err.println + ("usage: [] *"); + System.exit(2); + } + + Bits.init(); + Util.verbose(verbose); + + String propFile = args[0]; + String output = args[1]; + List names = new ArrayList(); + for (int i = 2; i < args.length; i++) + names.add(args[i]); + + String title = null; + String xlabel = null; + String ylabel = null; + List data = new ArrayList(); + List labels = new ArrayList(); + + properties = new Properties(); + load(propFile); + title = properties.getProperty("title"); + xlabel = properties.getProperty("xlabel"); + ylabel = properties.getProperty("ylabel"); + + scanProperties(); + + for (String name : names) + { + File file = new File(name); + Util.verbose("open: " + file); + List lines = null; + try + { + lines = LineReader.read(file); + + if (lines == null) + { + System.err.println("Problem when reading: "+file); + } + } + catch (FileNotFoundException e) + { + System.err.println("not found: " + file); + System.exit(1); + } + double[][] array = LineReader.array(lines); + data.add(array); + // System.out.println(Arrays.toString(array[0])); + // System.out.println(Arrays.toString(array[1])); + addLabel(name, labels); + Util.verbose("array:\n" + toString(array)); + } + + XYSeriesCollection collection = Util.collection(data, labels, + names); + + plot(collection, title, xlabel, ylabel, output); + } + + /** Generate simple plot. @param collection The x,y data. @param title Plot title. @@ -58,17 +146,20 @@ try { - out = new FileOutputStream(output); - out = new BufferedOutputStream(out); + /* out = new FileOutputStream(output); */ + /* out = new BufferedOutputStream(out); */ + /* The above seemed confusing: readability wise, makes perfect sense syntactically wise */ + out = new BufferedOutputStream( new FileOutputStream( output ) ); + g2d = new EPSDocumentGraphics2D(false); g2d.setGraphicContext - (new org.apache.xmlgraphics.java2d.GraphicContext()); + (new GraphicContext()); rectangle = new Rectangle2D.Double(0, 0, width, height); g2d.setGraphicContext - (new org.apache.xmlgraphics.java2d.GraphicContext()); + (new GraphicContext()); g2d.setupDocument(out, width, height); } catch (IOException e) @@ -82,6 +173,8 @@ (title, xlabel, ylabel, collection, PlotOrientation.VERTICAL, withLegend, false, false); + + setupPlot(chart, collection); chart.draw(g2d, rectangle); @@ -91,7 +184,7 @@ } catch (Exception e) { - System.err.println("Err!" + e); + System.err.println("Error!" + e); } IOUtils.closeQuietly(out); @@ -104,6 +197,10 @@ XYSeriesCollection collection) { XYPlot plot = chart.getXYPlot(); + // System.out.println(plot.getDomainAxis().getRange().getLowerBound()); + // System.out.println(plot.getDomainAxis().getRange().getUpperBound()); + // System.out.println(plot.getRangeAxis().getRange().getLowerBound()); + // System.out.println(plot.getRangeAxis().getRange().getUpperBound()); XYLineAndShapeRenderer renderer = new XYLineAndShapeRenderer(); if (bw) for (int i = 0; i < plot.getSeriesCount(); i++) @@ -125,7 +222,6 @@ { // Actual values: modify if necessary double axmin, axmax, aymin, aymax; - if (xmin != null || xmax != null) { NumberAxis axis = (NumberAxis) plot.getDomainAxis(); @@ -149,106 +245,7 @@ } } - /** - Args: Lines * - Reads settings from properties: see scanProperties() - Produces EPS output file - Data files are two-columns of numbers each - - see LineReader.read() and LineReader.array() - */ - public void plotter(String[] args) - { - // Settings: - boolean verbose = false; - Getopt g = new Getopt("testprog", args, "v"); - int c = -1; - while ((c = g.getopt()) != -1) - { - switch (c) - { - case 'v': - verbose = true; - } - } - - if (args.length < 3) - { - System.err.println - ("usage: [] *"); - System.exit(2); - } - - Bits.init(); - Util.verbose(verbose); - - String propFile = args[0]; - String output = args[1]; - List names = new ArrayList(); - for (int i = 2; i < args.length; i++) - names.add(args[i]); - - String title = null; - String xlabel = null; - String ylabel = null; - List data = new ArrayList(); - List labels = new ArrayList(); - - properties = new Properties(); - load(propFile); - title = properties.getProperty("title"); - xlabel = properties.getProperty("xlabel"); - ylabel = properties.getProperty("ylabel"); - - scanProperties(); - - for (String name : names) - { - File file = new File(name); - Util.verbose("open: " + file); - List lines = null; - try - { - lines = LineReader.read(file); - } - catch (FileNotFoundException e) - { - System.err.println("not found: " + file); - System.exit(1); - } - double[][] array = LineReader.array(lines); - data.add(array); - addLabel(name, labels); - Util.verbose("array:\n" + toString(array)); - } - - XYSeriesCollection collection = Util.collection(data, labels, - names); - - plot(collection, title, xlabel, ylabel, output); - } - - static void load(String propFile) - { - try - { - if (propFile.equals("-")) - properties.load(System.in); - else - properties.load(new FileInputStream(propFile)); - } - catch (FileNotFoundException e) - { - System.err.println(e); - System.exit(1); - } - catch (IOException e) - { - e.printStackTrace(); - System.exit(1); - } - } - /** Various plot properties. All are currently optional @@ -297,6 +294,27 @@ withLegend = Boolean.parseBoolean(tmp); } + static void load(String propFile) + { + try + { + if (propFile.equals("-")) + properties.load(System.in); + else + properties.load(new FileInputStream(propFile)); + } + catch (FileNotFoundException e) + { + System.err.println(e); + System.exit(1); + } + catch (IOException e) + { + e.printStackTrace(); + System.exit(1); + } + } + /** Arrays.copyOfRange is a Java 1.6 feature. This has the same signature. Modified: usertools/plotter/src/plotter/Plotter.java =================================================================== --- usertools/plotter/src/plotter/Plotter.java 2011-06-20 14:59:48 UTC (rev 4635) +++ usertools/plotter/src/plotter/Plotter.java 2011-06-20 19:45:11 UTC (rev 4636) @@ -1,4 +1,3 @@ -package plotter; import plotter.Lines; import plotter.Dual; Modified: usertools/plotter/src/plotter/Util.java =================================================================== --- usertools/plotter/src/plotter/Util.java 2011-06-20 14:59:48 UTC (rev 4635) +++ usertools/plotter/src/plotter/Util.java 2011-06-20 19:45:11 UTC (rev 4636) @@ -26,14 +26,20 @@ int count = 0; for (double[][] d : data) { + /* What does this do? */ + /* label is set to something but then immediately overwritten */ + /* That catch should not happen */ String label = "data: " + count; try { - label = labels.get(count); + String s = labels.get(count); + if( !(s.equals("")) ) + label = s; } catch (IndexOutOfBoundsException e) {} + System.out.println( "label: "+label ); XYSeries series = new XYSeries(label); for (int i = 0; i < d.length; i++) series.add(d[i][0], d[i][1]); Modified: usertools/plotter/swift_plotter.zsh =================================================================== --- usertools/plotter/swift_plotter.zsh 2011-06-20 14:59:48 UTC (rev 4635) +++ usertools/plotter/swift_plotter.zsh 2011-06-20 19:45:11 UTC (rev 4636) @@ -1,10 +1,11 @@ #!/bin/zsh -PLOTTERS=$( cd $( dirname $0 ) ; /bin/pwd ) +#PLOTTERS=$( cd $( dirname $0 ) ; /bin/pwd ) # declare -p PLOTTERS -source ${PLOTTERS}/classpath.zsh -[[ $? != 0 ]] && print "Could not build CLASSPATH!" && return 1 +#source ${PLOTTERS}/classpath.zsh +#[[ $? != 0 ]] && print "Could not build CLASSPATH!" && return 1 -java -ea -cp ${CP} plotter.Plotter ${*} +#java -ea -cp ${CP} plotter.Plotter ${*} +java -jar lib/plotter.jar ${*} From wozniak at ci.uchicago.edu Mon Jun 20 14:56:52 2011 From: wozniak at ci.uchicago.edu (wozniak at ci.uchicago.edu) Date: Mon, 20 Jun 2011 14:56:52 -0500 (CDT) Subject: [Swift-commit] r4637 - usertools/plotter/src/plotter Message-ID: <20110620195652.EF9CE9CC8D@svn.ci.uchicago.edu> Author: wozniak Date: 2011-06-20 14:56:52 -0500 (Mon, 20 Jun 2011) New Revision: 4637 Modified: usertools/plotter/src/plotter/Plotter.java Log: Put back in package Modified: usertools/plotter/src/plotter/Plotter.java =================================================================== --- usertools/plotter/src/plotter/Plotter.java 2011-06-20 19:45:11 UTC (rev 4636) +++ usertools/plotter/src/plotter/Plotter.java 2011-06-20 19:56:52 UTC (rev 4637) @@ -1,4 +1,6 @@ +package plotter; + import plotter.Lines; import plotter.Dual; From wozniak at ci.uchicago.edu Mon Jun 20 14:57:26 2011 From: wozniak at ci.uchicago.edu (wozniak at ci.uchicago.edu) Date: Mon, 20 Jun 2011 14:57:26 -0500 (CDT) Subject: [Swift-commit] r4638 - in usertools/plotter: . etc old_scripts src/plotter Message-ID: <20110620195726.92D109CC8D@svn.ci.uchicago.edu> Author: wozniak Date: 2011-06-20 14:57:26 -0500 (Mon, 20 Jun 2011) New Revision: 4638 Added: usertools/plotter/classpath.zsh Removed: usertools/plotter/old_scripts/classpath.zsh Modified: usertools/plotter/etc/manifest usertools/plotter/src/plotter/Lines.java usertools/plotter/swift_plotter.zsh Log: Use classpath.zsh script... Copied: usertools/plotter/classpath.zsh (from rev 4636, usertools/plotter/old_scripts/classpath.zsh) =================================================================== --- usertools/plotter/classpath.zsh (rev 0) +++ usertools/plotter/classpath.zsh 2011-06-20 19:57:26 UTC (rev 4638) @@ -0,0 +1,17 @@ + +# Source this to set up classpath for plotter runs +# classpath stored in ${CP} + +if [[ $( uname ) == CYGWIN* ]] +then + typeset -T CP cp ";" + cp+=c:/cygwin${PLOTTERS}/src + for jar in ${PLOTTERS}/lib/*.jar + do + cp+=c:/cygwin${jar} + done +else + typeset -T CP cp + CP=${CLASSPATH}:${PLOTTERS}/src + cp+=( ${PLOTTERS}/lib/*.jar ) +fi Modified: usertools/plotter/etc/manifest =================================================================== --- usertools/plotter/etc/manifest 2011-06-20 19:56:52 UTC (rev 4637) +++ usertools/plotter/etc/manifest 2011-06-20 19:57:26 UTC (rev 4638) @@ -1,10 +1,10 @@ -Class-Path: build - colt.jar - java-getopt-1.0.13.jar - jfreechart-1.0.13.jar - xmlgraphics-commons-1.4svn.jar - commons-io-1.4.jar - jcommon-1.0.16.jar +Class-Path: build + colt.jar + java-getopt-1.0.13.jar + jfreechart-1.0.13.jar + xmlgraphics-commons-1.4svn.jar + commons-io-1.4.jar + jcommon-1.0.16.jar junit.jar -Main-Class: Plotter +Main-Class: plotter.Plotter Deleted: usertools/plotter/old_scripts/classpath.zsh =================================================================== --- usertools/plotter/old_scripts/classpath.zsh 2011-06-20 19:56:52 UTC (rev 4637) +++ usertools/plotter/old_scripts/classpath.zsh 2011-06-20 19:57:26 UTC (rev 4638) @@ -1,17 +0,0 @@ - -# Source this to set up classpath for plotter runs -# classpath stored in ${CP} - -if [[ $( uname ) == CYGWIN* ]] -then - typeset -T CP cp ";" - cp+=c:/cygwin${PLOTTERS}/src - for jar in ${PLOTTERS}/lib/*.jar - do - cp+=c:/cygwin${jar} - done -else - typeset -T CP cp - CP=${CLASSPATH}:${PLOTTERS}/src - cp+=( ${PLOTTERS}/lib/*.jar ) -fi Modified: usertools/plotter/src/plotter/Lines.java =================================================================== --- usertools/plotter/src/plotter/Lines.java 2011-06-20 19:56:52 UTC (rev 4637) +++ usertools/plotter/src/plotter/Lines.java 2011-06-20 19:57:26 UTC (rev 4638) @@ -1,3 +1,4 @@ + package plotter; import gnu.getopt.Getopt; Modified: usertools/plotter/swift_plotter.zsh =================================================================== --- usertools/plotter/swift_plotter.zsh 2011-06-20 19:56:52 UTC (rev 4637) +++ usertools/plotter/swift_plotter.zsh 2011-06-20 19:57:26 UTC (rev 4638) @@ -1,11 +1,15 @@ #!/bin/zsh -#PLOTTERS=$( cd $( dirname $0 ) ; /bin/pwd ) +PLOTTERS=$( cd $( dirname $0 ) ; /bin/pwd ) # declare -p PLOTTERS -#source ${PLOTTERS}/classpath.zsh +source ${PLOTTERS}/classpath.zsh #[[ $? != 0 ]] && print "Could not build CLASSPATH!" && return 1 -#java -ea -cp ${CP} plotter.Plotter ${*} -java -jar lib/plotter.jar ${*} +if [[ ${PLOTTER_DEBUG} != "" ]] +then + DEBUG="-agentlib:jdwp=transport=dt_socket,server=y,address=1230" +fi + +java -ea ${DEBUG} -jar lib/plotter.jar ${*} From wozniak at ci.uchicago.edu Mon Jun 20 14:57:46 2011 From: wozniak at ci.uchicago.edu (wozniak at ci.uchicago.edu) Date: Mon, 20 Jun 2011 14:57:46 -0500 (CDT) Subject: [Swift-commit] r4639 - usertools/plotter/lib Message-ID: <20110620195746.E61DB9CC8D@svn.ci.uchicago.edu> Author: wozniak Date: 2011-06-20 14:57:46 -0500 (Mon, 20 Jun 2011) New Revision: 4639 Modified: usertools/plotter/lib/ Log: Set ignores Property changes on: usertools/plotter/lib ___________________________________________________________________ Added: svn:ignore + plotter.jar From wozniak at ci.uchicago.edu Mon Jun 20 15:11:14 2011 From: wozniak at ci.uchicago.edu (wozniak at ci.uchicago.edu) Date: Mon, 20 Jun 2011 15:11:14 -0500 (CDT) Subject: [Swift-commit] r4640 - usertools/plotter Message-ID: <20110620201114.C28769CC8D@svn.ci.uchicago.edu> Author: wozniak Date: 2011-06-20 15:11:14 -0500 (Mon, 20 Jun 2011) New Revision: 4640 Modified: usertools/plotter/build.xml Log: Set dependency Modified: usertools/plotter/build.xml =================================================================== --- usertools/plotter/build.xml 2011-06-20 19:57:46 UTC (rev 4639) +++ usertools/plotter/build.xml 2011-06-20 20:11:14 UTC (rev 4640) @@ -22,7 +22,7 @@ - + From wozniak at ci.uchicago.edu Mon Jun 20 15:12:52 2011 From: wozniak at ci.uchicago.edu (wozniak at ci.uchicago.edu) Date: Mon, 20 Jun 2011 15:12:52 -0500 (CDT) Subject: [Swift-commit] r4641 - usertools/plotter Message-ID: <20110620201252.AF7AB9CC8D@svn.ci.uchicago.edu> Author: wozniak Date: 2011-06-20 15:12:51 -0500 (Mon, 20 Jun 2011) New Revision: 4641 Modified: usertools/plotter/swift_plotter.zsh Log: Reorg jar file usage Modified: usertools/plotter/swift_plotter.zsh =================================================================== --- usertools/plotter/swift_plotter.zsh 2011-06-20 20:11:14 UTC (rev 4640) +++ usertools/plotter/swift_plotter.zsh 2011-06-20 20:12:51 UTC (rev 4641) @@ -5,11 +5,22 @@ # declare -p PLOTTERS source ${PLOTTERS}/classpath.zsh -#[[ $? != 0 ]] && print "Could not build CLASSPATH!" && return 1 +if [[ $? != 0 ]] +then + print "Could not build CLASSPATH!" + return 1 +fi if [[ ${PLOTTER_DEBUG} != "" ]] then DEBUG="-agentlib:jdwp=transport=dt_socket,server=y,address=1230" fi -java -ea ${DEBUG} -jar lib/plotter.jar ${*} +JAR=${PLOTTERS}/lib/plotter.jar +if [[ ! -f ${JAR} ]] +then + print "JAR file not found!" + return 1 +fi + +java -ea ${DEBUG} -cp ${JAR}:${CP} plotter.Plotter ${*} From wozniak at ci.uchicago.edu Mon Jun 20 15:20:42 2011 From: wozniak at ci.uchicago.edu (wozniak at ci.uchicago.edu) Date: Mon, 20 Jun 2011 15:20:42 -0500 (CDT) Subject: [Swift-commit] r4642 - usertools/plotter/etc Message-ID: <20110620202042.529E39CC8D@svn.ci.uchicago.edu> Author: wozniak Date: 2011-06-20 15:20:42 -0500 (Mon, 20 Jun 2011) New Revision: 4642 Modified: usertools/plotter/etc/manifest Log: Do not use classpath in manifest file Modified: usertools/plotter/etc/manifest =================================================================== --- usertools/plotter/etc/manifest 2011-06-20 20:12:51 UTC (rev 4641) +++ usertools/plotter/etc/manifest 2011-06-20 20:20:42 UTC (rev 4642) @@ -1,10 +1 @@ -Class-Path: build - colt.jar - java-getopt-1.0.13.jar - jfreechart-1.0.13.jar - xmlgraphics-commons-1.4svn.jar - commons-io-1.4.jar - jcommon-1.0.16.jar - junit.jar Main-Class: plotter.Plotter - From wozniak at ci.uchicago.edu Mon Jun 20 15:21:04 2011 From: wozniak at ci.uchicago.edu (wozniak at ci.uchicago.edu) Date: Mon, 20 Jun 2011 15:21:04 -0500 (CDT) Subject: [Swift-commit] r4643 - usertools/plotter/src/plotter Message-ID: <20110620202104.10C789CC8D@svn.ci.uchicago.edu> Author: wozniak Date: 2011-06-20 15:21:03 -0500 (Mon, 20 Jun 2011) New Revision: 4643 Modified: usertools/plotter/src/plotter/Util.java Log: Suppress verbose output Modified: usertools/plotter/src/plotter/Util.java =================================================================== --- usertools/plotter/src/plotter/Util.java 2011-06-20 20:20:42 UTC (rev 4642) +++ usertools/plotter/src/plotter/Util.java 2011-06-20 20:21:03 UTC (rev 4643) @@ -39,7 +39,7 @@ catch (IndexOutOfBoundsException e) {} - System.out.println( "label: "+label ); + Util.verbose( "label: "+label ); XYSeries series = new XYSeries(label); for (int i = 0; i < d.length; i++) series.add(d[i][0], d[i][1]); From jonmon at ci.uchicago.edu Mon Jun 20 15:41:18 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Mon, 20 Jun 2011 15:41:18 -0500 (CDT) Subject: [Swift-commit] r4644 - usertools/plotter/src/plotter Message-ID: <20110620204118.775F09CC8D@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-20 15:41:18 -0500 (Mon, 20 Jun 2011) New Revision: 4644 Modified: usertools/plotter/src/plotter/Plots.java usertools/plotter/src/plotter/Util.java Log: moved static collection method from Util to Plots Modified: usertools/plotter/src/plotter/Plots.java =================================================================== --- usertools/plotter/src/plotter/Plots.java 2011-06-20 20:21:03 UTC (rev 4643) +++ usertools/plotter/src/plotter/Plots.java 2011-06-20 20:41:18 UTC (rev 4644) @@ -1,11 +1,16 @@ package plotter; +import plotter.Util.*; import java.awt.Font; + import java.util.Properties; +import java.util.List; import org.jfree.chart.JFreeChart; import org.jfree.chart.title.LegendTitle; +import org.jfree.data.xy.XYSeries; +import org.jfree.data.xy.XYSeriesCollection; /** * Reusable JFreeChart-specific functions * @author wozniak @@ -13,6 +18,42 @@ */ public class Plots { + + /** + Stores the label as the Series key. + Stores the filename as the Series description. + */ + static XYSeriesCollection collection(List data, + List labels, + List names) + { + final XYSeriesCollection collection = new XYSeriesCollection(); + + int count = 0; + for (double[][] d : data) + { + String label = "data: " + count; + try + { + String s = labels.get(count); + if( !(s.equals("")) ) + label = s; + } + catch (IndexOutOfBoundsException e) + {} + + Util.verbose( "label: "+label ); + XYSeries series = new XYSeries(label); + for (int i = 0; i < d.length; i++) + series.add(d[i][0], d[i][1]); + + series.setDescription(names.get(count)); + collection.addSeries(series); + count++; + } + return collection; + } + static void setupLegend(JFreeChart chart, Properties properties) { Modified: usertools/plotter/src/plotter/Util.java =================================================================== --- usertools/plotter/src/plotter/Util.java 2011-06-20 20:21:03 UTC (rev 4643) +++ usertools/plotter/src/plotter/Util.java 2011-06-20 20:41:18 UTC (rev 4644) @@ -3,54 +3,10 @@ /** * Plot data helpers. * */ - -import java.util.List; - -import org.jfree.data.xy.XYSeries; -import org.jfree.data.xy.XYSeriesCollection; - public class Util { static boolean v = false; - /** - Stores the label as the Series key. - Stores the filename as the Series description. - */ - static XYSeriesCollection collection(List data, - List labels, - List names) - { - final XYSeriesCollection collection = new XYSeriesCollection(); - - int count = 0; - for (double[][] d : data) - { - /* What does this do? */ - /* label is set to something but then immediately overwritten */ - /* That catch should not happen */ - String label = "data: " + count; - try - { - String s = labels.get(count); - if( !(s.equals("")) ) - label = s; - } - catch (IndexOutOfBoundsException e) - {} - - Util.verbose( "label: "+label ); - XYSeries series = new XYSeries(label); - for (int i = 0; i < d.length; i++) - series.add(d[i][0], d[i][1]); - - series.setDescription(names.get(count)); - collection.addSeries(series); - count++; - } - return collection; - } - public static void fatal(String s) { System.err.println(s); From jonmon at ci.uchicago.edu Mon Jun 20 15:41:39 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Mon, 20 Jun 2011 15:41:39 -0500 (CDT) Subject: [Swift-commit] r4645 - usertools/plotter/src/plotter Message-ID: <20110620204139.829EF9CC8D@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-20 15:41:39 -0500 (Mon, 20 Jun 2011) New Revision: 4645 Modified: usertools/plotter/src/plotter/Lines.java Log: removed some println statements Modified: usertools/plotter/src/plotter/Lines.java =================================================================== --- usertools/plotter/src/plotter/Lines.java 2011-06-20 20:41:18 UTC (rev 4644) +++ usertools/plotter/src/plotter/Lines.java 2011-06-20 20:41:39 UTC (rev 4645) @@ -116,14 +116,12 @@ } double[][] array = LineReader.array(lines); data.add(array); - // System.out.println(Arrays.toString(array[0])); - // System.out.println(Arrays.toString(array[1])); addLabel(name, labels); Util.verbose("array:\n" + toString(array)); } - XYSeriesCollection collection = Util.collection(data, labels, - names); + XYSeriesCollection collection = Plots.collection(data, labels, + names); plot(collection, title, xlabel, ylabel, output); } @@ -198,10 +196,6 @@ XYSeriesCollection collection) { XYPlot plot = chart.getXYPlot(); - // System.out.println(plot.getDomainAxis().getRange().getLowerBound()); - // System.out.println(plot.getDomainAxis().getRange().getUpperBound()); - // System.out.println(plot.getRangeAxis().getRange().getLowerBound()); - // System.out.println(plot.getRangeAxis().getRange().getUpperBound()); XYLineAndShapeRenderer renderer = new XYLineAndShapeRenderer(); if (bw) for (int i = 0; i < plot.getSeriesCount(); i++) @@ -342,7 +336,6 @@ static boolean showShape(String name) { - // System.out.println(name); String mode = properties.getProperty("shape."+name); // System.out.println(mode); if ("none".equals(mode)) From jonmon at ci.uchicago.edu Mon Jun 20 15:42:03 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Mon, 20 Jun 2011 15:42:03 -0500 (CDT) Subject: [Swift-commit] r4646 - usertools/plotter Message-ID: <20110620204203.EC5CD9CC8D@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-20 15:42:03 -0500 (Mon, 20 Jun 2011) New Revision: 4646 Modified: usertools/plotter/build.xml Log: default build option is now jar Modified: usertools/plotter/build.xml =================================================================== --- usertools/plotter/build.xml 2011-06-20 20:41:39 UTC (rev 4645) +++ usertools/plotter/build.xml 2011-06-20 20:42:03 UTC (rev 4646) @@ -1,5 +1,5 @@ + default="jar"> Author: jonmon Date: 2011-06-20 16:05:46 -0500 (Mon, 20 Jun 2011) New Revision: 4647 Modified: usertools/plotter/src/plotter/Dual.java Log: o moved plotter method to the top of the class. o added same fix from the Lines class wrt labels being empty. Modified: usertools/plotter/src/plotter/Dual.java =================================================================== --- usertools/plotter/src/plotter/Dual.java 2011-06-20 20:42:03 UTC (rev 4646) +++ usertools/plotter/src/plotter/Dual.java 2011-06-20 21:05:46 UTC (rev 4647) @@ -291,11 +291,14 @@ String label = "data: " + count; try { - label = labels.get(count); + String s = labels.get(count); + if( !(s.equals("")) ) + label = s; } catch (IndexOutOfBoundsException e) {} + Util.verbose( "label: "+label ); XYSeries series = new XYSeries(label); for (int j = 0; j < d.length; j++) { From jonmon at ci.uchicago.edu Mon Jun 20 16:06:33 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Mon, 20 Jun 2011 16:06:33 -0500 (CDT) Subject: [Swift-commit] r4648 - usertools/plotter/src/plotter Message-ID: <20110620210633.A53B89CFF1@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-20 16:06:33 -0500 (Mon, 20 Jun 2011) New Revision: 4648 Modified: usertools/plotter/src/plotter/Lines.java usertools/plotter/src/plotter/Plots.java Log: o moved collection method from Plots.java to Lines.java. Meant to move it to this file from a previous commit Modified: usertools/plotter/src/plotter/Lines.java =================================================================== --- usertools/plotter/src/plotter/Lines.java 2011-06-20 21:05:46 UTC (rev 4647) +++ usertools/plotter/src/plotter/Lines.java 2011-06-20 21:06:33 UTC (rev 4648) @@ -191,7 +191,41 @@ return true; } + /** + Stores the label as the Series key. + Stores the filename as the Series description. + */ + static XYSeriesCollection collection(List data, + List labels, + List names) + { + final XYSeriesCollection collection = new XYSeriesCollection(); + int count = 0; + for (double[][] d : data) + { + String label = "data: " + count; + try + { + String s = labels.get(count); + if( !(s.equals("")) ) + label = s; + } + catch (IndexOutOfBoundsException e) + {} + + Util.verbose( "label: "+label ); + XYSeries series = new XYSeries(label); + for (int i = 0; i < d.length; i++) + series.add(d[i][0], d[i][1]); + + series.setDescription(names.get(count)); + collection.addSeries(series); + count++; + } + return collection; + } + private static void setupPlot(JFreeChart chart, XYSeriesCollection collection) { Modified: usertools/plotter/src/plotter/Plots.java =================================================================== --- usertools/plotter/src/plotter/Plots.java 2011-06-20 21:05:46 UTC (rev 4647) +++ usertools/plotter/src/plotter/Plots.java 2011-06-20 21:06:33 UTC (rev 4648) @@ -1,6 +1,5 @@ package plotter; -import plotter.Util.*; import java.awt.Font; import java.util.Properties; @@ -18,42 +17,6 @@ */ public class Plots { - - /** - Stores the label as the Series key. - Stores the filename as the Series description. - */ - static XYSeriesCollection collection(List data, - List labels, - List names) - { - final XYSeriesCollection collection = new XYSeriesCollection(); - - int count = 0; - for (double[][] d : data) - { - String label = "data: " + count; - try - { - String s = labels.get(count); - if( !(s.equals("")) ) - label = s; - } - catch (IndexOutOfBoundsException e) - {} - - Util.verbose( "label: "+label ); - XYSeries series = new XYSeries(label); - for (int i = 0; i < d.length; i++) - series.add(d[i][0], d[i][1]); - - series.setDescription(names.get(count)); - collection.addSeries(series); - count++; - } - return collection; - } - static void setupLegend(JFreeChart chart, Properties properties) { From jonmon at ci.uchicago.edu Mon Jun 20 16:28:52 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Mon, 20 Jun 2011 16:28:52 -0500 (CDT) Subject: [Swift-commit] r4649 - usertools/plotter/lib Message-ID: <20110620212852.226109CFF1@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-20 16:28:51 -0500 (Mon, 20 Jun 2011) New Revision: 4649 Removed: usertools/plotter/lib/colt.jar usertools/plotter/lib/junit.jar Log: do not seem to need these two jar files. They do not affect the code and the compile and run without error when not in the classpath Deleted: usertools/plotter/lib/colt.jar =================================================================== (Binary files differ) Deleted: usertools/plotter/lib/junit.jar =================================================================== (Binary files differ) From jonmon at ci.uchicago.edu Mon Jun 20 16:29:23 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Mon, 20 Jun 2011 16:29:23 -0500 (CDT) Subject: [Swift-commit] r4650 - usertools/plotter/src/plotter Message-ID: <20110620212923.958349CFF1@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-20 16:29:23 -0500 (Mon, 20 Jun 2011) New Revision: 4650 Modified: usertools/plotter/src/plotter/Lines.java Log: fixed an error when I moved the collection method in the Lines.java Modified: usertools/plotter/src/plotter/Lines.java =================================================================== --- usertools/plotter/src/plotter/Lines.java 2011-06-20 21:28:51 UTC (rev 4649) +++ usertools/plotter/src/plotter/Lines.java 2011-06-20 21:29:23 UTC (rev 4650) @@ -19,6 +19,7 @@ import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer; import org.jfree.data.Range; import org.jfree.data.general.Series; +import org.jfree.data.xy.XYSeries; import org.jfree.data.xy.XYSeriesCollection; /** @@ -120,8 +121,8 @@ Util.verbose("array:\n" + toString(array)); } - XYSeriesCollection collection = Plots.collection(data, labels, - names); + XYSeriesCollection collection = collection(data, labels, + names); plot(collection, title, xlabel, ylabel, output); } From jonmon at ci.uchicago.edu Mon Jun 20 16:53:18 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Mon, 20 Jun 2011 16:53:18 -0500 (CDT) Subject: [Swift-commit] r4651 - usertools/plotter/src/plotter Message-ID: <20110620215318.68EC29CFF1@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-20 16:53:18 -0500 (Mon, 20 Jun 2011) New Revision: 4651 Modified: usertools/plotter/src/plotter/Dual.java usertools/plotter/src/plotter/Lines.java Log: o ok now i moved the plotter method to the top of the Dual class. Modified: usertools/plotter/src/plotter/Dual.java =================================================================== --- usertools/plotter/src/plotter/Dual.java 2011-06-20 21:29:23 UTC (rev 4650) +++ usertools/plotter/src/plotter/Dual.java 2011-06-20 21:53:18 UTC (rev 4651) @@ -42,7 +42,87 @@ static Double ymin2 = null; static Double ymax2 = null; + /** + Args: Lines * + Reads settings from properties: see scanProperties() + Produces EPS output file + Data files are two-columns of numbers each - + see LineReader.read() and LineReader.array() + */ + public void plotter(String[] args) + { + // Settings: + boolean verbose = false; + Getopt g = new Getopt("testprog", args, "v"); + int c = -1; + while ((c = g.getopt()) != -1) + { + switch (c) + { + case 'v': + verbose = true; + } + } + + if (args.length < 3) + { + System.err.println + ("usage: [] *"); + System.exit(2); + } + + Bits.init(); + Util.verbose(verbose); + + String propFile = args[0]; + String output = args[1]; + List names = new ArrayList(); + for (int i = 2; i < args.length; i++) + names.add(args[i]); + + String title = null; + String xlabel = null; + String ylabel1 = null; + String ylabel2 = null; + List data = new ArrayList(); + List labels = new ArrayList(); + + properties = new Properties(); + load(propFile); + title = properties.getProperty("title"); + xlabel = properties.getProperty("xlabel"); + ylabel1 = properties.getProperty("ylabel1"); + ylabel2 = properties.getProperty("ylabel2"); + + scanProperties(); + + for (String name : names) + { + File file = new File(name); + Util.verbose("open: " + file); + List lines = null; + try + { + lines = LineReader.read(file); + } + catch (FileNotFoundException e) + { + System.err.println("not found: " + file); + System.exit(1); + } + double[][] array = LineReader.array(lines); + data.add(array); + addLabel(name, labels); + Util.verbose("array:\n" + toString(array)); + } + + XYSeriesCollection[] collections = + collections(data, labels, names); + + plot(collections, title, xlabel, ylabel1, ylabel2, output); + } + /** Generate simple plot @param collection The x,y data @@ -195,87 +275,6 @@ plot.configureRangeAxes(); } - /** - Args: Lines * - Reads settings from properties: see scanProperties() - Produces EPS output file - Data files are two-columns of numbers each - - see LineReader.read() and LineReader.array() - */ - public void plotter(String[] args) - { - // Settings: - boolean verbose = false; - - Getopt g = new Getopt("testprog", args, "v"); - int c = -1; - while ((c = g.getopt()) != -1) - { - switch (c) - { - case 'v': - verbose = true; - } - } - - if (args.length < 3) - { - System.err.println - ("usage: [] *"); - System.exit(2); - } - - Bits.init(); - Util.verbose(verbose); - - String propFile = args[0]; - String output = args[1]; - List names = new ArrayList(); - for (int i = 2; i < args.length; i++) - names.add(args[i]); - - String title = null; - String xlabel = null; - String ylabel1 = null; - String ylabel2 = null; - List data = new ArrayList(); - List labels = new ArrayList(); - - properties = new Properties(); - load(propFile); - title = properties.getProperty("title"); - xlabel = properties.getProperty("xlabel"); - ylabel1 = properties.getProperty("ylabel1"); - ylabel2 = properties.getProperty("ylabel2"); - - scanProperties(); - - for (String name : names) - { - File file = new File(name); - Util.verbose("open: " + file); - List lines = null; - try - { - lines = LineReader.read(file); - } - catch (FileNotFoundException e) - { - System.err.println("not found: " + file); - System.exit(1); - } - double[][] array = LineReader.array(lines); - data.add(array); - addLabel(name, labels); - Util.verbose("array:\n" + toString(array)); - } - - XYSeriesCollection[] collections = - collections(data, labels, names); - - plot(collections, title, xlabel, ylabel1, ylabel2, output); - } - static XYSeriesCollection[] collections(List data, List labels, List names) Modified: usertools/plotter/src/plotter/Lines.java =================================================================== --- usertools/plotter/src/plotter/Lines.java 2011-06-20 21:29:23 UTC (rev 4650) +++ usertools/plotter/src/plotter/Lines.java 2011-06-20 21:53:18 UTC (rev 4651) @@ -1,4 +1,3 @@ - package plotter; import gnu.getopt.Getopt; From jonmon at ci.uchicago.edu Wed Jun 22 14:27:21 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Wed, 22 Jun 2011 14:27:21 -0500 (CDT) Subject: [Swift-commit] r4655 - usertools/plotter/src/plotter Message-ID: <20110622192721.9A2C19CFED@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-22 14:27:21 -0500 (Wed, 22 Jun 2011) New Revision: 4655 Modified: usertools/plotter/src/plotter/Plots.java Log: o removed unsused imports from Plots Modified: usertools/plotter/src/plotter/Plots.java =================================================================== --- usertools/plotter/src/plotter/Plots.java 2011-06-22 17:33:36 UTC (rev 4654) +++ usertools/plotter/src/plotter/Plots.java 2011-06-22 19:27:21 UTC (rev 4655) @@ -3,13 +3,10 @@ import java.awt.Font; import java.util.Properties; -import java.util.List; import org.jfree.chart.JFreeChart; import org.jfree.chart.title.LegendTitle; -import org.jfree.data.xy.XYSeries; -import org.jfree.data.xy.XYSeriesCollection; /** * Reusable JFreeChart-specific functions * @author wozniak From ketan at ci.uchicago.edu Wed Jun 22 17:11:29 2011 From: ketan at ci.uchicago.edu (ketan at ci.uchicago.edu) Date: Wed, 22 Jun 2011 17:11:29 -0500 (CDT) Subject: [Swift-commit] r4656 - trunk/docs/userguide Message-ID: <20110622221129.6621F9CFEC@svn.ci.uchicago.edu> Author: ketan Date: 2011-06-22 17:11:29 -0500 (Wed, 22 Jun 2011) New Revision: 4656 Modified: trunk/docs/userguide/mappers Log: added content for external mapper Modified: trunk/docs/userguide/mappers =================================================================== --- trunk/docs/userguide/mappers 2011-06-22 19:27:21 UTC (rev 4655) +++ trunk/docs/userguide/mappers 2011-06-22 22:11:29 UTC (rev 4656) @@ -722,12 +722,22 @@ |*|Other parameters are passed to the executable prefixed with a - symbol |============== -The output of the executable should consist of two columns of data, +The output (stdout) of the executable should consist of two columns of data, separated by a space. The first column should be the path of the mapped variable, in SwiftScript syntax (for example [2] means the 2nd element of an array) or the symbol $ to represent the root of the mapped -variable. +variable. The following table shows the symbols that should appear in the first column corresponding to the mapping of different types of swift constructs such as scalars, arrays and structs. +[option="header, autowidth"] +|============= +|Swift construct|first column|second column +|scalar|$|file_name +|anarray[]|[]|file_name +|2dimarray[][]|[][]|file_name +|astruct.fld|fld|file_name +|astructarray[].fldname|[].fldname|file_name +|============== + Example: With the following in mapper.sh, ---- From ketan at ci.uchicago.edu Wed Jun 22 22:45:35 2011 From: ketan at ci.uchicago.edu (ketan at ci.uchicago.edu) Date: Wed, 22 Jun 2011 22:45:35 -0500 (CDT) Subject: [Swift-commit] r4657 - trunk/docs/tutorial Message-ID: <20110623034535.DB6FE9CFED@svn.ci.uchicago.edu> Author: ketan Date: 2011-06-22 22:45:35 -0500 (Wed, 22 Jun 2011) New Revision: 4657 Modified: trunk/docs/tutorial/hello_world trunk/docs/tutorial/introduction trunk/docs/tutorial/language_features trunk/docs/tutorial/runtime_features Log: Made some changes in tutorial for better readability and added some todo items Modified: trunk/docs/tutorial/hello_world =================================================================== --- trunk/docs/tutorial/hello_world 2011-06-22 22:11:29 UTC (rev 4656) +++ trunk/docs/tutorial/hello_world 2011-06-23 03:45:35 UTC (rev 4657) @@ -12,7 +12,7 @@ ************ We can run this program as follows: - +note: Make sure the bin directory of swift-installation is in your path. ---- $ cd examples/swift/ $ swift first.swift Modified: trunk/docs/tutorial/introduction =================================================================== --- trunk/docs/tutorial/introduction 2011-06-22 22:11:29 UTC (rev 4656) +++ trunk/docs/tutorial/introduction 2011-06-23 03:45:35 UTC (rev 4657) @@ -1,20 +1,18 @@ Introduction ------------ This tutorial is intended to introduce new users to the basics of Swift. -It is structured as a series of small exercise/examples which you can +It is structured as a series of simple exercises/examples which you can try for yourself as you read along. After the first 'hello world' -example, there are two tracks - the language track (which introduces -features of the SwiftScript language) and the runtime track (which -introduces features of the Swift runtime environment, such as running -jobs on different sites). +example, there are two tracks - the language track (which introduces the SwiftScript language) and the runtime track (which introduces features of the Swift runtime environment, such as running +jobs on different computational 'sites'). For information on getting an installation of Swift running, consult the Swift Quickstart Guide , and return to this document when you have successfully run the test -SwiftScript program mentioned there. +SwiftScript program mentioned there. _suggest_ _which_ _version_. There is also a Swift User's Guide which contains -more detailed reference material on topics covered in this manual. All +a more detailed reference material on topics covered in this manual. All of the programs included in this tutorial can be found in your Swift -distribution in the examples/swift directory. +distribution in the +examples/swift+ directory. Modified: trunk/docs/tutorial/language_features =================================================================== --- trunk/docs/tutorial/language_features 2011-06-22 22:11:29 UTC (rev 4656) +++ trunk/docs/tutorial/language_features 2011-06-23 03:45:35 UTC (rev 4657) @@ -11,7 +11,7 @@ to the greeting function. The code changes from first.swift are highlighted below. - +ToDo: Highlight the differences! ---- include::../../examples/parameter.swift[] @@ -57,6 +57,7 @@ In addition to specifying parameters positionally, parameters can be named, and if desired a default value can be specified - see <>. +ToDo: link not working. Adding another application ~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -73,11 +74,13 @@ ---- .There are several steps -- transformation catalog -- application block +- Updating the transformation catalog +- Updating the application block +ToDo: What is transformation catalog? One line explanation. + First we need to modify the transformation catalog to define a logical -transformation for the tc utility. The transformation catalog can be +transformation for the tr utility. The transformation catalog can be found in etc/tc.data. There are already several entries specifying where programs can be found. Add a new line to the file, specifying where *tr* can be found (usually in /usr/bin/tr but it may differ on @@ -153,7 +156,7 @@ - string - this is a built-in type for storing strings of text in memory, much like in other programming languages - - messagefile - this is a user-defined type used to mark files as + - messagefile - this is a user-defined type used to mark disc resident files as containing messages SwiftScript has the additional built-in types: boolean, integer and @@ -306,8 +309,8 @@ foreach ~~~~~~~ -SwiftScript provides a control structure, foreach, to operate on each -element of an array. +SwiftScript provides a control structure, foreach, to operate on each +element of an array in parallel. In this example, we will run the previous word counting example over each file in an array without having to explicitly list the array @@ -327,6 +330,7 @@ ~~ Decisions can be made using 'if', like this: +TODO: More examples of if required. ---- if(morning) { @@ -343,8 +347,7 @@ Sequential iteration ~~~~~~~~~~~~~~~~~~~~ -A development version of Swift after 0.2 (revision 1230) introduces a -sequential iteration construct. +A serial execution of instructions can be carried out using the sequential iteration construct. The following example demonstrates a simple application: each step of the iteration is a string representation of the byte count of the @@ -358,11 +361,10 @@ include::../../examples/iterate.swift[] ---- -echo is the standard unix echo. +Where, echo is the standard unix echo utility. -wcl is our application code - it counts the number of bytes in the one +_wcl_ is our application code - it counts the number of bytes in the one file and writes that count out to another, like this: - ---- $ cat ../wcl @@ -376,8 +378,9 @@ ---- Install the above wcl script somewhere and add a transformation catalog -entry for it. Then run the example program like this: +(tc) entry for it. Then run the example program like this: +TODO: Show the tc entry. ---- $ swift iterate.swift Modified: trunk/docs/tutorial/runtime_features =================================================================== --- trunk/docs/tutorial/runtime_features 2011-06-22 22:11:29 UTC (rev 4656) +++ trunk/docs/tutorial/runtime_features 2011-06-23 03:45:35 UTC (rev 4657) @@ -1,7 +1,7 @@ Runtime features ---------------- -Visualising the workflow as a graph +Visualizing the workflow as a graph ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ When running a workflow, its possible to generate a provenance graph at From ketan at ci.uchicago.edu Thu Jun 23 10:37:37 2011 From: ketan at ci.uchicago.edu (ketan at ci.uchicago.edu) Date: Thu, 23 Jun 2011 10:37:37 -0500 (CDT) Subject: [Swift-commit] r4658 - trunk/docs/tutorial Message-ID: <20110623153737.DFF019CC8D@svn.ci.uchicago.edu> Author: ketan Date: 2011-06-23 10:37:37 -0500 (Thu, 23 Jun 2011) New Revision: 4658 Modified: trunk/docs/tutorial/abstract trunk/docs/tutorial/introduction trunk/docs/tutorial/language_features trunk/docs/tutorial/tutorial.txt Log: Some spruce up of the tutorial Modified: trunk/docs/tutorial/abstract =================================================================== --- trunk/docs/tutorial/abstract 2011-06-23 03:45:35 UTC (rev 4657) +++ trunk/docs/tutorial/abstract 2011-06-23 15:37:37 UTC (rev 4658) @@ -3,3 +3,5 @@ -------- This is an introductory tutorial on the use of Swift and its programming language SwiftScript. + +note: merge with intro? Modified: trunk/docs/tutorial/introduction =================================================================== --- trunk/docs/tutorial/introduction 2011-06-23 03:45:35 UTC (rev 4657) +++ trunk/docs/tutorial/introduction 2011-06-23 15:37:37 UTC (rev 4658) @@ -1,15 +1,15 @@ Introduction ------------ -This tutorial is intended to introduce new users to the basics of Swift. +This is an introductory tutorial describing the use of Swift and its programming +language SwiftScript. It is intended to introduce new users to the basics of Swift. It is structured as a series of simple exercises/examples which you can try for yourself as you read along. After the first 'hello world' example, there are two tracks - the language track (which introduces the SwiftScript language) and the runtime track (which introduces features of the Swift runtime environment, such as running jobs on different computational 'sites'). For information on getting an installation of Swift running, consult the -Swift Quickstart Guide , and -return to this document when you have successfully run the test -SwiftScript program mentioned there. _suggest_ _which_ _version_. +Swift Quickstart Guide . We advise you to install the latest stable release of Swift. +Return to this document when you have successfully run the test SwiftScript program mentioned there. There is also a Swift User's Guide which contains Modified: trunk/docs/tutorial/language_features =================================================================== --- trunk/docs/tutorial/language_features 2011-06-23 03:45:35 UTC (rev 4657) +++ trunk/docs/tutorial/language_features 2011-06-23 15:37:37 UTC (rev 4658) @@ -80,9 +80,9 @@ ToDo: What is transformation catalog? One line explanation. First we need to modify the transformation catalog to define a logical -transformation for the tr utility. The transformation catalog can be -found in etc/tc.data. There are already several entries specifying -where programs can be found. Add a new line to the file, specifying +transformation for the tr utility. A transformation catalog lists where executables are located on computational sites. +The transformation catalog can be found in etc/tc.data. There are already several entries specifying +where executables can be found. Add a new line to the file, specifying where *tr* can be found (usually in /usr/bin/tr but it may differ on your system), like this: @@ -330,8 +330,6 @@ ~~ Decisions can be made using 'if', like this: -TODO: More examples of if required. - ---- if(morning) { outfile = greeting("good morning"); @@ -378,9 +376,14 @@ ---- Install the above wcl script somewhere and add a transformation catalog -(tc) entry for it. Then run the example program like this: +(tc) entry for it (see an example below, note that you will need to change the path in third column to the path where wcl is located on your localhost). -TODO: Show the tc entry. +---- +localhost wcl /home/ketan/bin/wcl INSTALLED INTEL32::LINUX null +---- + +Then run the example program like this: + ---- $ swift iterate.swift Modified: trunk/docs/tutorial/tutorial.txt =================================================================== --- trunk/docs/tutorial/tutorial.txt 2011-06-23 03:45:35 UTC (rev 4657) +++ trunk/docs/tutorial/tutorial.txt 2011-06-23 15:37:37 UTC (rev 4658) @@ -6,8 +6,6 @@ :website: http://www.ci.uchicago.edu/swift/guides/tutorial.php :numbered: -include::abstract[] - include::introduction[] include::hello_world[] From wozniak at ci.uchicago.edu Thu Jun 23 11:15:50 2011 From: wozniak at ci.uchicago.edu (wozniak at ci.uchicago.edu) Date: Thu, 23 Jun 2011 11:15:50 -0500 (CDT) Subject: [Swift-commit] r4659 - trunk/src/org/griphyn/vdl/karajan/lib Message-ID: <20110623161550.51F499CFEC@svn.ci.uchicago.edu> Author: wozniak Date: 2011-06-23 11:15:50 -0500 (Thu, 23 Jun 2011) New Revision: 4659 Modified: trunk/src/org/griphyn/vdl/karajan/lib/SetFieldValue.java Log: Fix logging message Modified: trunk/src/org/griphyn/vdl/karajan/lib/SetFieldValue.java =================================================================== --- trunk/src/org/griphyn/vdl/karajan/lib/SetFieldValue.java 2011-06-23 15:37:37 UTC (rev 4658) +++ trunk/src/org/griphyn/vdl/karajan/lib/SetFieldValue.java 2011-06-23 16:15:50 UTC (rev 4659) @@ -78,7 +78,7 @@ if (p.equals("$")) p = ""; String name = data.getDisplayableName() + p; - logger.info("Set: " + name + "=" + value); + logger.info("Set: " + name + "=" + value.getValue()); } } } From wozniak at ci.uchicago.edu Thu Jun 23 13:01:35 2011 From: wozniak at ci.uchicago.edu (wozniak at ci.uchicago.edu) Date: Thu, 23 Jun 2011 13:01:35 -0500 (CDT) Subject: [Swift-commit] r4663 - trunk/tests/language-behaviour Message-ID: <20110623180135.42AE99CFF2@svn.ci.uchicago.edu> Author: wozniak Date: 2011-06-23 13:01:35 -0500 (Thu, 23 Jun 2011) New Revision: 4663 Added: trunk/tests/language-behaviour/086-iterate-concurrent.check.sh trunk/tests/language-behaviour/086-iterate-concurrent.clean.sh trunk/tests/language-behaviour/086-iterate-concurrent.setup.sh Log: Wrap up existing iterate{} test Added: trunk/tests/language-behaviour/086-iterate-concurrent.check.sh =================================================================== --- trunk/tests/language-behaviour/086-iterate-concurrent.check.sh (rev 0) +++ trunk/tests/language-behaviour/086-iterate-concurrent.check.sh 2011-06-23 18:01:35 UTC (rev 4663) @@ -0,0 +1,8 @@ +#!/bin/sh + +set -x + +LINES=$( cat _concurrent/outfile-* | grep -c hello ) +[[ ${LINES} == 12 ]] || exit 1 + +exit 0 Property changes on: trunk/tests/language-behaviour/086-iterate-concurrent.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/086-iterate-concurrent.clean.sh =================================================================== --- trunk/tests/language-behaviour/086-iterate-concurrent.clean.sh (rev 0) +++ trunk/tests/language-behaviour/086-iterate-concurrent.clean.sh 2011-06-23 18:01:35 UTC (rev 4663) @@ -0,0 +1,7 @@ +#!/bin/sh + +set -x + +rm -rfv _concurrent + +exit 0 Property changes on: trunk/tests/language-behaviour/086-iterate-concurrent.clean.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/086-iterate-concurrent.setup.sh =================================================================== --- trunk/tests/language-behaviour/086-iterate-concurrent.setup.sh (rev 0) +++ trunk/tests/language-behaviour/086-iterate-concurrent.setup.sh 2011-06-23 18:01:35 UTC (rev 4663) @@ -0,0 +1,7 @@ +#!/bin/sh + +set -x + +rm -rfv _concurrent + +exit 0 Property changes on: trunk/tests/language-behaviour/086-iterate-concurrent.setup.sh ___________________________________________________________________ Added: svn:executable + * From wozniak at ci.uchicago.edu Thu Jun 23 13:04:13 2011 From: wozniak at ci.uchicago.edu (wozniak at ci.uchicago.edu) Date: Thu, 23 Jun 2011 13:04:13 -0500 (CDT) Subject: [Swift-commit] r4664 - trunk/tests/language-behaviour Message-ID: <20110623180413.AAF0C9CFF2@svn.ci.uchicago.edu> Author: wozniak Date: 2011-06-23 13:04:13 -0500 (Thu, 23 Jun 2011) New Revision: 4664 Modified: trunk/tests/language-behaviour/086-iterate-concurrent.swift Log: Update app syntax Modified: trunk/tests/language-behaviour/086-iterate-concurrent.swift =================================================================== --- trunk/tests/language-behaviour/086-iterate-concurrent.swift 2011-06-23 18:01:35 UTC (rev 4663) +++ trunk/tests/language-behaviour/086-iterate-concurrent.swift 2011-06-23 18:04:13 UTC (rev 4664) @@ -1,9 +1,7 @@ type messagefile; -(messagefile t) greeting() { - app { - echo "hello" stdout=@filename(t); - } +app (messagefile t) greeting() { + echo "hello" stdout=@filename(t); } iterate i { From wozniak at ci.uchicago.edu Thu Jun 23 13:14:30 2011 From: wozniak at ci.uchicago.edu (wozniak at ci.uchicago.edu) Date: Thu, 23 Jun 2011 13:14:30 -0500 (CDT) Subject: [Swift-commit] r4665 - trunk/tests/language-behaviour Message-ID: <20110623181430.EFCCF9CFF2@svn.ci.uchicago.edu> Author: wozniak Date: 2011-06-23 13:14:30 -0500 (Thu, 23 Jun 2011) New Revision: 4665 Added: trunk/tests/language-behaviour/087-iterate-previous.check.sh trunk/tests/language-behaviour/087-iterate-previous.clean.sh trunk/tests/language-behaviour/087-iterate-previous.setup.sh trunk/tests/language-behaviour/087-iterate-previous.swift Log: New test for iteration with reference to previous output Added: trunk/tests/language-behaviour/087-iterate-previous.check.sh =================================================================== --- trunk/tests/language-behaviour/087-iterate-previous.check.sh (rev 0) +++ trunk/tests/language-behaviour/087-iterate-previous.check.sh 2011-06-23 18:14:30 UTC (rev 4665) @@ -0,0 +1,8 @@ +#!/bin/sh + +set -x + +LINES=$( cat file-*.txt | grep -c HOWDY ) +[[ ${LINES} == 7 ]] || exit 1 + +exit 0 Property changes on: trunk/tests/language-behaviour/087-iterate-previous.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/087-iterate-previous.clean.sh =================================================================== --- trunk/tests/language-behaviour/087-iterate-previous.clean.sh (rev 0) +++ trunk/tests/language-behaviour/087-iterate-previous.clean.sh 2011-06-23 18:14:30 UTC (rev 4665) @@ -0,0 +1,7 @@ +#!/bin/sh + +set -x + +rm -fv file-*.txt + +exit 0 Property changes on: trunk/tests/language-behaviour/087-iterate-previous.clean.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/087-iterate-previous.setup.sh =================================================================== --- trunk/tests/language-behaviour/087-iterate-previous.setup.sh (rev 0) +++ trunk/tests/language-behaviour/087-iterate-previous.setup.sh 2011-06-23 18:14:30 UTC (rev 4665) @@ -0,0 +1,7 @@ +#!/bin/sh + +set -x + +echo HOWDY > file-0.txt + +exit 0 Property changes on: trunk/tests/language-behaviour/087-iterate-previous.setup.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/087-iterate-previous.swift =================================================================== --- trunk/tests/language-behaviour/087-iterate-previous.swift (rev 0) +++ trunk/tests/language-behaviour/087-iterate-previous.swift 2011-06-23 18:14:30 UTC (rev 4665) @@ -0,0 +1,16 @@ +type file; + +app (file o) copy(file i) { + cp @i @o; +} + +file input<"file-0.txt">; + +iterate i { + string si = @strcat("file-",i,".txt"); + int j = i+1; + string sj = @strcat("file-",j,".txt"); + file fi; + file fj; + fj = copy(fi); +} until(i==5); From hategan at ci.uchicago.edu Thu Jun 23 13:27:59 2011 From: hategan at ci.uchicago.edu (hategan at ci.uchicago.edu) Date: Thu, 23 Jun 2011 13:27:59 -0500 (CDT) Subject: [Swift-commit] r4666 - trunk/src/org/griphyn/vdl/karajan Message-ID: <20110623182759.691B69CFF2@svn.ci.uchicago.edu> Author: hategan Date: 2011-06-23 13:27:59 -0500 (Thu, 23 Jun 2011) New Revision: 4666 Modified: trunk/src/org/griphyn/vdl/karajan/WrapperMap.java Log: only lock objects when necessary Modified: trunk/src/org/griphyn/vdl/karajan/WrapperMap.java =================================================================== --- trunk/src/org/griphyn/vdl/karajan/WrapperMap.java 2011-06-23 18:14:30 UTC (rev 4665) +++ trunk/src/org/griphyn/vdl/karajan/WrapperMap.java 2011-06-23 18:27:59 UTC (rev 4666) @@ -10,10 +10,10 @@ import org.griphyn.vdl.mapping.DSHandle; public class WrapperMap { - private Map map; + private Map map; public WrapperMap() { - this.map = new HashMap(); + this.map = new HashMap(); } public static class FutureWrappers { @@ -21,38 +21,49 @@ public ArrayIndexFutureList arrayWrapper; } - public synchronized void close(DSHandle handle) { - FutureWrappers fw = (FutureWrappers) map.get(handle); - if (fw != null) { - if (fw.nodeWrapper != null) { - fw.nodeWrapper.close(); - } - if (fw.arrayWrapper != null) { - fw.arrayWrapper.close(); - } + public void close(DSHandle handle) { + DSHandleFutureWrapper nodeWrapper; + ArrayIndexFutureList arrayWrapper; + synchronized(this) { + FutureWrappers fw = map.get(handle); + if (fw == null) { + return; + } + nodeWrapper = fw.nodeWrapper; + arrayWrapper = fw.arrayWrapper; + } + if (nodeWrapper != null) { + nodeWrapper.close(); } + if (arrayWrapper != null) { + arrayWrapper.close(); + } } - public synchronized boolean isClosed(DSHandle handle) { - FutureWrappers fw = (FutureWrappers) map.get(handle); - if (fw != null) { - if (fw.nodeWrapper != null) { - return fw.nodeWrapper.isClosed(); - } - else if (fw.arrayWrapper != null) { - return fw.arrayWrapper.isClosed(); - } - else { - return false; - } + public boolean isClosed(DSHandle handle) { + DSHandleFutureWrapper nodeWrapper; + ArrayIndexFutureList arrayWrapper; + synchronized(this) { + FutureWrappers fw = map.get(handle); + if (fw == null) { + return false; + } + nodeWrapper = fw.nodeWrapper; + arrayWrapper = fw.arrayWrapper; + } + if (nodeWrapper != null) { + return nodeWrapper.isClosed(); } + else if (arrayWrapper != null) { + return arrayWrapper.isClosed(); + } else { return false; } } public synchronized DSHandleFutureWrapper addNodeListener(DSHandle handle) { - FutureWrappers fw = (FutureWrappers) map.get(handle); + FutureWrappers fw = map.get(handle); if (fw == null) { map.put(handle, fw = new FutureWrappers()); } @@ -63,8 +74,8 @@ return fw.nodeWrapper; } - public synchronized ArrayIndexFutureList addFutureListListener(DSHandle handle, Map value) { - FutureWrappers fw = (FutureWrappers) map.get(handle); + public synchronized ArrayIndexFutureList addFutureListListener(DSHandle handle, Map value) { + FutureWrappers fw = map.get(handle); if (fw == null) { map.put(handle, fw = new FutureWrappers()); } @@ -81,13 +92,13 @@ } public synchronized void markAsAvailable(DSHandle handle, Object key) { - FutureWrappers fw = (FutureWrappers) map.get(handle); + FutureWrappers fw = map.get(handle); if (fw != null && fw.arrayWrapper != null) { fw.arrayWrapper.addKey(key); } } - public Set entrySet() { + public Set> entrySet() { return map.entrySet(); } } From hategan at ci.uchicago.edu Thu Jun 23 13:29:16 2011 From: hategan at ci.uchicago.edu (hategan at ci.uchicago.edu) Date: Thu, 23 Jun 2011 13:29:16 -0500 (CDT) Subject: [Swift-commit] r4667 - trunk/libexec Message-ID: <20110623182916.1707E9CFF2@svn.ci.uchicago.edu> Author: hategan Date: 2011-06-23 13:29:16 -0500 (Thu, 23 Jun 2011) New Revision: 4667 Modified: trunk/libexec/vdl-int-staging.k Log: fixed broken arguments when using provider staging Modified: trunk/libexec/vdl-int-staging.k =================================================================== --- trunk/libexec/vdl-int-staging.k 2011-06-23 18:27:59 UTC (rev 4666) +++ trunk/libexec/vdl-int-staging.k 2011-06-23 18:29:16 UTC (rev 4667) @@ -117,7 +117,7 @@ "-k", "-cdmfile", cdmfile, "-status", "provider" - "-a", maybe(unwrapClosedList(arguments)) + "-a", maybe(each(unwrapClosedList(arguments))) ) directory = "{wfdir}-{jobdir}-{jobid}" redirect = false From hategan at ci.uchicago.edu Thu Jun 23 13:30:27 2011 From: hategan at ci.uchicago.edu (hategan at ci.uchicago.edu) Date: Thu, 23 Jun 2011 13:30:27 -0500 (CDT) Subject: [Swift-commit] r4668 - trunk/src/org/griphyn/vdl/mapping Message-ID: <20110623183027.B76489CFF2@svn.ci.uchicago.edu> Author: hategan Date: 2011-06-23 13:30:27 -0500 (Thu, 23 Jun 2011) New Revision: 4668 Modified: trunk/src/org/griphyn/vdl/mapping/AbstractDataNode.java trunk/src/org/griphyn/vdl/mapping/DSHandle.java Log: generics Modified: trunk/src/org/griphyn/vdl/mapping/AbstractDataNode.java =================================================================== --- trunk/src/org/griphyn/vdl/mapping/AbstractDataNode.java 2011-06-23 18:29:16 UTC (rev 4667) +++ trunk/src/org/griphyn/vdl/mapping/AbstractDataNode.java 2011-06-23 18:30:27 UTC (rev 4668) @@ -14,7 +14,6 @@ import org.griphyn.vdl.karajan.VDL2FutureException; import org.griphyn.vdl.type.Field; import org.griphyn.vdl.type.Type; -import org.griphyn.vdl.type.Types; import org.griphyn.vdl.util.VDL2Config; @@ -332,7 +331,7 @@ } } - public Map getArrayValue() { + public Map getArrayValue() { checkDataException(); if (!field.getType().isArray()) { throw new RuntimeException Modified: trunk/src/org/griphyn/vdl/mapping/DSHandle.java =================================================================== --- trunk/src/org/griphyn/vdl/mapping/DSHandle.java 2011-06-23 18:29:16 UTC (rev 4667) +++ trunk/src/org/griphyn/vdl/mapping/DSHandle.java 2011-06-23 18:30:27 UTC (rev 4668) @@ -67,7 +67,7 @@ public Collection getFringePaths() throws HandleOpenException; - public Map getArrayValue(); + public Map getArrayValue(); public Path getPathFromRoot(); From hategan at ci.uchicago.edu Thu Jun 23 13:31:20 2011 From: hategan at ci.uchicago.edu (hategan at ci.uchicago.edu) Date: Thu, 23 Jun 2011 13:31:20 -0500 (CDT) Subject: [Swift-commit] r4669 - trunk/src/org/griphyn/vdl/karajan/lib Message-ID: <20110623183120.3F47D9CFF2@svn.ci.uchicago.edu> Author: hategan Date: 2011-06-23 13:31:20 -0500 (Thu, 23 Jun 2011) New Revision: 4669 Modified: trunk/src/org/griphyn/vdl/karajan/lib/UnwrapClosedList.java Log: deal with array returns such as the ones from @filenames Modified: trunk/src/org/griphyn/vdl/karajan/lib/UnwrapClosedList.java =================================================================== --- trunk/src/org/griphyn/vdl/karajan/lib/UnwrapClosedList.java 2011-06-23 18:30:27 UTC (rev 4668) +++ trunk/src/org/griphyn/vdl/karajan/lib/UnwrapClosedList.java 2011-06-23 18:31:20 UTC (rev 4669) @@ -5,6 +5,7 @@ import java.util.ArrayList; import java.util.List; +import java.util.Map; import org.apache.log4j.Logger; import org.globus.cog.karajan.arguments.Arg; @@ -28,7 +29,15 @@ List r = new ArrayList(l.size()); for (DSHandle h : l) { - r.add(h.getValue()); + if (h.getType().isArray()) { + Map m = h.getArrayValue(); + for (DSHandle h2 : m.values()) { + r.add(h2.getValue()); + } + } + else { + r.add(h.getValue()); + } } return r; From hategan at ci.uchicago.edu Thu Jun 23 13:32:08 2011 From: hategan at ci.uchicago.edu (hategan at ci.uchicago.edu) Date: Thu, 23 Jun 2011 13:32:08 -0500 (CDT) Subject: [Swift-commit] r4670 - trunk/src/org/griphyn/vdl/karajan/lib/swiftscript Message-ID: <20110623183208.835BE9CFF2@svn.ci.uchicago.edu> Author: hategan Date: 2011-06-23 13:32:08 -0500 (Thu, 23 Jun 2011) New Revision: 4670 Modified: trunk/src/org/griphyn/vdl/karajan/lib/swiftscript/FileNames.java Log: close array created by @filenames Modified: trunk/src/org/griphyn/vdl/karajan/lib/swiftscript/FileNames.java =================================================================== --- trunk/src/org/griphyn/vdl/karajan/lib/swiftscript/FileNames.java 2011-06-23 18:31:20 UTC (rev 4669) +++ trunk/src/org/griphyn/vdl/karajan/lib/swiftscript/FileNames.java 2011-06-23 18:32:08 UTC (rev 4670) @@ -31,6 +31,8 @@ } catch (InvalidPathException e) { throw new ExecutionException("Unexpected invalid path exception",e); } + returnArray.closeShallow(); + int provid = VDLFunction.nextProvenanceID(); logProvenanceParameter(provid, (DSHandle) PA_VAR.getValue(stack), "input"); logProvenanceResult(provid, returnArray, "filenames"); From ketan at ci.uchicago.edu Thu Jun 23 13:49:19 2011 From: ketan at ci.uchicago.edu (ketan at ci.uchicago.edu) Date: Thu, 23 Jun 2011 13:49:19 -0500 (CDT) Subject: [Swift-commit] r4671 - trunk/docs/cookbook Message-ID: <20110623184919.766139CFF2@svn.ci.uchicago.edu> Author: ketan Date: 2011-06-23 13:49:19 -0500 (Thu, 23 Jun 2011) New Revision: 4671 Added: trunk/docs/cookbook/figures Modified: trunk/docs/cookbook/diverse_infrastructures Log: spruced up the beagle cookbook section Modified: trunk/docs/cookbook/diverse_infrastructures =================================================================== --- trunk/docs/cookbook/diverse_infrastructures 2011-06-23 18:32:08 UTC (rev 4670) +++ trunk/docs/cookbook/diverse_infrastructures 2011-06-23 18:49:19 UTC (rev 4671) @@ -3,35 +3,45 @@ Beagle ~~~~~~ -Swift is now installed on Beagle as a module. Swift supports a Coasters based, -computing environment for Beagle. A detailed Swift documentation is maintained -[[http://www.ci.uchicago.edu/swift/docs/index.php][here]]. To get started -with Swift on Beagle follow the steps outlined below: +Swift is available on Beagle as a software module. +In this recipe, we will walk you through a very simple example running Swift +on Beagle. The prerequisites required for running this example on Beagle is an access to Beagle and a project allocation. The example is a simplest form of a real application that involves reading from a disc file and writing onto another disc file. It runs the +/bin/cat+ Unix command to read an input file called +data.txt+ and write it to an output file in a folder +outdir+, called +f.nnn.out+. -*step 1.* Load the Swift module on Beagle as follows: +module load swift+ +image::figures/catsn.png[Swift Example] -*step 2.* Create and change to a directory where your Swift related work will -stay. (say, +mkdir swift-lab+, followed by, +cd swift-lab+) +The steps are as follows: -*step 3.* To get started with a simple example running +/bin/cat+ to read an input file +data.txt+ and write to an output file +f.nnn.out+, copy the folder at +/home/ketan/labs/catsn+ to the above directory. (+cp -r /home/ketan/catsn .+ followed by +cd catsn+). +*step 1.* Load the Swift module on Beagle commandline as follows: +$ module load swift+ -*step 4.* In the sites file: +beagle-coaster.xml+, make the following two -changes: *1)* change the path of +workdirectory+ to your preferred location -(say to +/lustre/beagle/$USER/swift-lab/swift.workdir+) and *2)* Change the -project name to your project (+CI-CCR000013+) . The workdirectory will contain -execution data related to each run, e.g. wrapper scripts, system information, -inputs and outputs. +*step 2.* Create and change to a directory where your Swift related work (source, inputs, outputs) will +stay. (say, +$ mkdir swift-lab+, followed by, +$ cd swift-lab+) -*step 5.* Run the example using following commandline (also found in run.sh): -+swift -config cf -tc.file tc -sites.file beagle-coaster.xml catsn.swift -n=1+ -. You can further change the value of +-n+ to any arbitrary number to run that -many number of concurrent +cat+ +*step 3.* copy the folder at +/home/ketan/labs/catsn+ to the above directory. (+$cp -r /home/ketan/catsn .+ followed by +$ cd catsn+). -*step 6.* Check the output in the generated +outdir+ directory (+ls outdir+) +*step 4.* In the sites file: +sites.xml+ make the following two +changes: -Note: Running from sandbox node or requesting 1 hour walltime for upto 3 nodes -will get fast prioritized execution. Good for small tests + 1. change the path of the +$$$$+ element to your preferred location (say to +/lustre/beagle//swift-lab/swift.workdir+), and + 2. Change the project name to your project (for instance, +CI-CCR000013+) . The workdirectory will contain + execution data related to each run, e.g. wrapper scripts, system information, inputs and outputs. + + *step 5.* Run the example using following commandline (also found in run.sh): + + ---- + $ swift -config cf -tc.file tc -sites.file sites.xml catsn.swift -n=1 + ---- + + You can further change the value of +-n+ to any arbitrary number to run that + many number of concurrent +cat+ + + *step 6.* Check the output in the generated +outdir+ directory (+ls outdir+) + + Note: Running from sandbox node or requesting 1 hour walltime for upto 3 nodes + will get fast prioritized execution. Good for small tests + Swift supports a coasters based computing environment for Beagle. A detailed version of Swift documentation is maintained + http://www.ci.uchicago.edu/swift/docs/index.php[here]. + // //Intrepid-BG/P //~~~~~~~~~~~~~ Added: trunk/docs/cookbook/figures =================================================================== --- trunk/docs/cookbook/figures (rev 0) +++ trunk/docs/cookbook/figures 2011-06-23 18:49:19 UTC (rev 4671) @@ -0,0 +1 @@ +link /ci/www/projects/swift/cookbook/figures/ \ No newline at end of file Property changes on: trunk/docs/cookbook/figures ___________________________________________________________________ Added: svn:special + * From wozniak at ci.uchicago.edu Thu Jun 23 16:18:03 2011 From: wozniak at ci.uchicago.edu (wozniak at ci.uchicago.edu) Date: Thu, 23 Jun 2011 16:18:03 -0500 (CDT) Subject: [Swift-commit] r4672 - trunk/src/org/griphyn/vdl/karajan/lib Message-ID: <20110623211803.ECD249CFF2@svn.ci.uchicago.edu> Author: wozniak Date: 2011-06-23 16:18:03 -0500 (Thu, 23 Jun 2011) New Revision: 4672 Modified: trunk/src/org/griphyn/vdl/karajan/lib/SetFieldValue.java Log: Better logging for structured data Modified: trunk/src/org/griphyn/vdl/karajan/lib/SetFieldValue.java =================================================================== --- trunk/src/org/griphyn/vdl/karajan/lib/SetFieldValue.java 2011-06-23 18:49:19 UTC (rev 4671) +++ trunk/src/org/griphyn/vdl/karajan/lib/SetFieldValue.java 2011-06-23 21:18:03 UTC (rev 4672) @@ -3,6 +3,9 @@ */ package org.griphyn.vdl.karajan.lib; +import java.util.Iterator; +import java.util.Map; + import org.apache.log4j.Logger; import org.globus.cog.karajan.arguments.Arg; import org.globus.cog.karajan.stack.VariableStack; @@ -66,7 +69,8 @@ } } - private void log(DSHandle leaf, DSHandle value) { + @SuppressWarnings("unchecked") + private void log(DSHandle leaf, DSHandle value) { if (logger.isDebugEnabled()) { logger.debug("Setting " + leaf + " to " + value); } @@ -78,11 +82,33 @@ if (p.equals("$")) p = ""; String name = data.getDisplayableName() + p; - logger.info("Set: " + name + "=" + value.getValue()); + Object v = value.getValue(); + if (! (v instanceof Map)) + logger.info("Set: " + name + "=" + v); + else + logger.info("Set: " + name + "=" + + unpackHandles((Map) v)); } } } + String unpackHandles(Map handles) { + StringBuilder sb = new StringBuilder(); + sb.append("{"); + Iterator> it = + handles.entrySet().iterator(); + while (it.hasNext()) { + Map.Entry entry = it.next(); + sb.append(entry.getKey()); + sb.append('='); + sb.append(entry.getValue().getValue()); + if (it.hasNext()) + sb.append(", "); + } + sb.append("}"); + return sb.toString(); + } + /** make dest look like source - if its a simple value, copy that and if its an array then recursively copy */ void deepCopy(DSHandle dest, DSHandle source, VariableStack stack) throws ExecutionException { From wozniak at ci.uchicago.edu Thu Jun 23 16:20:57 2011 From: wozniak at ci.uchicago.edu (wozniak at ci.uchicago.edu) Date: Thu, 23 Jun 2011 16:20:57 -0500 (CDT) Subject: [Swift-commit] r4673 - trunk/src/org/griphyn/vdl/engine Message-ID: <20110623212057.CCE429CFF2@svn.ci.uchicago.edu> Author: wozniak Date: 2011-06-23 16:20:57 -0500 (Thu, 23 Jun 2011) New Revision: 4673 Modified: trunk/src/org/griphyn/vdl/engine/Karajan.java Log: Spelling Modified: trunk/src/org/griphyn/vdl/engine/Karajan.java =================================================================== --- trunk/src/org/griphyn/vdl/engine/Karajan.java 2011-06-23 21:18:03 UTC (rev 4672) +++ trunk/src/org/griphyn/vdl/engine/Karajan.java 2011-06-23 21:20:57 UTC (rev 4673) @@ -60,7 +60,6 @@ public static final String TEMPLATE_FILE_NAME = "Karajan.stg"; - LinkedList importList = new LinkedList(); Set importedNames = new HashSet(); @@ -451,7 +450,7 @@ scope.addWriter(rootvar, new Integer(callID++), rootVariableIsPartial(assign.getAbstractExpressionArray(0))); scope.appendStatement(assignST); } catch(CompilationException re) { - throw new CompilationException("Compile error in assigment at "+assign.getSrc()+": "+re.getMessage(),re); + throw new CompilationException("Compile error in assignment at "+assign.getSrc()+": "+re.getMessage(),re); } } From wozniak at ci.uchicago.edu Thu Jun 23 16:21:38 2011 From: wozniak at ci.uchicago.edu (wozniak at ci.uchicago.edu) Date: Thu, 23 Jun 2011 16:21:38 -0500 (CDT) Subject: [Swift-commit] r4674 - trunk/src/org/griphyn/vdl/karajan/lib Message-ID: <20110623212138.D60209CFF2@svn.ci.uchicago.edu> Author: wozniak Date: 2011-06-23 16:21:38 -0500 (Thu, 23 Jun 2011) New Revision: 4674 Modified: trunk/src/org/griphyn/vdl/karajan/lib/InfiniteCountingWhile.java Log: Use generics Modified: trunk/src/org/griphyn/vdl/karajan/lib/InfiniteCountingWhile.java =================================================================== --- trunk/src/org/griphyn/vdl/karajan/lib/InfiniteCountingWhile.java 2011-06-23 21:20:57 UTC (rev 4673) +++ trunk/src/org/griphyn/vdl/karajan/lib/InfiniteCountingWhile.java 2011-06-23 21:21:38 UTC (rev 4674) @@ -62,8 +62,9 @@ fn = getElement(0); String counterName = (String) stack.getVar(VAR); - List l = (List) stack.getVar(counterName); - Integer wrappedi = (Integer)l.get(0); + @SuppressWarnings("unchecked") + List l = (List) stack.getVar(counterName); + Integer wrappedi = l.get(0); int i = wrappedi.intValue(); i++; ThreadingContext tc = (ThreadingContext)stack.getVar("#iteratethread"); From wozniak at ci.uchicago.edu Thu Jun 23 16:22:17 2011 From: wozniak at ci.uchicago.edu (wozniak at ci.uchicago.edu) Date: Thu, 23 Jun 2011 16:22:17 -0500 (CDT) Subject: [Swift-commit] r4675 - trunk/src/org/griphyn/vdl/mapping/file Message-ID: <20110623212217.3663A9CFF2@svn.ci.uchicago.edu> Author: wozniak Date: 2011-06-23 16:22:17 -0500 (Thu, 23 Jun 2011) New Revision: 4675 Modified: trunk/src/org/griphyn/vdl/mapping/file/DefaultFileNameElementMapper.java Log: Use StringBuilder Modified: trunk/src/org/griphyn/vdl/mapping/file/DefaultFileNameElementMapper.java =================================================================== --- trunk/src/org/griphyn/vdl/mapping/file/DefaultFileNameElementMapper.java 2011-06-23 21:21:38 UTC (rev 4674) +++ trunk/src/org/griphyn/vdl/mapping/file/DefaultFileNameElementMapper.java 2011-06-23 21:22:17 UTC (rev 4675) @@ -36,7 +36,7 @@ } public String mapIndex(int index) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(indexWidth); String num = String.valueOf(index); for (int i = 0; i < indexWidth - num.length(); i++) { sb.append('0'); From wozniak at ci.uchicago.edu Thu Jun 23 16:26:26 2011 From: wozniak at ci.uchicago.edu (wozniak at ci.uchicago.edu) Date: Thu, 23 Jun 2011 16:26:26 -0500 (CDT) Subject: [Swift-commit] r4676 - trunk/src/org/griphyn/vdl/mapping Message-ID: <20110623212626.44BA19CFF2@svn.ci.uchicago.edu> Author: wozniak Date: 2011-06-23 16:26:26 -0500 (Thu, 23 Jun 2011) New Revision: 4676 Modified: trunk/src/org/griphyn/vdl/mapping/Path.java Log: Use generics Modified: trunk/src/org/griphyn/vdl/mapping/Path.java =================================================================== --- trunk/src/org/griphyn/vdl/mapping/Path.java 2011-06-23 21:22:17 UTC (rev 4675) +++ trunk/src/org/griphyn/vdl/mapping/Path.java 2011-06-23 21:26:26 UTC (rev 4676) @@ -14,17 +14,20 @@ public static final Path EMPTY_PATH = new EmptyPath(); public static final Path CHILDREN = Path.parse("*"); - /** A list of Path.Entry objects that represent the path. */ - private List elements; + /** A list of Path.Entry that represents the path. */ + private List entries; /** True if any element of the Path contains a wildcard. */ private boolean wildcard; + /** Cached string representation + @see toString + */ private String tostrcached; public static class EmptyPath extends Path { public EmptyPath() { - super(Collections.EMPTY_LIST); + super(); } public String toString() { @@ -81,9 +84,7 @@ Entry other = (Entry) obj; return name.equals(other.name) && (index == other.index); } - else { - return false; - } + return false; } public int hashCode() { @@ -94,9 +95,7 @@ if (index) { return '[' + name + ']'; } - else { - return name; - } + return name; } } @@ -104,8 +103,8 @@ if (path == null || path.equals("") || path.equals("$")) { return Path.EMPTY_PATH; } - ArrayList list = new ArrayList(); - StringBuffer sb = new StringBuffer(); + ArrayList list = new ArrayList(); + StringBuilder sb = new StringBuilder(); Entry e = new Entry(); boolean wildcard = false; for (int i = 0; i < path.length(); i++) { @@ -122,7 +121,7 @@ e.name = sb.toString(); list.add(e); e = new Entry(); - sb = new StringBuffer(); + sb.setLength(0); break; } case ']': { @@ -144,16 +143,14 @@ return new Path(list, wildcard); } - private Path(List elements, boolean wildcard) { - this.elements = elements; + private Path(List entries, boolean wildcard) { + this.entries = entries; this.wildcard = wildcard; } - private Path(List elements) { - this(elements, false); - Iterator i = elements.iterator(); - while (i.hasNext()) { - Entry e = (Entry) i.next(); + private Path(List entries) { + this(entries, false); + for (Entry e : entries) { if (e.isWildcard()) { this.wildcard = true; return; @@ -162,28 +159,35 @@ } private Path(Path other) { - this.elements = new ArrayList(other.elements); + this.entries = new ArrayList(other.entries); this.wildcard = other.wildcard; } + /** + Create an empty Path + */ + private Path() { + this.entries = Collections.emptyList(); + } + public String getElement(int index) { - return ((Entry) elements.get(index)).name; + return entries.get(index).name; } public int size() { - return elements == null ? 0 : elements.size(); + return entries == null ? 0 : entries.size(); } public String getFirst() { - return ((Entry) elements.get(0)).name; + return entries.get(0).name; } public String getLast() { - return ((Entry) elements.get(elements.size() - 1)).name; + return entries.get(entries.size() - 1).name; } public boolean isEmpty() { - return elements == null || elements.size() == 0; + return entries == null || entries.size() == 0; } public Path butFirst() { @@ -191,17 +195,17 @@ } public Path subPath(int fromIndex) { - return subPath(fromIndex, elements.size()); + return subPath(fromIndex, entries.size()); } public Path subPath(int fromIndex, int toIndex) { - return new Path(elements.subList(fromIndex, toIndex)); + return new Path(entries.subList(fromIndex, toIndex)); } public Path addFirst(String element, boolean index) { Path p = new Path(this); Entry e; - p.elements.add(0, e = new Entry(element, index)); + p.entries.add(0, e = new Entry(element, index)); if (e.isWildcard()) { this.wildcard = true; } @@ -214,8 +218,8 @@ public Path addLast(String element, boolean index) { Path p = new Path(this); - Entry e; - p.elements.add(e = new Entry(element, index)); + Entry e = new Entry(element, index); + p.entries.add(e); if (e.isWildcard()) { p.wildcard = true; } @@ -233,10 +237,10 @@ * someString.equals(Path.parse(someString).stringForm()). */ public String stringForm() { - StringBuffer sb = new StringBuffer(); - Iterator i = elements.iterator(); + StringBuilder sb = new StringBuilder(); + Iterator i = entries.iterator(); while (i.hasNext()) { - sb.append(((Entry) i.next()).name); + sb.append(i.next().name); if (i.hasNext()) { sb.append('.'); } @@ -256,9 +260,9 @@ return tostrcached; } StringBuffer sb = new StringBuffer(); - Iterator i = iterator(); - while (i.hasNext()) { - Path.Entry e = (Path.Entry) i.next(); + + for (Entry e : entries) { + if (e.isIndex()) { sb.append('['); sb.append(e.getName()); @@ -272,17 +276,17 @@ return tostrcached = sb.toString(); } - public Iterator iterator() { - return elements.iterator(); + public Iterator iterator() { + return entries.iterator(); } public boolean isArrayIndex(int pathIndex) { - Entry e = (Entry) elements.get(pathIndex); + Entry e = entries.get(pathIndex); return e.index; } public boolean isWildcard(int pathIndex) { - Entry e = (Entry) elements.get(pathIndex); + Entry e = entries.get(pathIndex); return e.isWildcard(); } @@ -293,11 +297,11 @@ public boolean equals(Object obj) { if (obj instanceof Path) { Path other = (Path) obj; - if (elements.size() != other.size()) { + if (entries.size() != other.size()) { return false; } - Iterator i = elements.iterator(); - Iterator o = other.elements.iterator(); + Iterator i = entries.iterator(); + Iterator o = other.entries.iterator(); while (i.hasNext()) { if (!i.next().equals(o.next())) { return false; @@ -305,24 +309,21 @@ } return true; } - else { - return false; - } + return false; } public int hashCode() { int hash = 0; - Iterator i = elements.iterator(); - while (i.hasNext()) { - hash <<= 1; - hash += i.next().hashCode(); + for (Entry e : entries) { + hash <<= 1; + hash += e.hashCode(); } return hash; } public Path append(Path path) { Path p = new Path(this); - p.elements.addAll(path.elements); + p.entries.addAll(path.entries); return p; } From wozniak at ci.uchicago.edu Thu Jun 23 16:27:58 2011 From: wozniak at ci.uchicago.edu (wozniak at ci.uchicago.edu) Date: Thu, 23 Jun 2011 16:27:58 -0500 (CDT) Subject: [Swift-commit] r4677 - trunk/etc Message-ID: <20110623212758.0E4089CFF2@svn.ci.uchicago.edu> Author: wozniak Date: 2011-06-23 16:27:57 -0500 (Thu, 23 Jun 2011) New Revision: 4677 Modified: trunk/etc/tc.data Log: Add touch - useful for tests Modified: trunk/etc/tc.data =================================================================== --- trunk/etc/tc.data 2011-06-23 21:26:26 UTC (rev 4676) +++ trunk/etc/tc.data 2011-06-23 21:27:57 UTC (rev 4677) @@ -16,4 +16,5 @@ localhost sort /bin/sort INSTALLED INTEL32::LINUX null localhost paste /bin/paste INSTALLED INTEL32::LINUX null localhost cp /bin/cp INSTALLED INTEL32::LINUX null +localhost touch /bin/touch INSTALLED INTEL32::LINUX null localhost wc /usr/bin/wc INSTALLED INTEL32::LINUX null From hategan at ci.uchicago.edu Thu Jun 23 16:37:08 2011 From: hategan at ci.uchicago.edu (hategan at ci.uchicago.edu) Date: Thu, 23 Jun 2011 16:37:08 -0500 (CDT) Subject: [Swift-commit] r4678 - trunk/src/org/griphyn/vdl/util Message-ID: <20110623213708.925489CFF2@svn.ci.uchicago.edu> Author: hategan Date: 2011-06-23 16:37:08 -0500 (Thu, 23 Jun 2011) New Revision: 4678 Modified: trunk/src/org/griphyn/vdl/util/VDL2Config.java Log: added default value for use.provider.staging Modified: trunk/src/org/griphyn/vdl/util/VDL2Config.java =================================================================== --- trunk/src/org/griphyn/vdl/util/VDL2Config.java 2011-06-23 21:27:57 UTC (rev 4677) +++ trunk/src/org/griphyn/vdl/util/VDL2Config.java 2011-06-23 21:37:08 UTC (rev 4678) @@ -97,6 +97,7 @@ put("wrapper.invocation.mode", "absolute"); put("cdm.broadcast.mode", "file"); + put("use.provider.staging", "false"); } private VDL2Config(VDL2Config other) { From wozniak at ci.uchicago.edu Thu Jun 23 17:02:18 2011 From: wozniak at ci.uchicago.edu (wozniak at ci.uchicago.edu) Date: Thu, 23 Jun 2011 17:02:18 -0500 (CDT) Subject: [Swift-commit] r4679 - trunk/tests Message-ID: <20110623220218.99A5A9CFEC@svn.ci.uchicago.edu> Author: wozniak Date: 2011-06-23 17:02:18 -0500 (Thu, 23 Jun 2011) New Revision: 4679 Modified: trunk/tests/suite.sh Log: Drop reference to /home/Alberto Modified: trunk/tests/suite.sh =================================================================== --- trunk/tests/suite.sh 2011-06-23 21:37:08 UTC (rev 4678) +++ trunk/tests/suite.sh 2011-06-23 22:02:18 UTC (rev 4679) @@ -113,7 +113,6 @@ #BRANCH="branches/tests-01" SCRIPTDIR=$( cd $( dirname $0 ) ; /bin/pwd ) -touch /home/Alberto/$SCRIPTDIR TESTCOUNT=0 TESTSFAILED=0 From wozniak at ci.uchicago.edu Thu Jun 23 17:22:13 2011 From: wozniak at ci.uchicago.edu (wozniak at ci.uchicago.edu) Date: Thu, 23 Jun 2011 17:22:13 -0500 (CDT) Subject: [Swift-commit] r4680 - in trunk/src/org/griphyn/vdl: karajan/lib mapping mapping/file Message-ID: <20110623222213.F0BA59CFEC@svn.ci.uchicago.edu> Author: wozniak Date: 2011-06-23 17:22:13 -0500 (Thu, 23 Jun 2011) New Revision: 4680 Modified: trunk/src/org/griphyn/vdl/karajan/lib/New.java trunk/src/org/griphyn/vdl/karajan/lib/PartialCloseDataset.java trunk/src/org/griphyn/vdl/mapping/AbstractDataNode.java trunk/src/org/griphyn/vdl/mapping/ArrayDataNode.java trunk/src/org/griphyn/vdl/mapping/DSHandle.java trunk/src/org/griphyn/vdl/mapping/MapperFactory.java trunk/src/org/griphyn/vdl/mapping/RootArrayDataNode.java trunk/src/org/griphyn/vdl/mapping/RootDataNode.java trunk/src/org/griphyn/vdl/mapping/file/ArrayFileMapper.java Log: Readability and warning fixes Modified: trunk/src/org/griphyn/vdl/karajan/lib/New.java =================================================================== --- trunk/src/org/griphyn/vdl/karajan/lib/New.java 2011-06-23 22:02:18 UTC (rev 4679) +++ trunk/src/org/griphyn/vdl/karajan/lib/New.java 2011-06-23 22:22:13 UTC (rev 4680) @@ -41,12 +41,14 @@ public Object function(VariableStack stack) throws ExecutionException { String typename = TypeUtil.toString(OA_TYPE.getValue(stack)); Object value = OA_VALUE.getValue(stack); - Map mapping = (Map) OA_MAPPING.getValue(stack); + @SuppressWarnings("unchecked") + Map mapping = + (Map) OA_MAPPING.getValue(stack); String dbgname = TypeUtil.toString(OA_DBGNAME.getValue(stack)); String waitfor = (String) OA_WAITFOR.getValue(stack); if (mapping == null) { - mapping = new HashMap(); + mapping = new HashMap(); } if (dbgname != null) { @@ -55,26 +57,26 @@ mapping.put("swift#restartid", getThreadPrefix(stack) + ":" + dbgname); - if(waitfor != null) { + if (waitfor != null) { mapping.put("waitfor", waitfor); } if (typename == null && value == null) { throw new ExecutionException("You must specify either a type or a value"); } - if (mapping != null) { - String mapper = (String) mapping.get("descriptor"); - if ("concurrent_mapper".equals(mapper)) { - String threadPrefix = getThreadPrefix(stack); - ConcurrentMapper.PARAM_THREAD_PREFIX.setValue(mapping, threadPrefix); - } - mapping.put("#basedir", stack.getExecutionContext().getBasedir()); + + String mapper = (String) mapping.get("descriptor"); + if ("concurrent_mapper".equals(mapper)) { + String threadPrefix = getThreadPrefix(stack); + ConcurrentMapper.PARAM_THREAD_PREFIX.setValue(mapping, threadPrefix); } + mapping.put("#basedir", stack.getExecutionContext().getBasedir()); + try { Type type; if (typename == null) { - throw new ExecutionException("vdl:new requires a type specification for value " - + value); + throw new ExecutionException + ("vdl:new requires a type specification for value: " + value); } else { type = Types.getType(typename); @@ -91,8 +93,9 @@ } else { if (!(value instanceof List)) { - throw new ExecutionException( - "An array variable can only be initialized with a list of values"); + throw new ExecutionException + ("An array variable can only be initialized " + + "with a list of values"); } int index = 0; Iterator i = ((List) value).iterator(); @@ -114,14 +117,12 @@ closeShallow(stack, handle); } - if (mapping != null) { - handle.init(mapping); - } + handle.init(mapping); } else if (value instanceof DSHandle) { handle = (DSHandle) value; } - else if (type != null) { + else { handle = new RootDataNode(type); handle.init(mapping); if (value != null) { @@ -129,11 +130,7 @@ closeShallow(stack, handle); } } - else { - // TODO when do we hit this case? - throw new ExecutionException("vdl:new requires a type specification for value " - + value); - } + logger.debug("NEW id="+handle.getIdentifier()); return handle; } @@ -141,5 +138,4 @@ throw new ExecutionException(e); } } - } Modified: trunk/src/org/griphyn/vdl/karajan/lib/PartialCloseDataset.java =================================================================== --- trunk/src/org/griphyn/vdl/karajan/lib/PartialCloseDataset.java 2011-06-23 22:02:18 UTC (rev 4679) +++ trunk/src/org/griphyn/vdl/karajan/lib/PartialCloseDataset.java 2011-06-23 22:22:13 UTC (rev 4680) @@ -15,27 +15,27 @@ public class PartialCloseDataset extends VDLFunction { public static final Logger logger = Logger.getLogger(CloseDataset.class); - public static final Arg OA_STATEMENTID = new Arg.Optional("closeID", null); + public static final Arg OA_CLOSE_ID = new Arg.Optional("closeID", null); static { - setArguments(PartialCloseDataset.class, new Arg[] { PA_VAR, OA_STATEMENTID }); + setArguments(PartialCloseDataset.class, new Arg[] { PA_VAR, OA_CLOSE_ID }); } /** Map from DSHandles (as keys) to lists of what we have seen already. TODO this may end up growing too much when a program - has lots of objects. consider alternative ways of doing this. */ - static Map pendingDatasets = new HashMap(); + has lots of objects. Consider alternative ways of doing this. */ + static Map> pendingDatasets = + new HashMap>(); - public Object function(VariableStack stack) throws ExecutionException { boolean hasUnseenToken = false; DSHandle var = (DSHandle) PA_VAR.getValue(stack); - String statementID = (String) OA_STATEMENTID.getValue(stack); + String closeID = (String) OA_CLOSE_ID.getValue(stack); if (logger.isDebugEnabled()) { logger.debug("Partially closing " + var + " hash: " + var.hashCode() + - " for statement " + statementID); + " for statement " + closeID); } if(var.isClosed()) { @@ -45,17 +45,17 @@ synchronized(pendingDatasets) { - List c = (List) pendingDatasets.get(var); - if(c==null) { - c=new ArrayList(); - pendingDatasets.put(var,c); + List c = pendingDatasets.get(var); + if (c == null) { + c = new ArrayList(); + pendingDatasets.put(var, c); } - c.add(statementID); - logger.debug("Adding token "+statementID+" with hash "+statementID.hashCode()); + c.add(closeID); + logger.debug("Adding token "+closeID+" with hash "+closeID.hashCode()); - String needToWaitFor = (String) var.getParam("waitfor"); - logger.debug("need to wait for "+needToWaitFor); + String needToWaitFor = var.getParam("waitfor"); + logger.debug("need to wait for " + needToWaitFor); StringTokenizer stok = new StringTokenizer(needToWaitFor, " "); while(stok.hasMoreTokens()) { String s = stok.nextToken(); @@ -65,16 +65,17 @@ // then we have a required element that we have not // seen yet, so... hasUnseenToken = true; - logger.debug("Container does not contain token "+s); + logger.debug("Container does not contain token " + s); } else { - logger.debug("Container does contain token "+s); + logger.debug("Container does contain token " + s); } } } logger.debug("hasUnseenToken = "+hasUnseenToken); if(!hasUnseenToken) { if(logger.isDebugEnabled()) { - logger.debug("All partial closes for " + var + " have happened. Closing fully."); + logger.debug("All partial closes for " + var + + " have happened. Closing fully."); } var.closeDeep(); pendingDatasets.remove(var); Modified: trunk/src/org/griphyn/vdl/mapping/AbstractDataNode.java =================================================================== --- trunk/src/org/griphyn/vdl/mapping/AbstractDataNode.java 2011-06-23 22:02:18 UTC (rev 4679) +++ trunk/src/org/griphyn/vdl/mapping/AbstractDataNode.java 2011-06-23 22:22:13 UTC (rev 4680) @@ -58,8 +58,7 @@ handles = new HashMap(); } - public void init(Map params) { - + public void init(Map params) { } public Type getType() { @@ -183,11 +182,11 @@ if (path.size() > 1) { return handle.getField(path.butFirst()); } - else { - return handle; - } + return handle; } catch (NoSuchFieldException e) { + logger.warn("could not find variable: " + field.getName() + + " " + path); throw new InvalidPathException(path, this); } } @@ -240,9 +239,7 @@ */ throw new RuntimeException("Can't set root data node!"); } - else { - ((AbstractDataNode) getParent()).setField(field.getName(), handle); - } + ((AbstractDataNode) getParent()).setField(field.getName(), handle); } protected void setField(String name, DSHandle handle) { @@ -258,16 +255,14 @@ if (closed) { throw new NoSuchFieldException(name); } - else { - handle = createDSHandle(name); - } + handle = createDSHandle(name); } return handle; } protected DSHandle getHandle(String name) { synchronized (handles) { - return (DSHandle) handles.get(name); + return handles.get(name); } } @@ -326,9 +321,7 @@ if (field.getType().isArray()) { return handles; } - else { - return value; - } + return value; } public Map getArrayValue() { Modified: trunk/src/org/griphyn/vdl/mapping/ArrayDataNode.java =================================================================== --- trunk/src/org/griphyn/vdl/mapping/ArrayDataNode.java 2011-06-23 22:02:18 UTC (rev 4679) +++ trunk/src/org/griphyn/vdl/mapping/ArrayDataNode.java 2011-06-23 22:22:13 UTC (rev 4680) @@ -19,7 +19,7 @@ if (!isClosed()) { throw new HandleOpenException(this); } - Map handles = getHandles(); + Map handles = getHandles(); synchronized (handles) { Iterator i = handles.entrySet().iterator(); while (i.hasNext()) { Modified: trunk/src/org/griphyn/vdl/mapping/DSHandle.java =================================================================== --- trunk/src/org/griphyn/vdl/mapping/DSHandle.java 2011-06-23 22:02:18 UTC (rev 4679) +++ trunk/src/org/griphyn/vdl/mapping/DSHandle.java 2011-06-23 22:22:13 UTC (rev 4680) @@ -30,7 +30,7 @@ */ public Type getType(); - public void init(Map params); + public void init(Map params); public DSHandle getRoot(); Modified: trunk/src/org/griphyn/vdl/mapping/MapperFactory.java =================================================================== --- trunk/src/org/griphyn/vdl/mapping/MapperFactory.java 2011-06-23 22:02:18 UTC (rev 4679) +++ trunk/src/org/griphyn/vdl/mapping/MapperFactory.java 2011-06-23 22:22:13 UTC (rev 4680) @@ -20,7 +20,8 @@ import org.griphyn.vdl.mapping.file.StructuredRegularExpressionMapper; public class MapperFactory { - private static Map mappers = new HashMap(); + private static Map> mappers = + new HashMap>(); static { @@ -42,13 +43,15 @@ registerMapper("ext", ExternalMapper.class); } - public synchronized static Mapper getMapper(String type, Map params) throws InvalidMapperException { - Class cls = (Class) mappers.get(type); + public synchronized static Mapper getMapper(String type, + Map params) + throws InvalidMapperException { + Class cls = mappers.get(type); if (cls == null) { throw new InvalidMapperException("no such mapper: "+type); } try { - Mapper mapper = (Mapper) cls.newInstance(); + Mapper mapper = cls.newInstance(); mapper.setParams(params); return mapper; } @@ -57,12 +60,14 @@ } } - public static void registerMapper(String type, String cls) throws ClassNotFoundException { - registerMapper(type, MapperFactory.class.getClassLoader().loadClass(cls)); + public static void registerMapper(String type, String cls) + throws ClassNotFoundException { + registerMapper(type, MapperFactory.class.getClassLoader().loadClass(cls)); } - public synchronized static void registerMapper(String type, Class cls) { - mappers.put(type, cls); + @SuppressWarnings("unchecked") + public synchronized static void registerMapper(String type, + Class cls) { + mappers.put(type, (Class) cls); } - } Modified: trunk/src/org/griphyn/vdl/mapping/RootArrayDataNode.java =================================================================== --- trunk/src/org/griphyn/vdl/mapping/RootArrayDataNode.java 2011-06-23 22:02:18 UTC (rev 4679) +++ trunk/src/org/griphyn/vdl/mapping/RootArrayDataNode.java 2011-06-23 22:22:13 UTC (rev 4680) @@ -3,15 +3,18 @@ import java.util.Iterator; import java.util.Map; +import org.apache.log4j.Logger; import org.griphyn.vdl.karajan.VDL2FutureException; import org.griphyn.vdl.type.Field; import org.griphyn.vdl.type.Type; public class RootArrayDataNode extends ArrayDataNode implements DSHandleListener { + Logger logger = Logger.getLogger(RootArrayDataNode.class); + private boolean initialized = false; private Mapper mapper; - private Map params; + private Map params; private DSHandle waitingMapperParam; /** @@ -22,7 +25,7 @@ getField().setType(type); } - public void init(Map params) { + public void init(Map params) { this.params = params; if (this.params == null) { initialized(); @@ -33,6 +36,7 @@ } private synchronized void innerInit() { + logger.debug("innerInit: " + this); Iterator i = params.entrySet().iterator(); while(i.hasNext()) { Map.Entry entry = (Map.Entry) i.next(); @@ -98,10 +102,8 @@ if (initialized) { return mapper; } - else { - assert(waitingMapperParam != null); - throw new VDL2FutureException(waitingMapperParam); - } + assert(waitingMapperParam != null); + throw new VDL2FutureException(waitingMapperParam); } public boolean isArray() { Modified: trunk/src/org/griphyn/vdl/mapping/RootDataNode.java =================================================================== --- trunk/src/org/griphyn/vdl/mapping/RootDataNode.java 2011-06-23 22:02:18 UTC (rev 4679) +++ trunk/src/org/griphyn/vdl/mapping/RootDataNode.java 2011-06-23 22:22:13 UTC (rev 4680) @@ -6,21 +6,25 @@ import java.util.Iterator; import java.util.Map; +import org.apache.log4j.Logger; import org.griphyn.vdl.karajan.VDL2FutureException; import org.griphyn.vdl.type.Field; import org.griphyn.vdl.type.Type; public class RootDataNode extends AbstractDataNode implements DSHandleListener { + static Logger logger = Logger.getLogger(RootDataNode.class); + private boolean initialized=false; private Mapper mapper; - private Map params; + private Map params; private DSHandle waitingMapperParam; public static DSHandle newNode(Type type, Object value) { DSHandle handle = new RootDataNode(type); handle.setValue(value); handle.closeShallow(); + logger.debug("newNode"); return handle; } @@ -29,7 +33,7 @@ getField().setType(type); } - public void init(Map params) { + public void init(Map params) { this.params = params; if(this.params == null) { initialized(); @@ -41,12 +45,11 @@ /** must have this.params set to the appropriate parameters before being called. */ private synchronized void innerInit() { - Iterator i = params.entrySet().iterator(); - while(i.hasNext()) { - Map.Entry entry = (Map.Entry) i.next(); - Object v = entry.getValue(); + logger.debug("innerInit: " + this); + for (Object v : params.values()) { if(v instanceof DSHandle && !((DSHandle) v).isClosed()) { - waitingMapperParam = (DSHandle) v; + logger.debug("addListener: " + this + " " + v); + waitingMapperParam = (DSHandle) v; waitingMapperParam.addListener(this); return; } @@ -67,7 +70,8 @@ checkInputs(); } catch (InvalidMapperException e) { - throw new RuntimeException("InvalidMapperException caught in mapper initialization", e); + throw new RuntimeException + ("InvalidMapperException caught in mapper initialization", e); } if (isClosed()) { notifyListeners(); @@ -123,19 +127,21 @@ } // Static mappers are (array) mappers which know the size of // an array statically. A good example is the fixed array mapper - Iterator i = mapper.existing().iterator(); - while (i.hasNext()) { - Path p = (Path) i.next(); + logger.debug("mapper: " + mapper); + for (Path p : mapper.existing()) { try { - // Try to get the path in order to check that the path is valid - we'll get an exception if not + // Try to get the path in order to check that the + // path is valid - we'll get an exception if not root.getField(p); if (logger.isInfoEnabled()) { logger.info("Found mapped data " + root + "." + p); } } catch (InvalidPathException e) { - throw new IllegalStateException("mapper.existing() returned a path " + p - + " that it cannot subsequently map"); + throw new IllegalStateException + ("mapper.existing() returned a path " + + " that it cannot subsequently map: " + + " root: " + root + " path: " + p); } } if (root.isArray()) { @@ -207,16 +213,12 @@ return null; } - - public Mapper getMapper() { if (initialized) { return mapper; - } - else { - assert (waitingMapperParam != null); - throw new VDL2FutureException(waitingMapperParam); } + assert (waitingMapperParam != null); + throw new VDL2FutureException(waitingMapperParam); } public boolean isArray() { Modified: trunk/src/org/griphyn/vdl/mapping/file/ArrayFileMapper.java =================================================================== --- trunk/src/org/griphyn/vdl/mapping/file/ArrayFileMapper.java 2011-06-23 22:02:18 UTC (rev 4679) +++ trunk/src/org/griphyn/vdl/mapping/file/ArrayFileMapper.java 2011-06-23 22:22:13 UTC (rev 4680) @@ -7,6 +7,7 @@ import java.util.Map; import java.util.Set; +import org.apache.log4j.Logger; import org.griphyn.vdl.mapping.AbsFile; import org.griphyn.vdl.mapping.AbstractMapper; import org.griphyn.vdl.mapping.DSHandle; @@ -16,6 +17,8 @@ import org.griphyn.vdl.mapping.PhysicalFormat; public class ArrayFileMapper extends AbstractMapper { + static Logger logger = Logger.getLogger(ArrayFileMapper.class); + public static final MappingParam PARAM_FILES = new MappingParam("files"); public Collection existing() { @@ -24,9 +27,9 @@ if (dn == null) { throw new RuntimeException("Missing 'files' mapper attribute"); } - Map m = dn.getArrayValue(); - Set s = m.keySet(); - Iterator i = s.iterator(); + Map m = dn.getArrayValue(); + Set s = m.keySet(); + Iterator i = s.iterator(); while(i.hasNext()) { String nextKey = i.next().toString(); l.add(Path.EMPTY_PATH.addLast(nextKey,true)); @@ -41,25 +44,28 @@ if (!path.isArrayIndex(0)) { throw new IllegalArgumentException("First element of path "+path.toString()+" must be an array index"); } - else { - // we could typecheck more elegantly here to make sure that - // we really do have an array of strings as parameter. - DSHandle dn = (DSHandle) PARAM_FILES.getRawValue(this); - assert(dn.isClosed()); - - DSHandle srcNode = null; - try { - srcNode = dn.getField(path); - } catch(InvalidPathException e) { - logger.error("Invalid path exception "+e+" for path "+path,e); - return null; - } - String returnValue = srcNode.getValue().toString(); - return new AbsFile(returnValue); - } + // we could typecheck more elegantly here to make sure that + // we really do have an array of strings as parameter. + DSHandle dn = (DSHandle) PARAM_FILES.getRawValue(this); + assert(dn.isClosed()); + logger.debug("dn: " + dn); + + DSHandle srcNode = null; + try { + srcNode = dn.getField(path); + } catch(InvalidPathException e) { + logger.error("Invalid path exception "+e+" for path "+path,e); + return null; + } + String returnValue = srcNode.getValue().toString(); + return new AbsFile(returnValue); } public boolean isStatic() { return true; } + + public String toString() { + return "ArrayFileMapper"; + } } From davidk at ci.uchicago.edu Thu Jun 23 18:14:22 2011 From: davidk at ci.uchicago.edu (davidk at ci.uchicago.edu) Date: Thu, 23 Jun 2011 18:14:22 -0500 (CDT) Subject: [Swift-commit] r4682 - in trunk: docs docs/userguide etc tests/documentation Message-ID: <20110623231422.837CE9CFF2@svn.ci.uchicago.edu> Author: davidk Date: 2011-06-23 18:14:21 -0500 (Thu, 23 Jun 2011) New Revision: 4682 Added: trunk/docs/userguide/cdm Removed: trunk/tests/documentation/swift.log Modified: trunk/docs/build_docs.sh trunk/docs/userguide/language trunk/docs/userguide/mappers trunk/docs/userguide/userguide.txt trunk/etc/coaster-service.conf Log: Fixed a few issues with the documentation build script with file permissions and better handling of symlinks Fixed an error in the userguide with the rotate example Added CDM documentation to the userguide Removed an unneeded option in coaster-service.conf Modified: trunk/docs/build_docs.sh =================================================================== --- trunk/docs/build_docs.sh 2011-06-23 23:03:18 UTC (rev 4681) +++ trunk/docs/build_docs.sh 2011-06-23 23:14:21 UTC (rev 4682) @@ -9,7 +9,9 @@ } # Change file permissions to values set below -CHMOD_VALUE="664" +CHMOD_DIRECTORY_MODE="775" +CHMOD_FILE_MODE="664" +GROUP="vdl2-svn" # Verify correct arguments if [ -n "$1" ]; then @@ -21,6 +23,8 @@ # Create installation directory if needed if [ ! -d "$INSTALLATION_DIRECTORY" ]; then mkdir $INSTALLATION_DIRECTORY || crash "Unable to create directory $INSTALLATION_DIRECTORY" + chgrp $GROUP $INSTALLATION_DIRECTORY > /dev/null 2>&1 + chmod $CHMOD_DIRECTORY_MODE $INSTALLATION_DIRECTORY > /dev/null 2>&1 fi # Gather version information @@ -53,12 +57,16 @@ fi # Copy all files to destination (may include graphics, etc) - for copyfile in `ls * 2>/dev/null` + for copyfile in `find -L . -type f 2>/dev/null |grep -v .svn` do - cp $copyfile $INSTALLATION_DIRECTORY/$VERSION/$directory || crash "Unable to copy $copyfile to $INSTALLATION_DIRECTORY/$VERSION/$directory" - chmod $CHMOD_VALUE $INSTALLATION_DIRECTORY/$VERSION/$directory/$copyfile > /dev/null 2>&1 + DN=`dirname $copyfile` + mkdir -p $INSTALLATION_DIRECTORY/$VERSION/$directory/$DN > /dev/null 2>&1 + cp $copyfile $INSTALLATION_DIRECTORY/$VERSION/$directory/$DN || crash "Unable to copy $copyfile to $INSTALLATION_DIRECTORY/$VERSION/$directory" done popd > /dev/null 2>&1 done popd > /dev/null 2>&1 + +find $INSTALLATION_DIRECTORY/$VERSION -type f -exec chgrp $GROUP {} \; -exec chmod $CHMOD_FILE_MODE {} \; > /dev/null 2>&1 +find $INSTALLATION_DIRECTORY/$VERSION -type d -exec chgrp $GROUP {} \; -exec chmod $CHMOD_DIRECTORY_MODE {} \; > /dev/null 2>&1 Added: trunk/docs/userguide/cdm =================================================================== --- trunk/docs/userguide/cdm (rev 0) +++ trunk/docs/userguide/cdm 2011-06-23 23:14:21 UTC (rev 4682) @@ -0,0 +1,203 @@ +Collective Data Management +-------------------------- + +Overview +~~~~~~~~ +. The user specifies a CDM policy in a file, customarily fs.data. +. fs.data is given to Swift on the command line. +. The Swift data module (org.globus.swift.data) is informed of the CDM policy. +. At job launch time, the VDL Karajan code queries the CDM policy, + .. altering the file staging phase, and + .. sending fs.data to the compute site. +. At job run time, the Swift wrapper script + .. consults a Perl script to obtain policy, and + .. uses wrapper extensions to modify data movement. +. Similarly, stage out can be changed. + + +.Command line +----- +$ swift -sites.file sites.xml -tc.file tc.data -cdm.file fs.data stream.swift +----- + +CDM policy file format +~~~~~~~~~~~~~~~~~~~~~~ +.Example +----- +# Describe CDM for my job +property GATHER_LIMIT 1 +rule .*input.txt DIRECT /gpfs/homes/wozniak/data +rule .*xfile*.data BROADCAST /dev/shm +rule .* DEFAULT +----- + +The lines contain: + +. A directive, either rule or property +. A rule has: + .. A regular expression + .. A policy token + .. Additional policy-specific arguments +. A property has + .. A policy property token + .. The token value +. Comments with # . +. Blank lines are ignored. + + +.Notes + +. The policy file is used as a lookup database by Swift and Perl methods. +. For example, a lookup with the database above given the argument input.txt would result in the Direct policy. +. If the lookup does not succeed, the result is DEFAULT. + . Policies are listed as subclasses of org.globus.swift.data.policy.Policy . + + +Policy Descriptions +~~~~~~~~~~~~~~~~~~~ +.Default + +* Just use file staging as provided by Swift/CoG. Identical to behavior if no CDM file is given. + + +.Broadcast +----- +rule .*xfile*.data BROADCAST /dev/shm +----- +* The input files matching the pattern will be stored in the given directory, an LFS location, with links in the job directory. +* On the BG/P, this will make use of the f2cn tool. +* On machines not implementing an efficient broadcast, we will just ensure correctness. For example, on a workstation, the location could be in a /tmp RAM FS. + + +.Direct +----- +rule .*input.txt DIRECT /gpfs/scratch/wozniak/ +----- +* Allows for direct I/O to the parallel FS without staging. +* The input files matching the pattern must already exist in the given directory, a GFS location. Links will be placed in the job directory. +* The output files matching the pattern will be stored in the given directory, with links in the job directory. +* Example: In the rule above, the Swift-generated file name ./data/input.txt would be accessed by the user job in /gpfs/homes/wozniak/data/input.txt . + + +.Local +----- +rule .*input.txt LOCAL dd /gpfs/homes/wozniak/data obs=64K +----- +* Allows for client-directed input copy to the compute node. +* The user may specify cp or dd as the input transfer program. +* The input files matching the pattern must already exist in the given directory, a GFS location. Copies will be placed in the job directory. +* Argument list: [tool] [GFS directory] [tool arguments]* + + +.Gather +----- +property GATHER_LIMIT 500000000 # 500 MB +property GATHER_DIR /dev/shm/gather +property GATHER_TARGET /gpfs/wozniak/data/gather_target +rule .*.output.txt GATHER +----- + +* The output files matching the pattern will be present to tasks in the job directory as usual but noted in a _swiftwrap shell array GATHER_OUTPUT. +* The GATHER_OUTPUT files will be cached in the GATHER_DIR, an LFS location. +* The cache will be flushed when a job ends if a du on GATHER_DIR exceeds GATHER_LIMIT. +* As the cache fills or on stage out, the files will be bundled into randomly named tarballs in GATHER_TARGET, a GFS location. +* If the compute node is an SMP, GATHER_DIR is a shared resource. It is protected by the link file GATHER_DIR/.cdm.lock . +* Unpacking the tarballs in GATHER_TARGET will produce the user-specified filenames. + +.Summary + +. Files created by application +. Acquire lock +. Move files to cache +. Check cache size +. If limit exceeded, move all cache files to outbox +. Release lock +. If limit was exceeded, stream outbox as tarball to target + +.Notes + +* Gather required quite a bit of shell functionality to manage the lock, etc. This is placed in cdm_lib.sh . +* vdl_int.k needed an additional task submission (cdm_cleanup.sh) to perform the final flush at workflow completion time . This task also uses cdm_lib.sh . + + +VDL/Karajan processing +~~~~~~~~~~~~~~~~~~~~~~ +. CDM functions are available in Karajan via the cdm namespace. +. These functions are defined in org.globus.swift.data.Query . +. If CDM is enabled, VDL skips file staging for files unless the policy is DEFAULT. + + +Swift wrapper CDM routines +~~~~~~~~~~~~~~~~~~~~~~~~~~ +. The cdm.pl script is shipped to the compute node if CDM is enabled. +. When linking in inputs, CDM is consulted by _swiftwrap:cdm_lookup(). +. The cdm_action() shell function handles CDM methods, typically just producing a link. + + +Test cases +~~~~~~~~~~ + +. Simple test cases are in: + https://svn.mcs.anl.gov/repos/wozniak/collab/cdm/scripts/cdm-direct and + https://svn.mcs.anl.gov/repos/wozniak/collab/cdm/scripts/all-pairs +. Do a: + mkdir cdm + cd cdm + svn co https://svn.mcs.anl.gov/repos/wozniak/collab/cdm/scripts +. In cdm-direct, run: + source ./setup.sh local local local +. Run workflow: + swift -sites.file sites.xml -tc.file tc.data -cdm.file fs.data stream.swift +. Note that staging is skipped for input.txt + policy: file://localhost/input.txt : DIRECT + FILE_STAGE_IN_START file=input.txt ... + FILE_STAGE_IN_SKIP file=input.txt policy=DIRECT + FILE_STAGE_IN_END file=input.txt ... +. In the wrapper output, the input file is handled by CDM functionality: + Progress 2010-01-21 13:50:32.466572727-0600 LINK_INPUTS + CDM_POLICY: DIRECT /homes/wozniak/cdm/scripts/cdm-direct + CDM: jobs/t/cp_sh-tkul4nmj input.txt DIRECT /homes/wozniak/cdm/scripts/cdm-direct + CDM[DIRECT]: Linking jobs/t/cp_sh-tkul4nmj/input.txt to /homes/wozniak/cdm/scripts/cdm-direct/input.txt + Progress 2010-01-21 13:50:32.486016708-0600 EXECUTE +. all-pairs is quite similar but uses more policies. + + +PTMap case +^^^^^^^^^^ +. Start with vanilla PTMap: + .. cd cdm + .. mkdir apps + .. cd apps + .. https://svn.mcs.anl.gov/repos/wozniak/collab/cdm/apps/ptmap +. Source setup.sh +. Use start.sh, which + .. applies CDM policy from fs.local.data + + +CDM site-aware policy file format +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Example + +----- +#Describe CDM for my job +#Use DIRECT and BROADCAST if on cluster1, else use DEFAULT behavior +property GATHER_LIMIT 1 +rule cluster1 .*input.txt DIRECT /gpfs/homes/wozniak/data +rule cluster1 .*xfile*.data BROADCAST /dev/shm +rule ANYWHERE .* DEFAULT +----- + +The lines contain: + +. A directive, either rule or property +. A rule has: + .. A regular expression for site matchin + .. A regular expression for filename matching + .. A policy token + .. Additional policy-specific arguments +. A property has + .. A policy property token + .. The token value +. Comments with # . +. Blank lines are ignored. Modified: trunk/docs/userguide/language =================================================================== --- trunk/docs/userguide/language 2011-06-23 23:03:18 UTC (rev 4681) +++ trunk/docs/userguide/language 2011-06-23 23:14:21 UTC (rev 4682) @@ -128,7 +128,7 @@ ---- foreach f,ix in frames { - output[ix] = rotate(frames, 180); + output[ix] = rotate(f, 180); ---- Sequential iteration can be expressed using the iterate construct: Modified: trunk/docs/userguide/mappers =================================================================== --- trunk/docs/userguide/mappers 2011-06-23 23:03:18 UTC (rev 4681) +++ trunk/docs/userguide/mappers 2011-06-23 23:14:21 UTC (rev 4682) @@ -392,7 +392,7 @@ |location|A directory that the files are located. |prefix|The prefix of the files |suffix|The suffix of the files, for instance: ".txt" -|pattern|A UNIX glob style pattern, for instance: "*foo*" would match +|pattern|A UNIX glob style pattern, for instance: "\*foo*" would match all file names that contain foo. When this mapper is used to specify output filenames, pattern is ignored. |==================== @@ -500,7 +500,7 @@ |location|A directory that the files are located. |prefix|The prefix of the files |suffix|The suffix of the files, for instance: ".txt" -pattern A UNIX glob style pattern, for instance: "*foo*" would match +pattern A UNIX glob style pattern, for instance: "\*foo*" would match all file names that contain foo. When this mapper is used to specify output filenames, pattern is ignored. |================= @@ -531,7 +531,7 @@ |location|The directory where the files are located. |prefix|The prefix of the files |suffix|The suffix of the files, for instance: ".txt" -|pattern|A UNIX glob style pattern, for instance: "*foo*" would match +|pattern|A UNIX glob style pattern, for instance: "\*foo*" would match all file names that contain foo. |====================== Modified: trunk/docs/userguide/userguide.txt =================================================================== --- trunk/docs/userguide/userguide.txt 2011-06-23 23:03:18 UTC (rev 4681) +++ trunk/docs/userguide/userguide.txt 2011-06-23 23:14:21 UTC (rev 4682) @@ -35,3 +35,5 @@ include::coasters[] include::howto_tips[] + +include::cdm[] Modified: trunk/etc/coaster-service.conf =================================================================== --- trunk/etc/coaster-service.conf 2011-06-23 23:03:18 UTC (rev 4681) +++ trunk/etc/coaster-service.conf 2011-06-23 23:14:21 UTC (rev 4682) @@ -10,9 +10,6 @@ # How to launch workers: local, ssh, cobalt, or futuregrid export WORKER_MODE=ssh -# Worker logging setting passed to worker.pl for sites.xml -export WORKER_LOGGING=INFO - # SSH hosts to start workers on (ssh mode only) export WORKER_HOSTS="host1 host2 host3" Deleted: trunk/tests/documentation/swift.log =================================================================== --- trunk/tests/documentation/swift.log 2011-06-23 23:03:18 UTC (rev 4681) +++ trunk/tests/documentation/swift.log 2011-06-23 23:14:21 UTC (rev 4682) @@ -1,6 +0,0 @@ -2011-06-17 10:34:26,338-0500 DEBUG Loader Loader started -2011-06-17 10:35:47,746-0500 DEBUG Loader Loader started -2011-06-17 10:47:09,057-0500 DEBUG Loader Loader started -2011-06-17 10:47:30,938-0500 DEBUG Loader Loader started -2011-06-17 10:48:45,486-0500 DEBUG Loader Loader started -2011-06-17 11:12:05,375-0500 DEBUG Loader Loader started From jonmon at ci.uchicago.edu Thu Jun 23 19:16:01 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Thu, 23 Jun 2011 19:16:01 -0500 (CDT) Subject: [Swift-commit] r4683 - usertools/plotter/src/plotter Message-ID: <20110624001601.3CC309CFEC@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-23 19:16:01 -0500 (Thu, 23 Jun 2011) New Revision: 4683 Modified: usertools/plotter/src/plotter/Dual.java usertools/plotter/src/plotter/Lines.java Log: o removed argument count error checking as that is done in the Plotter class o gave the instances of GetOpt an actual name instead of just testprog Modified: usertools/plotter/src/plotter/Dual.java =================================================================== --- usertools/plotter/src/plotter/Dual.java 2011-06-23 23:14:21 UTC (rev 4682) +++ usertools/plotter/src/plotter/Dual.java 2011-06-24 00:16:01 UTC (rev 4683) @@ -54,7 +54,7 @@ // Settings: boolean verbose = false; - Getopt g = new Getopt("testprog", args, "v"); + Getopt g = new Getopt("Dual", args, "v"); int c = -1; while ((c = g.getopt()) != -1) { @@ -65,13 +65,6 @@ } } - if (args.length < 3) - { - System.err.println - ("usage: [] *"); - System.exit(2); - } - Bits.init(); Util.verbose(verbose); Modified: usertools/plotter/src/plotter/Lines.java =================================================================== --- usertools/plotter/src/plotter/Lines.java 2011-06-23 23:14:21 UTC (rev 4682) +++ usertools/plotter/src/plotter/Lines.java 2011-06-24 00:16:01 UTC (rev 4683) @@ -54,7 +54,7 @@ // Settings: boolean verbose = false; - Getopt g = new Getopt("testprog", args, "v"); + Getopt g = new Getopt("Lines", args, "v"); int c = -1; while ((c = g.getopt()) != -1) { @@ -65,13 +65,6 @@ } } - if (args.length < 3) - { - System.err.println - ("usage: [] *"); - System.exit(2); - } - Bits.init(); Util.verbose(verbose); From jonmon at ci.uchicago.edu Thu Jun 23 19:16:34 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Thu, 23 Jun 2011 19:16:34 -0500 (CDT) Subject: [Swift-commit] r4684 - usertools/plotter/src/plotter Message-ID: <20110624001634.DF2159CFEC@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-23 19:16:34 -0500 (Thu, 23 Jun 2011) New Revision: 4684 Modified: usertools/plotter/src/plotter/Plotter.java Log: o added comment about commandline error checking Modified: usertools/plotter/src/plotter/Plotter.java =================================================================== --- usertools/plotter/src/plotter/Plotter.java 2011-06-24 00:16:01 UTC (rev 4683) +++ usertools/plotter/src/plotter/Plotter.java 2011-06-24 00:16:34 UTC (rev 4684) @@ -8,6 +8,10 @@ { public static void main(String[] args) { + /* + * Fix this check: Need to check to see if the specify one of the types of plots first + * then check to see if the argument counts is correct. + */ if (args.length < 4 ) { usage(); From jonmon at ci.uchicago.edu Thu Jun 23 19:16:58 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Thu, 23 Jun 2011 19:16:58 -0500 (CDT) Subject: [Swift-commit] r4685 - usertools/plotter Message-ID: <20110624001658.6A0559CFEC@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-23 19:16:58 -0500 (Thu, 23 Jun 2011) New Revision: 4685 Modified: usertools/plotter/build.xml Log: o whitespace changes Modified: usertools/plotter/build.xml =================================================================== --- usertools/plotter/build.xml 2011-06-24 00:16:34 UTC (rev 4684) +++ usertools/plotter/build.xml 2011-06-24 00:16:58 UTC (rev 4685) @@ -1,5 +1,5 @@ + default="jar"> - From jonmon at ci.uchicago.edu Thu Jun 23 19:39:18 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Thu, 23 Jun 2011 19:39:18 -0500 (CDT) Subject: [Swift-commit] r4686 - usertools/plotter/src/plotter Message-ID: <20110624003918.9D4DD9CFEC@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-23 19:39:18 -0500 (Thu, 23 Jun 2011) New Revision: 4686 Modified: usertools/plotter/src/plotter/Plotter.java Log: o switched to using the gnu.getopt.Getopt class to choose between plot types. Modified: usertools/plotter/src/plotter/Plotter.java =================================================================== --- usertools/plotter/src/plotter/Plotter.java 2011-06-24 00:16:58 UTC (rev 4685) +++ usertools/plotter/src/plotter/Plotter.java 2011-06-24 00:39:18 UTC (rev 4686) @@ -4,10 +4,13 @@ import plotter.Lines; import plotter.Dual; +import gnu.getopt.Getopt; + public class Plotter { public static void main(String[] args) { + Getopt plot = new Getopt( "Plotter", args, "sdh"); /* * Fix this check: Need to check to see if the specify one of the types of plots first * then check to see if the argument counts is correct. @@ -23,24 +26,28 @@ { tmp[i] = args[i+1]; } - - /* If asking for a single labeled Y-axis */ - if (args[0].equalsIgnoreCase( "-s" )) + switch( plot.getopt() ) { - Lines l = new Lines(); - l.plotter(tmp); + /* If asking for a single labeled Y-axis */ + case 's': + { + Lines l = new Lines(); + l.plotter( tmp ); + break; + } + /* If asking for a dual labeled Y-axis */ + case 'd': + { + Dual d = new Dual(); + d.plotter( tmp ); + break; + } + /* Do not understand option for what graph */ + default: + { + usage(); + } } - /* If asking for a dual labeled Y-axis */ - else if (args[0].equalsIgnoreCase( "-d" )) - { - Dual d = new Dual(); - d.plotter(tmp); - } - /* Do not understand option for what graph */ - else - { - usage(); - } } public static void usage() From ketan at ci.uchicago.edu Thu Jun 23 20:35:00 2011 From: ketan at ci.uchicago.edu (ketan at ci.uchicago.edu) Date: Thu, 23 Jun 2011 20:35:00 -0500 (CDT) Subject: [Swift-commit] r4687 - trunk/docs/userguide Message-ID: <20110624013500.5C1109CFEC@svn.ci.uchicago.edu> Author: ketan Date: 2011-06-23 20:35:00 -0500 (Thu, 23 Jun 2011) New Revision: 4687 Modified: trunk/docs/userguide/mappers Log: typo Modified: trunk/docs/userguide/mappers =================================================================== --- trunk/docs/userguide/mappers 2011-06-24 00:39:18 UTC (rev 4686) +++ trunk/docs/userguide/mappers 2011-06-24 01:35:00 UTC (rev 4687) @@ -821,5 +821,5 @@ |stus[1][0]|output/bbb_000.dat |stus[1][1]|output/bbb_001.dat |...|... -|stus[3][10]|output/ddd_009.dat +|stus[3][9]|output/ddd_009.dat |=========== From ketan at ci.uchicago.edu Thu Jun 23 20:50:53 2011 From: ketan at ci.uchicago.edu (ketan at ci.uchicago.edu) Date: Thu, 23 Jun 2011 20:50:53 -0500 (CDT) Subject: [Swift-commit] r4688 - trunk/docs/tutorial Message-ID: <20110624015053.A8CA09CFEC@svn.ci.uchicago.edu> Author: ketan Date: 2011-06-23 20:50:53 -0500 (Thu, 23 Jun 2011) New Revision: 4688 Modified: trunk/docs/tutorial/runtime_features Log: typo Modified: trunk/docs/tutorial/runtime_features =================================================================== --- trunk/docs/tutorial/runtime_features 2011-06-24 01:35:00 UTC (rev 4687) +++ trunk/docs/tutorial/runtime_features 2011-06-24 01:50:53 UTC (rev 4688) @@ -24,9 +24,9 @@ which you ran swift). We can also make our computations run on a remote resource. -WARNING: This example is necessarily more vague than previous examples, -because its requires access to remote resources. You should ensure that -you can submit a job using the globus-job-run (or globusrun-ws?) +WARNING: This example is necessarily more vague than previous ones, +because it requires access to remote resources. You should ensure that +you can submit a job using the globus-job-run (or globusrun-ws) command(s). We do not need to modify any SwiftScript code to run on another From ketan at ci.uchicago.edu Fri Jun 24 13:51:26 2011 From: ketan at ci.uchicago.edu (ketan at ci.uchicago.edu) Date: Fri, 24 Jun 2011 13:51:26 -0500 (CDT) Subject: [Swift-commit] r4689 - trunk/docs/cookbook Message-ID: <20110624185126.6BF829CFED@svn.ci.uchicago.edu> Author: ketan Date: 2011-06-24 13:51:26 -0500 (Fri, 24 Jun 2011) New Revision: 4689 Modified: trunk/docs/cookbook/overview Log: Added under-construction warning to cookbook Modified: trunk/docs/cookbook/overview =================================================================== --- trunk/docs/cookbook/overview 2011-06-24 01:50:53 UTC (rev 4688) +++ trunk/docs/cookbook/overview 2011-06-24 18:51:26 UTC (rev 4689) @@ -6,3 +6,6 @@ Swift runtime system. For introductory material, consult the Swift tutorial found link:http://www.ci.uchicago.edu/swift/guides/tutorial.php[here]. + +WARNING: Please be warned that the cookbook is under construction and most recipes are not tested rigorously. You are advised to use them at your own risk. + From ketan at ci.uchicago.edu Fri Jun 24 15:02:46 2011 From: ketan at ci.uchicago.edu (ketan at ci.uchicago.edu) Date: Fri, 24 Jun 2011 15:02:46 -0500 (CDT) Subject: [Swift-commit] r4691 - trunk/docs/cookbook Message-ID: <20110624200246.8398D9CFED@svn.ci.uchicago.edu> Author: ketan Date: 2011-06-24 15:02:46 -0500 (Fri, 24 Jun 2011) New Revision: 4691 Modified: trunk/docs/cookbook/diverse_infrastructures Log: small fix Modified: trunk/docs/cookbook/diverse_infrastructures =================================================================== --- trunk/docs/cookbook/diverse_infrastructures 2011-06-24 19:16:50 UTC (rev 4690) +++ trunk/docs/cookbook/diverse_infrastructures 2011-06-24 20:02:46 UTC (rev 4691) @@ -21,7 +21,7 @@ *step 4.* In the sites file: +sites.xml+ make the following two changes: - 1. change the path of the +$$$$+ element to your preferred location (say to +/lustre/beagle//swift-lab/swift.workdir+), and + 1. change the path of the +$$$$+ element to your preferred location (this location is *required* to be on /lustre, say to +/lustre/beagle//swift-lab/swift.workdir+), and 2. Change the project name to your project (for instance, +CI-CCR000013+) . The workdirectory will contain execution data related to each run, e.g. wrapper scripts, system information, inputs and outputs. From ketan at ci.uchicago.edu Fri Jun 24 17:22:59 2011 From: ketan at ci.uchicago.edu (ketan at ci.uchicago.edu) Date: Fri, 24 Jun 2011 17:22:59 -0500 (CDT) Subject: [Swift-commit] r4693 - www/docs Message-ID: <20110624222259.ACB659CFED@svn.ci.uchicago.edu> Author: ketan Date: 2011-06-24 17:22:59 -0500 (Fri, 24 Jun 2011) New Revision: 4693 Modified: www/docs/index.php Log: Modified: www/docs/index.php =================================================================== --- www/docs/index.php 2011-06-24 20:41:35 UTC (rev 4692) +++ www/docs/index.php 2011-06-24 22:22:59 UTC (rev 4693) @@ -77,14 +77,14 @@ information on swift. It is assumed that the reader is already familiar with the material in the Quickstart and Tutorial documents.

    -
  • historical (0.91) - [multi-page html] +
  • trunk + [html] [pdf]
  • latest (0.92) [multi-page html]
  • -
  • trunk - [html] [pdf] +
  • historical (0.91) + [multi-page html]
  • @@ -119,7 +119,6 @@
    • SwiftScript Language Reference - latest work in progress [html] [pdf]
    • SwiftScript Language Reference v 0.6 [html] [pdf]
    • -
    • SwiftScript Language Reference v 0.5 [doc]

    From ketan at ci.uchicago.edu Fri Jun 24 17:57:43 2011 From: ketan at ci.uchicago.edu (ketan at ci.uchicago.edu) Date: Fri, 24 Jun 2011 17:57:43 -0500 (CDT) Subject: [Swift-commit] r4694 - trunk/docs/cookbook Message-ID: <20110624225743.BDDCD9CCBF@svn.ci.uchicago.edu> Author: ketan Date: 2011-06-24 17:57:43 -0500 (Fri, 24 Jun 2011) New Revision: 4694 Modified: trunk/docs/cookbook/diverse_infrastructures Log: minor formatting Modified: trunk/docs/cookbook/diverse_infrastructures =================================================================== --- trunk/docs/cookbook/diverse_infrastructures 2011-06-24 22:22:59 UTC (rev 4693) +++ trunk/docs/cookbook/diverse_infrastructures 2011-06-24 22:57:43 UTC (rev 4694) @@ -26,21 +26,21 @@ 2. Change the project name to your project (for instance, +CI-CCR000013+) . The workdirectory will contain execution data related to each run, e.g. wrapper scripts, system information, inputs and outputs. - *step 5.* Run the example using following commandline (also found in run.sh): +*step 5.* Run the example using following commandline (also found in run.sh): - ---- - $ swift -config cf -tc.file tc -sites.file sites.xml catsn.swift -n=1 - ---- +---- +$ swift -config cf -tc.file tc -sites.file sites.xml catsn.swift -n=1 +---- - You can further change the value of +-n+ to any arbitrary number to run that - many number of concurrent +cat+ +You can further change the value of +-n+ to any arbitrary number to run that +many number of concurrent +cat+ - *step 6.* Check the output in the generated +outdir+ directory (+ls outdir+) +*step 6.* Check the output in the generated +outdir+ directory (+ls outdir+) - Note: Running from sandbox node or requesting 1 hour walltime for upto 3 nodes - will get fast prioritized execution. Good for small tests - Swift supports a coasters based computing environment for Beagle. A detailed version of Swift documentation is maintained - http://www.ci.uchicago.edu/swift/docs/index.php[here]. +Note: Running from sandbox node or requesting 1 hour walltime for upto 3 nodes +will get fast prioritized execution. Good for small tests +Swift supports a coasters based computing environment for Beagle. A detailed version of Swift documentation is maintained +http://www.ci.uchicago.edu/swift/docs/index.php[here]. // //Intrepid-BG/P From wozniak at ci.uchicago.edu Mon Jun 27 10:33:59 2011 From: wozniak at ci.uchicago.edu (wozniak at ci.uchicago.edu) Date: Mon, 27 Jun 2011 10:33:59 -0500 (CDT) Subject: [Swift-commit] r4695 - www Message-ID: <20110627153359.682519CCF9@svn.ci.uchicago.edu> Author: wozniak Date: 2011-06-27 10:33:59 -0500 (Mon, 27 Jun 2011) New Revision: 4695 Modified: www/update.sh Log: Note that we are phasing out this script Modified: www/update.sh =================================================================== --- www/update.sh 2011-06-24 22:57:43 UTC (rev 4694) +++ www/update.sh 2011-06-27 15:33:59 UTC (rev 4695) @@ -1,5 +1,9 @@ #!/bin/sh +# OBSOLETE: DO NOT RUN THIS +# See swift/docs/build_docs.sh for docs management +# Do a simple svn update to update the plain HTML + # Run this script from /ci/www/projects/swift crash() @@ -32,7 +36,7 @@ return 0 } -# Ensure tools are group-usable: +# Ensure tools are group-usable: chmod g+rw $0 chmod g+rw updatenodocs.sh From achavez at ci.uchicago.edu Tue Jun 14 09:02:16 2011 From: achavez at ci.uchicago.edu (achavez at ci.uchicago.edu) Date: Tue, 14 Jun 2011 09:02:16 -0500 (CDT) Subject: [Swift-commit] r4613 - in trunk/tests/language-behaviour: . IO arithmetic arrays foreach mappers Message-ID: <20110614140216.98CD99CCA5@svn.ci.uchicago.edu> Author: achavez Date: 2011-06-14 09:02:14 -0500 (Tue, 14 Jun 2011) New Revision: 4613 Added: trunk/tests/language-behaviour/IO/ trunk/tests/language-behaviour/IO/001-echo.out.expected trunk/tests/language-behaviour/IO/001-echo.swift trunk/tests/language-behaviour/IO/0011-echo-20110603-1140-rr21aum3.log trunk/tests/language-behaviour/IO/0011-echo.kml trunk/tests/language-behaviour/IO/0011-echo.out trunk/tests/language-behaviour/IO/0011-echo.out.expected trunk/tests/language-behaviour/IO/0011-echo.swift trunk/tests/language-behaviour/IO/0011-echo.xml trunk/tests/language-behaviour/IO/0012-echo-map-20110603-1140-n9omdlcb.log trunk/tests/language-behaviour/IO/0012-echo-map.kml trunk/tests/language-behaviour/IO/0012-echo-map.out.expected trunk/tests/language-behaviour/IO/0012-echo-map.swift trunk/tests/language-behaviour/IO/0012-echo-map.xml trunk/tests/language-behaviour/IO/readData.circle.in trunk/tests/language-behaviour/IO/readData.circle.out.expected trunk/tests/language-behaviour/IO/readData.circleArray.in trunk/tests/language-behaviour/IO/readData.circleArray.out.expected trunk/tests/language-behaviour/IO/readData.float.out.expected trunk/tests/language-behaviour/IO/readData.int.in trunk/tests/language-behaviour/IO/readData.int.out.expected trunk/tests/language-behaviour/IO/readData.intArray.in trunk/tests/language-behaviour/IO/readData.intArray.out.expected trunk/tests/language-behaviour/IO/readData.stringArray.in trunk/tests/language-behaviour/IO/readData.stringArray.out.expected trunk/tests/language-behaviour/IO/readData.swift trunk/tests/language-behaviour/IO/readData2.in trunk/tests/language-behaviour/IO/readData2.out.expected trunk/tests/language-behaviour/IO/readData2.swift trunk/tests/language-behaviour/IO/writeDataPrimitive.out.expected trunk/tests/language-behaviour/IO/writeDataPrimitive.swift trunk/tests/language-behaviour/IO/writeDataStringArray.swift trunk/tests/language-behaviour/IO/writeDataStringArray2.out.expected trunk/tests/language-behaviour/IO/writeDataStringArray2.swift trunk/tests/language-behaviour/IO/writeDataStruct.out.expected trunk/tests/language-behaviour/IO/writeDataStruct.swift trunk/tests/language-behaviour/IO/writeDataStructArray2.out.expected trunk/tests/language-behaviour/IO/writeDataStructArray2.swift trunk/tests/language-behaviour/arithmetic/ trunk/tests/language-behaviour/arithmetic/006-add.out.expected trunk/tests/language-behaviour/arithmetic/006-add.swift trunk/tests/language-behaviour/arithmetic/007-add-in-proc-add.out.expected trunk/tests/language-behaviour/arithmetic/007-add-in-proc-add.swift trunk/tests/language-behaviour/arithmetic/008-add-multiply.out.expected trunk/tests/language-behaviour/arithmetic/008-add-multiply.swift trunk/tests/language-behaviour/arithmetic/009-multiply.out.expected trunk/tests/language-behaviour/arithmetic/009-multiply.swift trunk/tests/language-behaviour/arithmetic/010-divide.out.expected trunk/tests/language-behaviour/arithmetic/010-divide.swift trunk/tests/language-behaviour/arithmetic/011-divide-float.out.expected trunk/tests/language-behaviour/arithmetic/011-divide-float.swift trunk/tests/language-behaviour/arithmetic/013-mod.out.expected trunk/tests/language-behaviour/arithmetic/013-mod.swift trunk/tests/language-behaviour/arithmetic/014-subtract.out.expected trunk/tests/language-behaviour/arithmetic/014-subtract.swift trunk/tests/language-behaviour/arithmetic/0145-unary-subtact.out.expected trunk/tests/language-behaviour/arithmetic/0145-unary-subtact.swift trunk/tests/language-behaviour/arithmetic/015-lesseq.out.expected trunk/tests/language-behaviour/arithmetic/015-lesseq.swift trunk/tests/language-behaviour/arithmetic/016-greatereq.out.expected trunk/tests/language-behaviour/arithmetic/016-greatereq.swift trunk/tests/language-behaviour/arithmetic/017-greater.out.expected trunk/tests/language-behaviour/arithmetic/017-greater.swift trunk/tests/language-behaviour/arithmetic/018-less.out.expected trunk/tests/language-behaviour/arithmetic/018-less.swift trunk/tests/language-behaviour/arithmetic/019-equals.out.expected trunk/tests/language-behaviour/arithmetic/019-equals.swift trunk/tests/language-behaviour/arithmetic/0191-not-equals.out.expected trunk/tests/language-behaviour/arithmetic/0191-not-equals.swift trunk/tests/language-behaviour/arrays/ trunk/tests/language-behaviour/arrays/020-array.out.expected trunk/tests/language-behaviour/arrays/020-array.swift trunk/tests/language-behaviour/arrays/021-array-in-proc-param.out.expected trunk/tests/language-behaviour/arrays/021-array-in-proc-param.swift trunk/tests/language-behaviour/arrays/022-array-with-exprs.out.expected trunk/tests/language-behaviour/arrays/022-array-with-exprs.swift trunk/tests/language-behaviour/arrays/025-array-passing.out.expected trunk/tests/language-behaviour/arrays/025-array-passing.swift trunk/tests/language-behaviour/arrays/027-array-assignment.out.expected trunk/tests/language-behaviour/arrays/027-array-assignment.swift trunk/tests/language-behaviour/arrays/028-array-assignment.swift trunk/tests/language-behaviour/arrays/029-array-assignment-sequence.swift trunk/tests/language-behaviour/arrays/083-array-assign.swift trunk/tests/language-behaviour/arrays/110-array-range-exprs.swift trunk/tests/language-behaviour/arrays/1101-array-range.swift trunk/tests/language-behaviour/arrays/1102-array-range-step.swift trunk/tests/language-behaviour/arrays/111-array-individual-assigns.out.expected trunk/tests/language-behaviour/arrays/111-array-individual-assigns.swift trunk/tests/language-behaviour/arrays/162-dot-on-array.out.expected trunk/tests/language-behaviour/arrays/162-dot-on-array.swift trunk/tests/language-behaviour/arrays/array_multidimensional-2.swift trunk/tests/language-behaviour/arrays/array_multidimensional_assign.swift trunk/tests/language-behaviour/arrays/array_multidimensional_index.out.expected trunk/tests/language-behaviour/arrays/array_multidimensional_index.swift trunk/tests/language-behaviour/foreach/ trunk/tests/language-behaviour/foreach/0083-for.one.in trunk/tests/language-behaviour/foreach/0083-for.one.in.out.expected trunk/tests/language-behaviour/foreach/0083-for.swift trunk/tests/language-behaviour/foreach/0083-for.two.in trunk/tests/language-behaviour/foreach/0083-for.two.in.out.expected trunk/tests/language-behaviour/foreach/0084-for.swift trunk/tests/language-behaviour/foreach/050-foreach.blue.out.expected trunk/tests/language-behaviour/foreach/050-foreach.green.out.expected trunk/tests/language-behaviour/foreach/050-foreach.red.out.expected trunk/tests/language-behaviour/foreach/050-foreach.swift trunk/tests/language-behaviour/foreach/051-foreach.blue.out.expected trunk/tests/language-behaviour/foreach/051-foreach.green.out.expected trunk/tests/language-behaviour/foreach/051-foreach.red.out.expected trunk/tests/language-behaviour/foreach/051-foreach.swift trunk/tests/language-behaviour/foreach/052-foreach-index.blue.out.expected trunk/tests/language-behaviour/foreach/052-foreach-index.green.out.expected trunk/tests/language-behaviour/foreach/052-foreach-index.red.out.expected trunk/tests/language-behaviour/foreach/052-foreach-index.swift trunk/tests/language-behaviour/foreach/056-foreach-if.swift trunk/tests/language-behaviour/foreach/057-foreach-twice-range.check.sh trunk/tests/language-behaviour/foreach/057-foreach-twice-range.clean.sh trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0000.out.expected trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0001.out.expected trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0002.out.expected trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0003.out.expected trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0004.out.expected trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0005.out.expected trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0006.out.expected trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0007.out.expected trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0008.out.expected trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0009.out.expected trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0000.out.expected trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0001.out.expected trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0002.out.expected trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0003.out.expected trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0004.out.expected trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0005.out.expected trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0006.out.expected trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0007.out.expected trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0008.out.expected trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0009.out.expected trunk/tests/language-behaviour/foreach/057-foreach-twice-range.setup.sh trunk/tests/language-behaviour/foreach/057-foreach-twice-range.swift trunk/tests/language-behaviour/foreach/058-foreach-twice-string.check.sh trunk/tests/language-behaviour/foreach/058-foreach-twice-string.clean.sh trunk/tests/language-behaviour/foreach/058-foreach-twice-string.first.0000.out.expected trunk/tests/language-behaviour/foreach/058-foreach-twice-string.first.0001.out.expected trunk/tests/language-behaviour/foreach/058-foreach-twice-string.first.0002.out.expected trunk/tests/language-behaviour/foreach/058-foreach-twice-string.second.0000.out.expected trunk/tests/language-behaviour/foreach/058-foreach-twice-string.second.0001.out.expected trunk/tests/language-behaviour/foreach/058-foreach-twice-string.second.0002.out.expected trunk/tests/language-behaviour/foreach/058-foreach-twice-string.setup.sh trunk/tests/language-behaviour/foreach/058-foreach-twice-string.swift trunk/tests/language-behaviour/mappers/ trunk/tests/language-behaviour/mappers/0032-strcat-mapper-param.1.out.expected trunk/tests/language-behaviour/mappers/0032-strcat-mapper-param.swift trunk/tests/language-behaviour/mappers/070-singlefilemapper.out.expected trunk/tests/language-behaviour/mappers/070-singlefilemapper.swift trunk/tests/language-behaviour/mappers/071-singlefilemapper-input.check.sh trunk/tests/language-behaviour/mappers/071-singlefilemapper-input.clean.sh trunk/tests/language-behaviour/mappers/071-singlefilemapper-input.in trunk/tests/language-behaviour/mappers/071-singlefilemapper-input.out.expected trunk/tests/language-behaviour/mappers/071-singlefilemapper-input.setup.sh trunk/tests/language-behaviour/mappers/071-singlefilemapper-input.swift trunk/tests/language-behaviour/mappers/072-simplemapper.out.expected trunk/tests/language-behaviour/mappers/072-simplemapper.swift trunk/tests/language-behaviour/mappers/0721-simplemapper-array.0000.out.expected trunk/tests/language-behaviour/mappers/0721-simplemapper-array.0005.out.expected trunk/tests/language-behaviour/mappers/0721-simplemapper-array.swift trunk/tests/language-behaviour/mappers/0722-simplemapper-padding.000000000.out.expected trunk/tests/language-behaviour/mappers/0722-simplemapper-padding.000000005.out.expected trunk/tests/language-behaviour/mappers/0722-simplemapper-padding.000075943.out.expected trunk/tests/language-behaviour/mappers/0722-simplemapper-padding.swift trunk/tests/language-behaviour/mappers/0723-simplemapper-nopadding.0.out.expected trunk/tests/language-behaviour/mappers/0723-simplemapper-nopadding.5.out.expected trunk/tests/language-behaviour/mappers/0723-simplemapper-nopadding.75943.out.expected trunk/tests/language-behaviour/mappers/0723-simplemapper-nopadding.swift trunk/tests/language-behaviour/mappers/073-simplemapper.out.expected trunk/tests/language-behaviour/mappers/073-simplemapper.swift trunk/tests/language-behaviour/mappers/075-array-mapper.first.out.expected trunk/tests/language-behaviour/mappers/075-array-mapper.second.out.expected trunk/tests/language-behaviour/mappers/075-array-mapper.swift trunk/tests/language-behaviour/mappers/075-array-mapper.third.out.expected trunk/tests/language-behaviour/mappers/0751-fixed-array-mapper.first.out.expected trunk/tests/language-behaviour/mappers/0751-fixed-array-mapper.second.out.expected trunk/tests/language-behaviour/mappers/0751-fixed-array-mapper.swift trunk/tests/language-behaviour/mappers/0751-fixed-array-mapper.third.out.expected trunk/tests/language-behaviour/mappers/07511-fixed-array-mapper-input.check.sh trunk/tests/language-behaviour/mappers/07511-fixed-array-mapper-input.clean.sh trunk/tests/language-behaviour/mappers/07511-fixed-array-mapper-input.setup.sh trunk/tests/language-behaviour/mappers/07511-fixed-array-mapper-input.swift trunk/tests/language-behaviour/mappers/07513-fixed-array-mapper-filename.real.out.expected trunk/tests/language-behaviour/mappers/07513-fixed-array-mapper-filename.swift trunk/tests/language-behaviour/mappers/07514-fixed-array-mapper-filenames.a.in trunk/tests/language-behaviour/mappers/07514-fixed-array-mapper-filenames.b.in trunk/tests/language-behaviour/mappers/07514-fixed-array-mapper-filenames.real.out.expected trunk/tests/language-behaviour/mappers/07514-fixed-array-mapper-filenames.swift trunk/tests/language-behaviour/mappers/0752-csv-mapper.csv trunk/tests/language-behaviour/mappers/0752-csv-mapper.left-two.out.expected trunk/tests/language-behaviour/mappers/0752-csv-mapper.left-zero.out.expected trunk/tests/language-behaviour/mappers/0752-csv-mapper.right-one.out.expected trunk/tests/language-behaviour/mappers/0752-csv-mapper.swift trunk/tests/language-behaviour/mappers/0753-filesystem-mapper.a.out.expected trunk/tests/language-behaviour/mappers/0753-filesystem-mapper.b.out.expected trunk/tests/language-behaviour/mappers/0753-filesystem-mapper.blue.in trunk/tests/language-behaviour/mappers/0753-filesystem-mapper.c.out.expected trunk/tests/language-behaviour/mappers/0753-filesystem-mapper.green.in trunk/tests/language-behaviour/mappers/0753-filesystem-mapper.red.in trunk/tests/language-behaviour/mappers/0754-csv-mapper-input.out.expected trunk/tests/language-behaviour/mappers/0754-csv-mapper-input.swift trunk/tests/language-behaviour/mappers/0754-csv-mapper.csv trunk/tests/language-behaviour/mappers/0754-csv-mapper.left-one.in trunk/tests/language-behaviour/mappers/0754-csv-mapper.left-two.in trunk/tests/language-behaviour/mappers/0754-csv-mapper.left-zero.in trunk/tests/language-behaviour/mappers/0754-csv-mapper.right-one.in trunk/tests/language-behaviour/mappers/0754-csv-mapper.right-two.in trunk/tests/language-behaviour/mappers/0754-csv-mapper.right-zero.in trunk/tests/language-behaviour/mappers/0755-ext-mapper.0.3.2.1.out.expected trunk/tests/language-behaviour/mappers/0755-ext-mapper.AAA.out.expected trunk/tests/language-behaviour/mappers/0755-ext-mapper.____.out.expected trunk/tests/language-behaviour/mappers/0755-ext-mapper.sh trunk/tests/language-behaviour/mappers/0755-ext-mapper.swift trunk/tests/language-behaviour/mappers/07551-ext-mapper-single.out.expected trunk/tests/language-behaviour/mappers/07551-ext-mapper-single.sh trunk/tests/language-behaviour/mappers/07551-ext-mapper-single.swift trunk/tests/language-behaviour/mappers/07552-ext-mapper-numeric.inside.out.expected trunk/tests/language-behaviour/mappers/07552-ext-mapper-numeric.mapper.out.expected trunk/tests/language-behaviour/mappers/07552-ext-mapper-numeric.sh trunk/tests/language-behaviour/mappers/07552-ext-mapper-numeric.swift trunk/tests/language-behaviour/mappers/07554-ext-mapper-struct.sh trunk/tests/language-behaviour/mappers/07554-ext-mapper-struct.swift trunk/tests/language-behaviour/mappers/07555-ext-mapper-twostruct.sh trunk/tests/language-behaviour/mappers/07555-ext-mapper-twostruct.swift trunk/tests/language-behaviour/mappers/075551-ext-mapper-twostruct-singleproducer.swift trunk/tests/language-behaviour/mappers/0756-ext-mapper-slow.sh trunk/tests/language-behaviour/mappers/0756-ext-mapper-slow.swift trunk/tests/language-behaviour/mappers/0757-ext-mapper-array.sh trunk/tests/language-behaviour/mappers/0757-ext-mapper-array.swift trunk/tests/language-behaviour/mappers/0758-ext-mapper-array.sh trunk/tests/language-behaviour/mappers/0758-ext-mapper-array.swift trunk/tests/language-behaviour/mappers/0759-ext-mapper-array.sh trunk/tests/language-behaviour/mappers/0759-ext-mapper-array.swift trunk/tests/language-behaviour/mappers/07591-ext-mapper-multidimensional-array.sh trunk/tests/language-behaviour/mappers/07591-ext-mapper-multidimensional-array.swift trunk/tests/language-behaviour/mappers/07592-ext-mapper-multidimensional-array-structs.sh trunk/tests/language-behaviour/mappers/07592-ext-mapper-multidimensional-array-structs.swift trunk/tests/language-behaviour/mappers/076-structured-regexp-mapper.b.out.expected trunk/tests/language-behaviour/mappers/076-structured-regexp-mapper.swift trunk/tests/language-behaviour/mappers/077-regexp-mapper.foo.out.expected trunk/tests/language-behaviour/mappers/077-regexp-mapper.swift trunk/tests/language-behaviour/mappers/078-singlefilemapper-name-expression.out.expected trunk/tests/language-behaviour/mappers/078-singlefilemapper-name-expression.swift trunk/tests/language-behaviour/mappers/0781-singlefilemapper-name-expression.out.expected trunk/tests/language-behaviour/mappers/0781-singlefilemapper-name-expression.swift trunk/tests/language-behaviour/mappers/079-regression-r970-simple-mapper-expr-prefix.out.expected trunk/tests/language-behaviour/mappers/079-regression-r970-simple-mapper-expr-prefix.swift trunk/tests/language-behaviour/mappers/0791-regression-r970-simple-mapper-expr-prefix.out.expected trunk/tests/language-behaviour/mappers/0791-regression-r970-simple-mapper-expr-prefix.swift trunk/tests/language-behaviour/mappers/150-filesys_mapper.swift trunk/tests/language-behaviour/mappers/760-csv-mapper.sh trunk/tests/language-behaviour/mappers/760-csv-mapper.swift trunk/tests/language-behaviour/mappers/T074-simplemapper.aleph.out.expected trunk/tests/language-behaviour/mappers/T074-simplemapper.beth.out.expected trunk/tests/language-behaviour/mappers/T074-simplemapper.gimel.out.expected trunk/tests/language-behaviour/mappers/T074-simplemapper.swift trunk/tests/language-behaviour/mappers/T076-simplemapper-bug80.aleph.out.expected trunk/tests/language-behaviour/mappers/T076-simplemapper-bug80.beth.out.expected trunk/tests/language-behaviour/mappers/T076-simplemapper-bug80.swift trunk/tests/language-behaviour/mappers/T077-simplemapper-bug80.aleph.out.expected trunk/tests/language-behaviour/mappers/T077-simplemapper-bug80.beth.out.expected trunk/tests/language-behaviour/mappers/T077-simplemapper-bug80.swift trunk/tests/language-behaviour/mappers/T077-simplemapper-bug80_subordinate.epsilon.out.expected trunk/tests/language-behaviour/mappers/T077-simplemapper-bug80_subordinate.sigma.out.expected trunk/tests/language-behaviour/mappers/T077-simplemapper-bug80_subordinate_moresubordinate.hamza.out.expected trunk/tests/language-behaviour/mappers/T078-simplemapper-nosuffix.swift trunk/tests/language-behaviour/mappers/T078-simplemapper-nosuffix_nodot.out.expected trunk/tests/language-behaviour/mappers/T079-simplemapper-nosuffix_exception.swift Removed: trunk/tests/language-behaviour/006-add.out.expected trunk/tests/language-behaviour/006-add.swift trunk/tests/language-behaviour/007-add-in-proc-add.out.expected trunk/tests/language-behaviour/007-add-in-proc-add.swift trunk/tests/language-behaviour/008-add-multiply.out.expected trunk/tests/language-behaviour/008-add-multiply.swift trunk/tests/language-behaviour/009-multiply.out.expected trunk/tests/language-behaviour/009-multiply.swift trunk/tests/language-behaviour/010-divide.out.expected trunk/tests/language-behaviour/010-divide.swift trunk/tests/language-behaviour/011-divide-float.out.expected trunk/tests/language-behaviour/011-divide-float.swift trunk/tests/language-behaviour/013-mod.out.expected trunk/tests/language-behaviour/013-mod.swift trunk/tests/language-behaviour/014-subtract.out.expected trunk/tests/language-behaviour/014-subtract.swift trunk/tests/language-behaviour/0145-unary-subtact.out.expected trunk/tests/language-behaviour/0145-unary-subtact.swift trunk/tests/language-behaviour/015-lesseq.out.expected trunk/tests/language-behaviour/015-lesseq.swift trunk/tests/language-behaviour/016-greatereq.out.expected trunk/tests/language-behaviour/016-greatereq.swift trunk/tests/language-behaviour/017-greater.out.expected trunk/tests/language-behaviour/017-greater.swift trunk/tests/language-behaviour/018-less.out.expected trunk/tests/language-behaviour/018-less.swift trunk/tests/language-behaviour/019-equals.out.expected trunk/tests/language-behaviour/019-equals.swift trunk/tests/language-behaviour/0191-not-equals.out.expected trunk/tests/language-behaviour/0191-not-equals.swift Log: Use txt extension- will be an asciidoc file Deleted: trunk/tests/language-behaviour/006-add.out.expected =================================================================== --- trunk/tests/language-behaviour/006-add.out.expected 2011-06-14 02:17:30 UTC (rev 4612) +++ trunk/tests/language-behaviour/006-add.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -1 +0,0 @@ -135 Deleted: trunk/tests/language-behaviour/006-add.swift =================================================================== --- trunk/tests/language-behaviour/006-add.swift 2011-06-14 02:17:30 UTC (rev 4612) +++ trunk/tests/language-behaviour/006-add.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -1,14 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(int m) { - app { - echo m stdout=@filename(t); - } -} - -messagefile outfile <"006-add.out">; - -int i = 42+93; - -outfile = greeting(i); - Deleted: trunk/tests/language-behaviour/007-add-in-proc-add.out.expected =================================================================== --- trunk/tests/language-behaviour/007-add-in-proc-add.out.expected 2011-06-14 02:17:30 UTC (rev 4612) +++ trunk/tests/language-behaviour/007-add-in-proc-add.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -1 +0,0 @@ -189 Deleted: trunk/tests/language-behaviour/007-add-in-proc-add.swift =================================================================== --- trunk/tests/language-behaviour/007-add-in-proc-add.swift 2011-06-14 02:17:30 UTC (rev 4612) +++ trunk/tests/language-behaviour/007-add-in-proc-add.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -1,12 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(int m) { - app { - echo m stdout=@filename(t); - } -} - -messagefile outfile <"007-add-in-proc-add.out">; - -outfile = greeting(88+101); - Deleted: trunk/tests/language-behaviour/008-add-multiply.out.expected =================================================================== --- trunk/tests/language-behaviour/008-add-multiply.out.expected 2011-06-14 02:17:30 UTC (rev 4612) +++ trunk/tests/language-behaviour/008-add-multiply.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -1 +0,0 @@ -8 Deleted: trunk/tests/language-behaviour/008-add-multiply.swift =================================================================== --- trunk/tests/language-behaviour/008-add-multiply.swift 2011-06-14 02:17:30 UTC (rev 4612) +++ trunk/tests/language-behaviour/008-add-multiply.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -1,14 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(int m) { - app { - echo m stdout=@filename(t); - } -} - -messagefile outfile <"008-add-multiply.out">; - -int i = 2+2*3; - -outfile = greeting(i); - Deleted: trunk/tests/language-behaviour/009-multiply.out.expected =================================================================== --- trunk/tests/language-behaviour/009-multiply.out.expected 2011-06-14 02:17:30 UTC (rev 4612) +++ trunk/tests/language-behaviour/009-multiply.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -1 +0,0 @@ -42 Deleted: trunk/tests/language-behaviour/009-multiply.swift =================================================================== --- trunk/tests/language-behaviour/009-multiply.swift 2011-06-14 02:17:30 UTC (rev 4612) +++ trunk/tests/language-behaviour/009-multiply.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -1,14 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(int m) { - app { - echo m stdout=@filename(t); - } -} - -messagefile outfile <"009-multiply.out">; - -int i = 6*7; - -outfile = greeting(i); - Deleted: trunk/tests/language-behaviour/010-divide.out.expected =================================================================== --- trunk/tests/language-behaviour/010-divide.out.expected 2011-06-14 02:17:30 UTC (rev 4612) +++ trunk/tests/language-behaviour/010-divide.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -1 +0,0 @@ -33 Deleted: trunk/tests/language-behaviour/010-divide.swift =================================================================== --- trunk/tests/language-behaviour/010-divide.swift 2011-06-14 02:17:30 UTC (rev 4612) +++ trunk/tests/language-behaviour/010-divide.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -1,14 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(int m) { - app { - echo m stdout=@filename(t); - } -} - -messagefile outfile <"010-divide.out">; - -int i = 99%/3; - -outfile = greeting(i); - Deleted: trunk/tests/language-behaviour/011-divide-float.out.expected =================================================================== --- trunk/tests/language-behaviour/011-divide-float.out.expected 2011-06-14 02:17:30 UTC (rev 4612) +++ trunk/tests/language-behaviour/011-divide-float.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -1 +0,0 @@ -0.3333333333333333 Deleted: trunk/tests/language-behaviour/011-divide-float.swift =================================================================== --- trunk/tests/language-behaviour/011-divide-float.swift 2011-06-14 02:17:30 UTC (rev 4612) +++ trunk/tests/language-behaviour/011-divide-float.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -1,14 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(float m) { - app { - echo m stdout=@filename(t); - } -} - -messagefile outfile <"011-divide-float.out">; - -float i = 1.0/3.0; - -outfile = greeting(i); - Deleted: trunk/tests/language-behaviour/013-mod.out.expected =================================================================== --- trunk/tests/language-behaviour/013-mod.out.expected 2011-06-14 02:17:30 UTC (rev 4612) +++ trunk/tests/language-behaviour/013-mod.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -1 +0,0 @@ -19 Deleted: trunk/tests/language-behaviour/013-mod.swift =================================================================== --- trunk/tests/language-behaviour/013-mod.swift 2011-06-14 02:17:30 UTC (rev 4612) +++ trunk/tests/language-behaviour/013-mod.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -1,14 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(int m) { - app { - echo m stdout=@filename(t); - } -} - -messagefile outfile <"013-mod.out">; - -int i = 99 %% 20; - -outfile = greeting(i); - Deleted: trunk/tests/language-behaviour/014-subtract.out.expected =================================================================== --- trunk/tests/language-behaviour/014-subtract.out.expected 2011-06-14 02:17:30 UTC (rev 4612) +++ trunk/tests/language-behaviour/014-subtract.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -1 +0,0 @@ --37 Deleted: trunk/tests/language-behaviour/014-subtract.swift =================================================================== --- trunk/tests/language-behaviour/014-subtract.swift 2011-06-14 02:17:30 UTC (rev 4612) +++ trunk/tests/language-behaviour/014-subtract.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -1,14 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(int m) { - app { - echo m stdout=@filename(t); - } -} - -messagefile outfile <"014-subtract.out">; - -int i = 44-81; - -outfile = greeting(i); - Deleted: trunk/tests/language-behaviour/0145-unary-subtact.out.expected =================================================================== --- trunk/tests/language-behaviour/0145-unary-subtact.out.expected 2011-06-14 02:17:30 UTC (rev 4612) +++ trunk/tests/language-behaviour/0145-unary-subtact.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -1 +0,0 @@ --989929 Deleted: trunk/tests/language-behaviour/0145-unary-subtact.swift =================================================================== --- trunk/tests/language-behaviour/0145-unary-subtact.swift 2011-06-14 02:17:30 UTC (rev 4612) +++ trunk/tests/language-behaviour/0145-unary-subtact.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -1,15 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(int m) { - app { - echo m stdout=@filename(t); - } -} - -messagefile outfile <"0145-unary-subtact.out">; - -int j = 989929; -int i = -j; - -outfile = greeting(i); - Deleted: trunk/tests/language-behaviour/015-lesseq.out.expected =================================================================== --- trunk/tests/language-behaviour/015-lesseq.out.expected 2011-06-14 02:17:30 UTC (rev 4612) +++ trunk/tests/language-behaviour/015-lesseq.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -1 +0,0 @@ -true Deleted: trunk/tests/language-behaviour/015-lesseq.swift =================================================================== --- trunk/tests/language-behaviour/015-lesseq.swift 2011-06-14 02:17:30 UTC (rev 4612) +++ trunk/tests/language-behaviour/015-lesseq.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -1,14 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(boolean m) { - app { - echo m stdout=@filename(t); - } -} - -messagefile outfile <"015-lesseq.out">; - -boolean i = 7<=9; - -outfile = greeting(i); - Deleted: trunk/tests/language-behaviour/016-greatereq.out.expected =================================================================== --- trunk/tests/language-behaviour/016-greatereq.out.expected 2011-06-14 02:17:30 UTC (rev 4612) +++ trunk/tests/language-behaviour/016-greatereq.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -1 +0,0 @@ -false Deleted: trunk/tests/language-behaviour/016-greatereq.swift =================================================================== --- trunk/tests/language-behaviour/016-greatereq.swift 2011-06-14 02:17:30 UTC (rev 4612) +++ trunk/tests/language-behaviour/016-greatereq.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -1,14 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(boolean m) { - app { - echo m stdout=@filename(t); - } -} - -messagefile outfile <"016-greatereq.out">; - -boolean i = 7>=9; - -outfile = greeting(i); - Deleted: trunk/tests/language-behaviour/017-greater.out.expected =================================================================== --- trunk/tests/language-behaviour/017-greater.out.expected 2011-06-14 02:17:30 UTC (rev 4612) +++ trunk/tests/language-behaviour/017-greater.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -1 +0,0 @@ -false Deleted: trunk/tests/language-behaviour/017-greater.swift =================================================================== --- trunk/tests/language-behaviour/017-greater.swift 2011-06-14 02:17:30 UTC (rev 4612) +++ trunk/tests/language-behaviour/017-greater.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -1,14 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(boolean m) { - app { - echo m stdout=@filename(t); - } -} - -messagefile outfile <"017-greater.out">; - -boolean i = 7>9; - -outfile = greeting(i); - Deleted: trunk/tests/language-behaviour/018-less.out.expected =================================================================== --- trunk/tests/language-behaviour/018-less.out.expected 2011-06-14 02:17:30 UTC (rev 4612) +++ trunk/tests/language-behaviour/018-less.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -1 +0,0 @@ -true Deleted: trunk/tests/language-behaviour/018-less.swift =================================================================== --- trunk/tests/language-behaviour/018-less.swift 2011-06-14 02:17:30 UTC (rev 4612) +++ trunk/tests/language-behaviour/018-less.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -1,14 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(boolean m) { - app { - echo m stdout=@filename(t); - } -} - -messagefile outfile <"018-less.out">; - -boolean i = 7<9; - -outfile = greeting(i); - Deleted: trunk/tests/language-behaviour/019-equals.out.expected =================================================================== --- trunk/tests/language-behaviour/019-equals.out.expected 2011-06-14 02:17:30 UTC (rev 4612) +++ trunk/tests/language-behaviour/019-equals.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -1 +0,0 @@ -false Deleted: trunk/tests/language-behaviour/019-equals.swift =================================================================== --- trunk/tests/language-behaviour/019-equals.swift 2011-06-14 02:17:30 UTC (rev 4612) +++ trunk/tests/language-behaviour/019-equals.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -1,14 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(boolean m) { - app { - echo m stdout=@filename(t); - } -} - -messagefile outfile <"019-equals.out">; - -boolean i = 7==9; - -outfile = greeting(i); - Deleted: trunk/tests/language-behaviour/0191-not-equals.out.expected =================================================================== --- trunk/tests/language-behaviour/0191-not-equals.out.expected 2011-06-14 02:17:30 UTC (rev 4612) +++ trunk/tests/language-behaviour/0191-not-equals.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -1 +0,0 @@ -true Deleted: trunk/tests/language-behaviour/0191-not-equals.swift =================================================================== --- trunk/tests/language-behaviour/0191-not-equals.swift 2011-06-14 02:17:30 UTC (rev 4612) +++ trunk/tests/language-behaviour/0191-not-equals.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -1,14 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(boolean m) { - app { - echo m stdout=@filename(t); - } -} - -messagefile outfile <"0191-not-equals.out">; - -boolean i = 7!=9; - -outfile = greeting(i); - Added: trunk/tests/language-behaviour/IO/001-echo.out.expected =================================================================== --- trunk/tests/language-behaviour/IO/001-echo.out.expected (rev 0) +++ trunk/tests/language-behaviour/IO/001-echo.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +hello Added: trunk/tests/language-behaviour/IO/001-echo.swift =================================================================== --- trunk/tests/language-behaviour/IO/001-echo.swift (rev 0) +++ trunk/tests/language-behaviour/IO/001-echo.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,12 @@ +type messagefile; + +(messagefile t) greeting() { + app { + echo "hello" stdout=@filename(t); + } +} + +messagefile outfile <"001-echo.out">; + +outfile = greeting(); + Added: trunk/tests/language-behaviour/IO/0011-echo-20110603-1140-rr21aum3.log =================================================================== --- trunk/tests/language-behaviour/IO/0011-echo-20110603-1140-rr21aum3.log (rev 0) +++ trunk/tests/language-behaviour/IO/0011-echo-20110603-1140-rr21aum3.log 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,111 @@ +2011-06-03 11:40:08,649-0500 DEBUG Loader Max heap: 238616576 +2011-06-03 11:40:08,650-0500 DEBUG textfiles BEGIN SWIFTSCRIPT: +type messagefile; + +app (messagefile t) greeting() { + echo "hello" stdout=@filename(t); +} + +messagefile outfile <"0011-echo.out">; + +outfile = greeting(); + + + +2011-06-03 11:40:08,650-0500 DEBUG textfiles END SWIFTSCRIPT: +2011-06-03 11:40:08,650-0500 INFO Loader 0011-echo.swift: source file is new. Recompiling. +2011-06-03 11:40:09,279-0500 INFO Karajan Validation of XML intermediate file was successful +2011-06-03 11:40:09,475-0500 DEBUG Loader setting: tc.file to: ./tc.data +2011-06-03 11:40:09,475-0500 DEBUG textfiles using default sites file +2011-06-03 11:40:09,493-0500 INFO VDL2ExecutionContext Stack dump: +Level 1 +[iA = 0, iB = 0, bA = false, bB = false] + vdl:instanceconfig = Swift configuration [] + vdl:operation = run + PATH_SEPARATOR = / + swift.home = /home/Alberto/Swift/cog/modules/swift/dist/swift-svn/bin/.. + #vdl:futureWrapperMap = org.griphyn.vdl.karajan.WrapperMap at 171f189 + + +2011-06-03 11:40:10,075-0500 INFO unknown Using sites file: /home/Alberto/Swift/cog/modules/swift/dist/swift-svn/bin/../etc/sites.xml +2011-06-03 11:40:10,112-0500 INFO unknown Using tc.data: ./tc.data +2011-06-03 11:40:10,212-0500 INFO AbstractScheduler Setting resources to: {localhost=localhost} +2011-06-03 11:40:10,702-0500 INFO unknown Swift svn swift-r4543 cog-r3143 + +2011-06-03 11:40:10,703-0500 INFO unknown RUNID id=run:20110603-1140-rr21aum3 +2011-06-03 11:40:10,767-0500 DEBUG greeting PROCEDURE line=3 thread=0-1 name=greeting +2011-06-03 11:40:10,774-0500 INFO vdl:execute START thread=0-1 tr=echo +2011-06-03 11:40:10,798-0500 INFO WeightedHostScoreScheduler CONTACT_SELECTED host=localhost, score=1.000 +2011-06-03 11:40:10,802-0500 INFO GlobalSubmitQueue No global submit throttle set. Using default (1024) +2011-06-03 11:40:10,805-0500 INFO LateBindingScheduler JobQueue: 0 +2011-06-03 11:40:10,873-0500 INFO LateBindingScheduler JobQueue: 0 +2011-06-03 11:40:10,876-0500 INFO vdl:initshareddir START host=localhost - Initializing shared directory +2011-06-03 11:40:10,880-0500 INFO LateBindingScheduler JobQueue: 0 +2011-06-03 11:40:10,899-0500 INFO LateBindingScheduler JobQueue: 0 +2011-06-03 11:40:10,902-0500 INFO LateBindingScheduler JobQueue: 0 +2011-06-03 11:40:10,904-0500 INFO LateBindingScheduler JobQueue: 0 +2011-06-03 11:40:10,908-0500 INFO LateBindingScheduler JobQueue: 0 +2011-06-03 11:40:10,912-0500 INFO LateBindingScheduler JobQueue: 0 +2011-06-03 11:40:10,914-0500 INFO vdl:initshareddir END host=localhost - Done initializing shared directory +2011-06-03 11:40:10,917-0500 DEBUG vdl:execute2 THREAD_ASSOCIATION jobid=echo-1geu42bk thread=0-1-1 host=localhost replicationGroup=0geu42bk +2011-06-03 11:40:10,925-0500 INFO vdl:createdirset START jobid=echo-1geu42bk host=localhost - Initializing directory structure +2011-06-03 11:40:10,926-0500 INFO vdl:createdirset END jobid=echo-1geu42bk - Done initializing directory structure +2011-06-03 11:40:10,926-0500 INFO vdl:dostagein START jobid=echo-1geu42bk - Staging in files +2011-06-03 11:40:10,932-0500 INFO vdl:dostagein END jobid=echo-1geu42bk - Staging in finished +2011-06-03 11:40:10,934-0500 DEBUG vdl:execute2 JOB_START jobid=echo-1geu42bk tr=echo arguments=[?:string = hello - Closed] tmpdir=0011-echo-20110603-1140-rr21aum3/jobs/1/echo-1geu42bk host=localhost +2011-06-03 11:40:10,937-0500 DEBUG textfiles BEGIN TC: +#This is the transformation catalog. +# +#It comes pre-configured with a number of simple transformations with +#paths that are likely to work on a linux box. However, on some systems, +#the paths to these executables will be different (for example, sometimes +#some of these programs are found in /usr/bin rather than in /bin) +# +#NOTE WELL: fields in this file must be separated by tabs, not spaces; and +#there must be no trailing whitespace at the end of each line. +# +# sitename transformation path INSTALLED platform profiles +localhost echo /bin/echo INSTALLED INTEL32::LINUX null +localhost cat /bin/cat INSTALLED INTEL32::LINUX null +localhost ls /bin/ls INSTALLED INTEL32::LINUX null +localhost grep /bin/grep INSTALLED INTEL32::LINUX null +localhost sort /bin/sort INSTALLED INTEL32::LINUX null +localhost paste /bin/paste INSTALLED INTEL32::LINUX null +localhost cp /bin/cp INSTALLED INTEL32::LINUX null +localhost wc /usr/bin/wc INSTALLED INTEL32::LINUX null +localhost wc /usr/bin/wc INSTALLED INTEL32::LINUX null +localhost touch /bin/touch INSTALLED INTEL32::LINUX null +localhost sleep /bin/sleep INSTALLED INTEL32::LINUX null +localhost delayedcat /home/Alberto/Swift/cog/modules/swift/tests/language-behaviour/delayedcat.sh INSTALLED INTEL32::LINUX null + + +2011-06-03 11:40:10,937-0500 DEBUG textfiles END TC: +2011-06-03 11:40:10,946-0500 INFO GridExec TASK_DEFINITION: Task(type=JOB_SUBMISSION, identity=urn:0-1-1-1307119210103) is /bin/bash shared/_swiftwrap echo-1geu42bk -jobdir 1 -scratch -e /bin/echo -out 0011-echo.out -err stderr.txt -i -d -if -of 0011-echo.out -k -cdmfile -status files -a hello +2011-06-03 11:40:10,952-0500 INFO JobSubmissionTaskHandler Submit: in: /var/tmp/0011-echo-20110603-1140-rr21aum3 command: /bin/bash /var/tmp/0011-echo-20110603-1140-rr21aum3/shared/_swiftwrap echo-1geu42bk -jobdir 1 -scratch -e /bin/echo -out 0011-echo.out -err stderr.txt -i -d -if -of 0011-echo.out -k -cdmfile -status files -a hello +2011-06-03 11:40:11,045-0500 INFO LateBindingScheduler JobQueue: 0 +2011-06-03 11:40:11,048-0500 DEBUG vdl:checkjobstatus START jobid=echo-1geu42bk +2011-06-03 11:40:11,051-0500 INFO LateBindingScheduler JobQueue: 0 +2011-06-03 11:40:11,052-0500 INFO vdl:checkjobstatus SUCCESS jobid=echo-1geu42bk - Success file found +2011-06-03 11:40:11,053-0500 DEBUG vdl:execute2 STAGING_OUT jobid=echo-1geu42bk +2011-06-03 11:40:11,055-0500 INFO vdl:dostageout START jobid=echo-1geu42bk - Staging out files +2011-06-03 11:40:11,056-0500 DEBUG vdl:dostageout stageouts: [[$, outfile:messagefile = ? - Open]] +2011-06-03 11:40:11,064-0500 DEBUG vdl:dostageout FILE_STAGE_OUT_START srcname=0011-echo.out srcdir=0011-echo-20110603-1140-rr21aum3/shared/ srchost=localhost destdir= desthost=localhost provider=file +2011-06-03 11:40:11,065-0500 INFO LateBindingScheduler JobQueue: 0 +2011-06-03 11:40:11,077-0500 INFO LateBindingScheduler JobQueue: 0 +2011-06-03 11:40:11,078-0500 DEBUG vdl:dostageout FILE_STAGE_OUT_END srcname=0011-echo.out srcdir=0011-echo-20110603-1140-rr21aum3/shared/ srchost=localhost destdir= desthost=localhost provider=file +2011-06-03 11:40:11,083-0500 INFO LateBindingScheduler JobQueue: 0 +2011-06-03 11:40:11,092-0500 INFO vdl:dostageout END jobid=echo-1geu42bk - Staging out finished +2011-06-03 11:40:11,097-0500 DEBUG vdl:execute2 JOB_END jobid=echo-1geu42bk +2011-06-03 11:40:11,098-0500 INFO vdl:execute END_SUCCESS thread=0-1 tr=echo +2011-06-03 11:40:11,100-0500 DEBUG greeting PROCEDURE_END line=3 +2011-06-03 11:40:11,113-0500 DEBUG vdl:mains Starting cleanups +2011-06-03 11:40:11,116-0500 INFO vdl:cleanups START cleanups=[[0011-echo-20110603-1140-rr21aum3, localhost]] +2011-06-03 11:40:11,118-0500 INFO vdl:cleanup START dir=0011-echo-20110603-1140-rr21aum3 host=localhost +2011-06-03 11:40:11,119-0500 DEBUG vdl:cleanup cdmfile +2011-06-03 11:40:11,123-0500 INFO GridExec TASK_DEFINITION: Task(type=JOB_SUBMISSION, identity=urn:0-1-1307119210114) is /bin/rm -rf 0011-echo-20110603-1140-rr21aum3 +2011-06-03 11:40:11,123-0500 INFO JobSubmissionTaskHandler Submit: in: /var/tmp command: /bin/rm -rf 0011-echo-20110603-1140-rr21aum3 +2011-06-03 11:40:11,123-0500 INFO LateBindingScheduler JobQueue: 0 +2011-06-03 11:40:11,130-0500 INFO vdl:cleanup END dir=0011-echo-20110603-1140-rr21aum3 host=localhost +2011-06-03 11:40:11,131-0500 INFO vdl:cleanups END cleanups=[[0011-echo-20110603-1140-rr21aum3, localhost]] +2011-06-03 11:40:11,132-0500 DEBUG vdl:mains Ending cleanups +2011-06-03 11:40:11,158-0500 INFO Loader Swift finished with no errors Added: trunk/tests/language-behaviour/IO/0011-echo.kml =================================================================== --- trunk/tests/language-behaviour/IO/0011-echo.kml (rev 0) +++ trunk/tests/language-behaviour/IO/0011-echo.kml 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + output + t + + {#thread} + + + + echo + + + swift#string#17000 + + + + t + + + + + + + + + + + + + + + intermediate + outfile + + {#thread} + + + + + + + + + + outfile + + + + + + + + + + Added: trunk/tests/language-behaviour/IO/0011-echo.out =================================================================== --- trunk/tests/language-behaviour/IO/0011-echo.out (rev 0) +++ trunk/tests/language-behaviour/IO/0011-echo.out 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +hello Added: trunk/tests/language-behaviour/IO/0011-echo.out.expected =================================================================== --- trunk/tests/language-behaviour/IO/0011-echo.out.expected (rev 0) +++ trunk/tests/language-behaviour/IO/0011-echo.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +hello Added: trunk/tests/language-behaviour/IO/0011-echo.swift =================================================================== --- trunk/tests/language-behaviour/IO/0011-echo.swift (rev 0) +++ trunk/tests/language-behaviour/IO/0011-echo.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,10 @@ +type messagefile; + +app (messagefile t) greeting() { + echo "hello" stdout=@filename(t); +} + +messagefile outfile <"0011-echo.out">; + +outfile = greeting(); + Added: trunk/tests/language-behaviour/IO/0011-echo.xml =================================================================== --- trunk/tests/language-behaviour/IO/0011-echo.xml (rev 0) +++ trunk/tests/language-behaviour/IO/0011-echo.xml 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,29 @@ + + + + + messagefile + string + + + + + + + + + echo + + thello + + + + + outfile + + Added: trunk/tests/language-behaviour/IO/0012-echo-map-20110603-1140-n9omdlcb.log =================================================================== --- trunk/tests/language-behaviour/IO/0012-echo-map-20110603-1140-n9omdlcb.log (rev 0) +++ trunk/tests/language-behaviour/IO/0012-echo-map-20110603-1140-n9omdlcb.log 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,33 @@ +2011-06-03 11:40:12,099-0500 DEBUG Loader Max heap: 238616576 +2011-06-03 11:40:12,100-0500 DEBUG textfiles BEGIN SWIFTSCRIPT: +type messagefile; + +(messagefile t) greeting() { + app { + echo "hello" stdout=@filename(t); + } +} + +messagefile outfile <"0012-echo-map.out"> = greeting(); + + + + +2011-06-03 11:40:12,100-0500 DEBUG textfiles END SWIFTSCRIPT: +2011-06-03 11:40:12,101-0500 INFO Loader 0012-echo-map.swift: source file is new. Recompiling. +2011-06-03 11:40:12,683-0500 INFO Karajan Validation of XML intermediate file was successful +2011-06-03 11:40:12,882-0500 DEBUG Loader setting: tc.file to: ./tc.data +2011-06-03 11:40:12,882-0500 DEBUG textfiles using default sites file +2011-06-03 11:40:12,900-0500 INFO VDL2ExecutionContext Stack dump: +Level 1 +[iA = 0, iB = 0, bA = false, bB = false] + vdl:instanceconfig = Swift configuration [] + vdl:operation = run + PATH_SEPARATOR = / + swift.home = /home/Alberto/Swift/cog/modules/swift/dist/swift-svn/bin/.. + #vdl:futureWrapperMap = org.griphyn.vdl.karajan.WrapperMap at d56b37 + + +2011-06-03 11:40:13,570-0500 INFO unknown Using sites file: /home/Alberto/Swift/cog/modules/swift/dist/swift-svn/bin/../etc/sites.xml +2011-06-03 11:40:13,609-0500 INFO unknown Using tc.data: ./tc.data +2011-06-03 11:40:13,715-0500 INFO AbstractScheduler Setting resources to: {localhost=localhost} Added: trunk/tests/language-behaviour/IO/0012-echo-map.kml =================================================================== --- trunk/tests/language-behaviour/IO/0012-echo-map.kml (rev 0) +++ trunk/tests/language-behaviour/IO/0012-echo-map.kml 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + output + t + + {#thread} + + + + echo + + + swift#string#17000 + + + + t + + + + + + + + + + + + + + + intermediate + outfile + + {#thread} + + + + + + + + + + outfile + + + + + + + + + + Added: trunk/tests/language-behaviour/IO/0012-echo-map.out.expected =================================================================== --- trunk/tests/language-behaviour/IO/0012-echo-map.out.expected (rev 0) +++ trunk/tests/language-behaviour/IO/0012-echo-map.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +hello Added: trunk/tests/language-behaviour/IO/0012-echo-map.swift =================================================================== --- trunk/tests/language-behaviour/IO/0012-echo-map.swift (rev 0) +++ trunk/tests/language-behaviour/IO/0012-echo-map.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,11 @@ +type messagefile; + +(messagefile t) greeting() { + app { + echo "hello" stdout=@filename(t); + } +} + +messagefile outfile <"0012-echo-map.out"> = greeting(); + + Added: trunk/tests/language-behaviour/IO/0012-echo-map.xml =================================================================== --- trunk/tests/language-behaviour/IO/0012-echo-map.xml (rev 0) +++ trunk/tests/language-behaviour/IO/0012-echo-map.xml 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,29 @@ + + + + + messagefile + string + + + + + + + + + echo + + thello + + + + + outfile + + Added: trunk/tests/language-behaviour/IO/readData.circle.in =================================================================== --- trunk/tests/language-behaviour/IO/readData.circle.in (rev 0) +++ trunk/tests/language-behaviour/IO/readData.circle.in 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,2 @@ +x y r name +10 10 20.0 TheInnerCircle \ No newline at end of file Added: trunk/tests/language-behaviour/IO/readData.circle.out.expected =================================================================== --- trunk/tests/language-behaviour/IO/readData.circle.out.expected (rev 0) +++ trunk/tests/language-behaviour/IO/readData.circle.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +10 10 20 TheInnerCircle Added: trunk/tests/language-behaviour/IO/readData.circleArray.in =================================================================== --- trunk/tests/language-behaviour/IO/readData.circleArray.in (rev 0) +++ trunk/tests/language-behaviour/IO/readData.circleArray.in 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,4 @@ +x y r name +1 1 5 CircleOne +2 2 7 CircleTwo + Added: trunk/tests/language-behaviour/IO/readData.circleArray.out.expected =================================================================== --- trunk/tests/language-behaviour/IO/readData.circleArray.out.expected (rev 0) +++ trunk/tests/language-behaviour/IO/readData.circleArray.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +1 2 5 CircleTwo Added: trunk/tests/language-behaviour/IO/readData.float.out.expected =================================================================== --- trunk/tests/language-behaviour/IO/readData.float.out.expected (rev 0) +++ trunk/tests/language-behaviour/IO/readData.float.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +3.1400001 Added: trunk/tests/language-behaviour/IO/readData.int.in =================================================================== --- trunk/tests/language-behaviour/IO/readData.int.in (rev 0) +++ trunk/tests/language-behaviour/IO/readData.int.in 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +77777 Added: trunk/tests/language-behaviour/IO/readData.int.out.expected =================================================================== --- trunk/tests/language-behaviour/IO/readData.int.out.expected (rev 0) +++ trunk/tests/language-behaviour/IO/readData.int.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +77777 Added: trunk/tests/language-behaviour/IO/readData.intArray.in =================================================================== --- trunk/tests/language-behaviour/IO/readData.intArray.in (rev 0) +++ trunk/tests/language-behaviour/IO/readData.intArray.in 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,4 @@ +1 +5 +9 +0 \ No newline at end of file Added: trunk/tests/language-behaviour/IO/readData.intArray.out.expected =================================================================== --- trunk/tests/language-behaviour/IO/readData.intArray.out.expected (rev 0) +++ trunk/tests/language-behaviour/IO/readData.intArray.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +1 5 9 0 Added: trunk/tests/language-behaviour/IO/readData.stringArray.in =================================================================== --- trunk/tests/language-behaviour/IO/readData.stringArray.in (rev 0) +++ trunk/tests/language-behaviour/IO/readData.stringArray.in 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,4 @@ +red +green +blue +thermometer \ No newline at end of file Added: trunk/tests/language-behaviour/IO/readData.stringArray.out.expected =================================================================== --- trunk/tests/language-behaviour/IO/readData.stringArray.out.expected (rev 0) +++ trunk/tests/language-behaviour/IO/readData.stringArray.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +red green blue thermometer Added: trunk/tests/language-behaviour/IO/readData.swift =================================================================== --- trunk/tests/language-behaviour/IO/readData.swift (rev 0) +++ trunk/tests/language-behaviour/IO/readData.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,80 @@ +type file; + +type circle { + int x; + int y; + float r; + string name; +} + +(file f) createInt() { + app{ + echo "77777" stdout=@filename(f); + } +} + +(file f) createFloat() { + app{ + echo "3.1400001" stdout=@filename(f); + } +} + + +(file f) write(string data) { + app{ + echo data stdout=@filename(f); + } +} + +int i; +float fl; + +int ia[]; + +string sa[]; + +circle ca[]; + +circle c; + +//will be generated +file f <"readData.int.in">; + +//input file. assumed on disk +file g <"readData.intArray.in">; + +// will be generated +file h <"readData.float.in">; + +f = createInt(); +h = createFloat(); + +i = readData(f); +fl = readData(h); + +file o1 <"readData.int.out">; +o1 = write(@strcat(i)); + +ia = readData(g); + +file o2 <"readData.intArray.out">; +o2 = write(@strcat(ia[0], " ", ia[1], " ", ia[2], " ", ia[3])); + +sa = readData("readData.stringArray.in"); + +file o3 <"readData.stringArray.out">; +o3 = write(@strcat(sa[0], " ", sa[1], " ", sa[2], " ", sa[3])); + +c = readData("readData.circle.in"); + +file o4 <"readData.circle.out">; +o4 = write(@strcat(c.x, " ", c.y, " ", c.r, " ", c.name)); + +ca = readData("readData.circleArray.in"); + +file o5 <"readData.circleArray.out">; +o5 = write(@strcat(ca[0].x, " ", ca[1].y, " ", ca[0].r, " ", ca[1].name)); + +file o6 <"readData.float.out">; +o6 = write(@strcat(fl)); + Added: trunk/tests/language-behaviour/IO/readData2.in =================================================================== --- trunk/tests/language-behaviour/IO/readData2.in (rev 0) +++ trunk/tests/language-behaviour/IO/readData2.in 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,6 @@ +rows[0].columns[0] = 0 +rows[0].columns[1] = 2 +rows[0].columns[2] = 4 +rows[1].columns[0] = 1 +rows[1].columns[1] = 3 +rows[1].columns[2] = 5 Added: trunk/tests/language-behaviour/IO/readData2.out.expected =================================================================== --- trunk/tests/language-behaviour/IO/readData2.out.expected (rev 0) +++ trunk/tests/language-behaviour/IO/readData2.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +15 Added: trunk/tests/language-behaviour/IO/readData2.swift =================================================================== --- trunk/tests/language-behaviour/IO/readData2.swift (rev 0) +++ trunk/tests/language-behaviour/IO/readData2.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,33 @@ +type vector { + int columns[]; +} + +type matrix { + vector rows[]; +} + +type file; + +(file o) echo(int s) { + app { + echo s stdout=@o; + } +} + + +matrix m; + +m = readData2("readData2.in"); + +int s; + +s = m.rows[0].columns[0] + + m.rows[0].columns[1] + + m.rows[0].columns[2] + + m.rows[1].columns[0] + + m.rows[1].columns[1] + + m.rows[1].columns[2] ; + +file out <"readData2.out">; +out = echo(s); + Added: trunk/tests/language-behaviour/IO/writeDataPrimitive.out.expected =================================================================== --- trunk/tests/language-behaviour/IO/writeDataPrimitive.out.expected (rev 0) +++ trunk/tests/language-behaviour/IO/writeDataPrimitive.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +foo \ No newline at end of file Added: trunk/tests/language-behaviour/IO/writeDataPrimitive.swift =================================================================== --- trunk/tests/language-behaviour/IO/writeDataPrimitive.swift (rev 0) +++ trunk/tests/language-behaviour/IO/writeDataPrimitive.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,8 @@ +type file; + +string s = "foo"; + +file f <"writeDataPrimitive.out">; + +f=writeData(s); + Added: trunk/tests/language-behaviour/IO/writeDataStringArray.swift =================================================================== --- trunk/tests/language-behaviour/IO/writeDataStringArray.swift (rev 0) +++ trunk/tests/language-behaviour/IO/writeDataStringArray.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,8 @@ +type file; + +string s[] = ["foo", "bar"]; + +file f <"writeDataStringArray.out">; + +f=writeData(s); + Added: trunk/tests/language-behaviour/IO/writeDataStringArray2.out.expected =================================================================== --- trunk/tests/language-behaviour/IO/writeDataStringArray2.out.expected (rev 0) +++ trunk/tests/language-behaviour/IO/writeDataStringArray2.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,5 @@ +foo +bar +baz +qux +frrrr Added: trunk/tests/language-behaviour/IO/writeDataStringArray2.swift =================================================================== --- trunk/tests/language-behaviour/IO/writeDataStringArray2.swift (rev 0) +++ trunk/tests/language-behaviour/IO/writeDataStringArray2.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,14 @@ +type file; + +string s[]; + +file f <"writeDataStringArray2.out">; + +f=writeData(s); + +s[2] = "baz"; +s[3] = "qux"; +s[0] = "foo"; +s[1] = "bar"; +s[4] = "frrrr"; + Added: trunk/tests/language-behaviour/IO/writeDataStruct.out.expected =================================================================== --- trunk/tests/language-behaviour/IO/writeDataStruct.out.expected (rev 0) +++ trunk/tests/language-behaviour/IO/writeDataStruct.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,2 @@ +r c l +Baz BAZ baz Added: trunk/tests/language-behaviour/IO/writeDataStruct.swift =================================================================== --- trunk/tests/language-behaviour/IO/writeDataStruct.swift (rev 0) +++ trunk/tests/language-behaviour/IO/writeDataStruct.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,14 @@ +type file; + +type S { string l; string c; string r; } + +S s; + +file f <"writeDataStruct.out">; + +f=writeData(s); + +s.l = "baz"; +s.c = "BAZ"; +s.r = "Baz"; + Added: trunk/tests/language-behaviour/IO/writeDataStructArray2.out.expected =================================================================== --- trunk/tests/language-behaviour/IO/writeDataStructArray2.out.expected (rev 0) +++ trunk/tests/language-behaviour/IO/writeDataStructArray2.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,6 @@ +r c l +Foo FOO foo +Bar BAR bar +Baz BAZ baz +Qux QUX qux +Frrrr FRRRR frrrr Added: trunk/tests/language-behaviour/IO/writeDataStructArray2.swift =================================================================== --- trunk/tests/language-behaviour/IO/writeDataStructArray2.swift (rev 0) +++ trunk/tests/language-behaviour/IO/writeDataStructArray2.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,26 @@ +type file; + +type S { string l; string c; string r; } + +S s[]; + +file f <"writeDataStructArray2.out">; + +f=writeData(s); + +s[2].l = "baz"; +s[2].c = "BAZ"; +s[2].r = "Baz"; +s[3].l = "qux"; +s[3].c = "QUX"; +s[3].r = "Qux"; +s[0].l = "foo"; +s[0].c = "FOO"; +s[0].r = "Foo"; +s[1].l = "bar"; +s[1].c = "BAR"; +s[1].r = "Bar"; +s[4].l = "frrrr"; +s[4].c = "FRRRR"; +s[4].r = "Frrrr"; + Copied: trunk/tests/language-behaviour/arithmetic/006-add.out.expected (from rev 4602, trunk/tests/language-behaviour/006-add.out.expected) =================================================================== --- trunk/tests/language-behaviour/arithmetic/006-add.out.expected (rev 0) +++ trunk/tests/language-behaviour/arithmetic/006-add.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +135 Copied: trunk/tests/language-behaviour/arithmetic/006-add.swift (from rev 4602, trunk/tests/language-behaviour/006-add.swift) =================================================================== --- trunk/tests/language-behaviour/arithmetic/006-add.swift (rev 0) +++ trunk/tests/language-behaviour/arithmetic/006-add.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,14 @@ +type messagefile {} + +(messagefile t) greeting(int m) { + app { + echo m stdout=@filename(t); + } +} + +messagefile outfile <"006-add.out">; + +int i = 42+93; + +outfile = greeting(i); + Copied: trunk/tests/language-behaviour/arithmetic/007-add-in-proc-add.out.expected (from rev 4602, trunk/tests/language-behaviour/007-add-in-proc-add.out.expected) =================================================================== --- trunk/tests/language-behaviour/arithmetic/007-add-in-proc-add.out.expected (rev 0) +++ trunk/tests/language-behaviour/arithmetic/007-add-in-proc-add.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +189 Copied: trunk/tests/language-behaviour/arithmetic/007-add-in-proc-add.swift (from rev 4602, trunk/tests/language-behaviour/007-add-in-proc-add.swift) =================================================================== --- trunk/tests/language-behaviour/arithmetic/007-add-in-proc-add.swift (rev 0) +++ trunk/tests/language-behaviour/arithmetic/007-add-in-proc-add.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,12 @@ +type messagefile {} + +(messagefile t) greeting(int m) { + app { + echo m stdout=@filename(t); + } +} + +messagefile outfile <"007-add-in-proc-add.out">; + +outfile = greeting(88+101); + Copied: trunk/tests/language-behaviour/arithmetic/008-add-multiply.out.expected (from rev 4602, trunk/tests/language-behaviour/008-add-multiply.out.expected) =================================================================== --- trunk/tests/language-behaviour/arithmetic/008-add-multiply.out.expected (rev 0) +++ trunk/tests/language-behaviour/arithmetic/008-add-multiply.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +8 Copied: trunk/tests/language-behaviour/arithmetic/008-add-multiply.swift (from rev 4602, trunk/tests/language-behaviour/008-add-multiply.swift) =================================================================== --- trunk/tests/language-behaviour/arithmetic/008-add-multiply.swift (rev 0) +++ trunk/tests/language-behaviour/arithmetic/008-add-multiply.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,14 @@ +type messagefile {} + +(messagefile t) greeting(int m) { + app { + echo m stdout=@filename(t); + } +} + +messagefile outfile <"008-add-multiply.out">; + +int i = 2+2*3; + +outfile = greeting(i); + Copied: trunk/tests/language-behaviour/arithmetic/009-multiply.out.expected (from rev 4602, trunk/tests/language-behaviour/009-multiply.out.expected) =================================================================== --- trunk/tests/language-behaviour/arithmetic/009-multiply.out.expected (rev 0) +++ trunk/tests/language-behaviour/arithmetic/009-multiply.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +42 Copied: trunk/tests/language-behaviour/arithmetic/009-multiply.swift (from rev 4602, trunk/tests/language-behaviour/009-multiply.swift) =================================================================== --- trunk/tests/language-behaviour/arithmetic/009-multiply.swift (rev 0) +++ trunk/tests/language-behaviour/arithmetic/009-multiply.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,14 @@ +type messagefile {} + +(messagefile t) greeting(int m) { + app { + echo m stdout=@filename(t); + } +} + +messagefile outfile <"009-multiply.out">; + +int i = 6*7; + +outfile = greeting(i); + Copied: trunk/tests/language-behaviour/arithmetic/010-divide.out.expected (from rev 4602, trunk/tests/language-behaviour/010-divide.out.expected) =================================================================== --- trunk/tests/language-behaviour/arithmetic/010-divide.out.expected (rev 0) +++ trunk/tests/language-behaviour/arithmetic/010-divide.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +33 Copied: trunk/tests/language-behaviour/arithmetic/010-divide.swift (from rev 4602, trunk/tests/language-behaviour/010-divide.swift) =================================================================== --- trunk/tests/language-behaviour/arithmetic/010-divide.swift (rev 0) +++ trunk/tests/language-behaviour/arithmetic/010-divide.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,14 @@ +type messagefile {} + +(messagefile t) greeting(int m) { + app { + echo m stdout=@filename(t); + } +} + +messagefile outfile <"010-divide.out">; + +int i = 99%/3; + +outfile = greeting(i); + Copied: trunk/tests/language-behaviour/arithmetic/011-divide-float.out.expected (from rev 4602, trunk/tests/language-behaviour/011-divide-float.out.expected) =================================================================== --- trunk/tests/language-behaviour/arithmetic/011-divide-float.out.expected (rev 0) +++ trunk/tests/language-behaviour/arithmetic/011-divide-float.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +0.3333333333333333 Copied: trunk/tests/language-behaviour/arithmetic/011-divide-float.swift (from rev 4602, trunk/tests/language-behaviour/011-divide-float.swift) =================================================================== --- trunk/tests/language-behaviour/arithmetic/011-divide-float.swift (rev 0) +++ trunk/tests/language-behaviour/arithmetic/011-divide-float.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,14 @@ +type messagefile {} + +(messagefile t) greeting(float m) { + app { + echo m stdout=@filename(t); + } +} + +messagefile outfile <"011-divide-float.out">; + +float i = 1.0/3.0; + +outfile = greeting(i); + Copied: trunk/tests/language-behaviour/arithmetic/013-mod.out.expected (from rev 4602, trunk/tests/language-behaviour/013-mod.out.expected) =================================================================== --- trunk/tests/language-behaviour/arithmetic/013-mod.out.expected (rev 0) +++ trunk/tests/language-behaviour/arithmetic/013-mod.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +19 Copied: trunk/tests/language-behaviour/arithmetic/013-mod.swift (from rev 4602, trunk/tests/language-behaviour/013-mod.swift) =================================================================== --- trunk/tests/language-behaviour/arithmetic/013-mod.swift (rev 0) +++ trunk/tests/language-behaviour/arithmetic/013-mod.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,14 @@ +type messagefile {} + +(messagefile t) greeting(int m) { + app { + echo m stdout=@filename(t); + } +} + +messagefile outfile <"013-mod.out">; + +int i = 99 %% 20; + +outfile = greeting(i); + Copied: trunk/tests/language-behaviour/arithmetic/014-subtract.out.expected (from rev 4602, trunk/tests/language-behaviour/014-subtract.out.expected) =================================================================== --- trunk/tests/language-behaviour/arithmetic/014-subtract.out.expected (rev 0) +++ trunk/tests/language-behaviour/arithmetic/014-subtract.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +-37 Copied: trunk/tests/language-behaviour/arithmetic/014-subtract.swift (from rev 4602, trunk/tests/language-behaviour/014-subtract.swift) =================================================================== --- trunk/tests/language-behaviour/arithmetic/014-subtract.swift (rev 0) +++ trunk/tests/language-behaviour/arithmetic/014-subtract.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,14 @@ +type messagefile {} + +(messagefile t) greeting(int m) { + app { + echo m stdout=@filename(t); + } +} + +messagefile outfile <"014-subtract.out">; + +int i = 44-81; + +outfile = greeting(i); + Copied: trunk/tests/language-behaviour/arithmetic/0145-unary-subtact.out.expected (from rev 4602, trunk/tests/language-behaviour/0145-unary-subtact.out.expected) =================================================================== --- trunk/tests/language-behaviour/arithmetic/0145-unary-subtact.out.expected (rev 0) +++ trunk/tests/language-behaviour/arithmetic/0145-unary-subtact.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +-989929 Copied: trunk/tests/language-behaviour/arithmetic/0145-unary-subtact.swift (from rev 4602, trunk/tests/language-behaviour/0145-unary-subtact.swift) =================================================================== --- trunk/tests/language-behaviour/arithmetic/0145-unary-subtact.swift (rev 0) +++ trunk/tests/language-behaviour/arithmetic/0145-unary-subtact.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,15 @@ +type messagefile {} + +(messagefile t) greeting(int m) { + app { + echo m stdout=@filename(t); + } +} + +messagefile outfile <"0145-unary-subtact.out">; + +int j = 989929; +int i = -j; + +outfile = greeting(i); + Copied: trunk/tests/language-behaviour/arithmetic/015-lesseq.out.expected (from rev 4602, trunk/tests/language-behaviour/015-lesseq.out.expected) =================================================================== --- trunk/tests/language-behaviour/arithmetic/015-lesseq.out.expected (rev 0) +++ trunk/tests/language-behaviour/arithmetic/015-lesseq.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +true Copied: trunk/tests/language-behaviour/arithmetic/015-lesseq.swift (from rev 4602, trunk/tests/language-behaviour/015-lesseq.swift) =================================================================== --- trunk/tests/language-behaviour/arithmetic/015-lesseq.swift (rev 0) +++ trunk/tests/language-behaviour/arithmetic/015-lesseq.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,14 @@ +type messagefile {} + +(messagefile t) greeting(boolean m) { + app { + echo m stdout=@filename(t); + } +} + +messagefile outfile <"015-lesseq.out">; + +boolean i = 7<=9; + +outfile = greeting(i); + Copied: trunk/tests/language-behaviour/arithmetic/016-greatereq.out.expected (from rev 4602, trunk/tests/language-behaviour/016-greatereq.out.expected) =================================================================== --- trunk/tests/language-behaviour/arithmetic/016-greatereq.out.expected (rev 0) +++ trunk/tests/language-behaviour/arithmetic/016-greatereq.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +false Copied: trunk/tests/language-behaviour/arithmetic/016-greatereq.swift (from rev 4602, trunk/tests/language-behaviour/016-greatereq.swift) =================================================================== --- trunk/tests/language-behaviour/arithmetic/016-greatereq.swift (rev 0) +++ trunk/tests/language-behaviour/arithmetic/016-greatereq.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,14 @@ +type messagefile {} + +(messagefile t) greeting(boolean m) { + app { + echo m stdout=@filename(t); + } +} + +messagefile outfile <"016-greatereq.out">; + +boolean i = 7>=9; + +outfile = greeting(i); + Copied: trunk/tests/language-behaviour/arithmetic/017-greater.out.expected (from rev 4602, trunk/tests/language-behaviour/017-greater.out.expected) =================================================================== --- trunk/tests/language-behaviour/arithmetic/017-greater.out.expected (rev 0) +++ trunk/tests/language-behaviour/arithmetic/017-greater.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +false Copied: trunk/tests/language-behaviour/arithmetic/017-greater.swift (from rev 4602, trunk/tests/language-behaviour/017-greater.swift) =================================================================== --- trunk/tests/language-behaviour/arithmetic/017-greater.swift (rev 0) +++ trunk/tests/language-behaviour/arithmetic/017-greater.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,14 @@ +type messagefile {} + +(messagefile t) greeting(boolean m) { + app { + echo m stdout=@filename(t); + } +} + +messagefile outfile <"017-greater.out">; + +boolean i = 7>9; + +outfile = greeting(i); + Copied: trunk/tests/language-behaviour/arithmetic/018-less.out.expected (from rev 4602, trunk/tests/language-behaviour/018-less.out.expected) =================================================================== --- trunk/tests/language-behaviour/arithmetic/018-less.out.expected (rev 0) +++ trunk/tests/language-behaviour/arithmetic/018-less.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +true Copied: trunk/tests/language-behaviour/arithmetic/018-less.swift (from rev 4602, trunk/tests/language-behaviour/018-less.swift) =================================================================== --- trunk/tests/language-behaviour/arithmetic/018-less.swift (rev 0) +++ trunk/tests/language-behaviour/arithmetic/018-less.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,14 @@ +type messagefile {} + +(messagefile t) greeting(boolean m) { + app { + echo m stdout=@filename(t); + } +} + +messagefile outfile <"018-less.out">; + +boolean i = 7<9; + +outfile = greeting(i); + Copied: trunk/tests/language-behaviour/arithmetic/019-equals.out.expected (from rev 4602, trunk/tests/language-behaviour/019-equals.out.expected) =================================================================== --- trunk/tests/language-behaviour/arithmetic/019-equals.out.expected (rev 0) +++ trunk/tests/language-behaviour/arithmetic/019-equals.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +false Copied: trunk/tests/language-behaviour/arithmetic/019-equals.swift (from rev 4602, trunk/tests/language-behaviour/019-equals.swift) =================================================================== --- trunk/tests/language-behaviour/arithmetic/019-equals.swift (rev 0) +++ trunk/tests/language-behaviour/arithmetic/019-equals.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,14 @@ +type messagefile {} + +(messagefile t) greeting(boolean m) { + app { + echo m stdout=@filename(t); + } +} + +messagefile outfile <"019-equals.out">; + +boolean i = 7==9; + +outfile = greeting(i); + Copied: trunk/tests/language-behaviour/arithmetic/0191-not-equals.out.expected (from rev 4602, trunk/tests/language-behaviour/0191-not-equals.out.expected) =================================================================== --- trunk/tests/language-behaviour/arithmetic/0191-not-equals.out.expected (rev 0) +++ trunk/tests/language-behaviour/arithmetic/0191-not-equals.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +true Copied: trunk/tests/language-behaviour/arithmetic/0191-not-equals.swift (from rev 4602, trunk/tests/language-behaviour/0191-not-equals.swift) =================================================================== --- trunk/tests/language-behaviour/arithmetic/0191-not-equals.swift (rev 0) +++ trunk/tests/language-behaviour/arithmetic/0191-not-equals.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,14 @@ +type messagefile {} + +(messagefile t) greeting(boolean m) { + app { + echo m stdout=@filename(t); + } +} + +messagefile outfile <"0191-not-equals.out">; + +boolean i = 7!=9; + +outfile = greeting(i); + Added: trunk/tests/language-behaviour/arrays/020-array.out.expected =================================================================== --- trunk/tests/language-behaviour/arrays/020-array.out.expected (rev 0) +++ trunk/tests/language-behaviour/arrays/020-array.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +4 Added: trunk/tests/language-behaviour/arrays/020-array.swift =================================================================== --- trunk/tests/language-behaviour/arrays/020-array.swift (rev 0) +++ trunk/tests/language-behaviour/arrays/020-array.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,16 @@ +type messagefile {} + +(messagefile t) greeting(int m) { + app { + echo m stdout=@filename(t); + } +} + +messagefile outfile <"020-array.out">; + +int i[] = [ 3, 1, 4, 1, 5]; + +int j = i[2]; + +outfile = greeting(j); + Added: trunk/tests/language-behaviour/arrays/021-array-in-proc-param.out.expected =================================================================== --- trunk/tests/language-behaviour/arrays/021-array-in-proc-param.out.expected (rev 0) +++ trunk/tests/language-behaviour/arrays/021-array-in-proc-param.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +1 Added: trunk/tests/language-behaviour/arrays/021-array-in-proc-param.swift =================================================================== --- trunk/tests/language-behaviour/arrays/021-array-in-proc-param.swift (rev 0) +++ trunk/tests/language-behaviour/arrays/021-array-in-proc-param.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,14 @@ +type messagefile {} + +(messagefile t) greeting(int m) { + app { + echo m stdout=@filename(t); + } +} + +messagefile outfile <"021-array-in-proc-param.out">; + +int i[] = [ 3, 1, 4, 1, 5]; + +outfile = greeting(i[3]); + Added: trunk/tests/language-behaviour/arrays/022-array-with-exprs.out.expected =================================================================== --- trunk/tests/language-behaviour/arrays/022-array-with-exprs.out.expected (rev 0) +++ trunk/tests/language-behaviour/arrays/022-array-with-exprs.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +22 Added: trunk/tests/language-behaviour/arrays/022-array-with-exprs.swift =================================================================== --- trunk/tests/language-behaviour/arrays/022-array-with-exprs.swift (rev 0) +++ trunk/tests/language-behaviour/arrays/022-array-with-exprs.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,16 @@ +type messagefile {} + +(messagefile t) greeting(int m) { + app { + echo m stdout=@filename(t); + } +} + +messagefile outfile <"022-array-with-exprs.out">; + +int i[] = [ 1+91, 3+3, 16+3*2 , 1, 5]; + +int j = i[2]; + +outfile = greeting(j); + Added: trunk/tests/language-behaviour/arrays/025-array-passing.out.expected =================================================================== --- trunk/tests/language-behaviour/arrays/025-array-passing.out.expected (rev 0) +++ trunk/tests/language-behaviour/arrays/025-array-passing.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +two Added: trunk/tests/language-behaviour/arrays/025-array-passing.swift =================================================================== --- trunk/tests/language-behaviour/arrays/025-array-passing.swift (rev 0) +++ trunk/tests/language-behaviour/arrays/025-array-passing.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,14 @@ +type messagefile {} + +(messagefile t) greeting(string m[]) { + app { + echo m[1] stdout=@filename(t); + } +} + +messagefile outfile <"025-array-passing.out">; + +string msg[] = [ "one", "two" ]; + +outfile = greeting(msg); + Added: trunk/tests/language-behaviour/arrays/027-array-assignment.out.expected =================================================================== --- trunk/tests/language-behaviour/arrays/027-array-assignment.out.expected (rev 0) +++ trunk/tests/language-behaviour/arrays/027-array-assignment.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +two Added: trunk/tests/language-behaviour/arrays/027-array-assignment.swift =================================================================== --- trunk/tests/language-behaviour/arrays/027-array-assignment.swift (rev 0) +++ trunk/tests/language-behaviour/arrays/027-array-assignment.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,15 @@ +type messagefile {} + +(messagefile t) greeting(string m[]) { + app { + echo m[1] stdout=@filename(t); + } +} + +messagefile outfile <"027-array-assignment.out">; + +string msg[]; +msg = [ "one", "two" ]; + +outfile = greeting(msg); + Added: trunk/tests/language-behaviour/arrays/028-array-assignment.swift =================================================================== --- trunk/tests/language-behaviour/arrays/028-array-assignment.swift (rev 0) +++ trunk/tests/language-behaviour/arrays/028-array-assignment.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,18 @@ +type messagefile {} + +(messagefile t) greeting(string m[]) { + app { + echo m[1] stdout=@filename(t); + } +} + +messagefile outfile <"027-array-assignment.out">; + +string msg[]; +string baz[]; + +baz = msg; +msg = [ "one", "two" ]; + +outfile = greeting(baz); + Added: trunk/tests/language-behaviour/arrays/029-array-assignment-sequence.swift =================================================================== --- trunk/tests/language-behaviour/arrays/029-array-assignment-sequence.swift (rev 0) +++ trunk/tests/language-behaviour/arrays/029-array-assignment-sequence.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,10 @@ +int a,b,c,d,e,f,g; +trace(g); +a=8645; +b=a; +c=b; +d=c; +e=d; +f=e; +g=f; + Added: trunk/tests/language-behaviour/arrays/083-array-assign.swift =================================================================== --- trunk/tests/language-behaviour/arrays/083-array-assign.swift (rev 0) +++ trunk/tests/language-behaviour/arrays/083-array-assign.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,13 @@ +type messagefile; + +(messagefile t) greeting(string m) { + app { + echo m stdout=@filename(t); + } +} + +messagefile outfile[]; + +outfile[0] = greeting("hi"); +outfile[1] = greeting("bye"); + Added: trunk/tests/language-behaviour/arrays/110-array-range-exprs.swift =================================================================== --- trunk/tests/language-behaviour/arrays/110-array-range-exprs.swift (rev 0) +++ trunk/tests/language-behaviour/arrays/110-array-range-exprs.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,2 @@ + +int i[] = [ 1+1 : 5+5 : 1*3 ]; Added: trunk/tests/language-behaviour/arrays/1101-array-range.swift =================================================================== --- trunk/tests/language-behaviour/arrays/1101-array-range.swift (rev 0) +++ trunk/tests/language-behaviour/arrays/1101-array-range.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,8 @@ + +int i[] = [0:9]; + +int j[] = [0:9]; + +foreach ix in i { + trace(j[ix]); +} Added: trunk/tests/language-behaviour/arrays/1102-array-range-step.swift =================================================================== --- trunk/tests/language-behaviour/arrays/1102-array-range-step.swift (rev 0) +++ trunk/tests/language-behaviour/arrays/1102-array-range-step.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,8 @@ + +int i[] = [0:9]; + +int j[] = [0:19:2]; + +foreach ix in i { + trace(j[ix]); +} Added: trunk/tests/language-behaviour/arrays/111-array-individual-assigns.out.expected =================================================================== --- trunk/tests/language-behaviour/arrays/111-array-individual-assigns.out.expected (rev 0) +++ trunk/tests/language-behaviour/arrays/111-array-individual-assigns.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +100 Added: trunk/tests/language-behaviour/arrays/111-array-individual-assigns.swift =================================================================== --- trunk/tests/language-behaviour/arrays/111-array-individual-assigns.swift (rev 0) +++ trunk/tests/language-behaviour/arrays/111-array-individual-assigns.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,18 @@ + +int i[]; + +i[0]=1; +i[1]=100; +i[2]=10000; + +type messagefile; + +(messagefile t) p(int inp[]) { + app { + echo inp[1] stdout=@filename(t); + } +} + +messagefile outfile <"111-array-individual-assigns.out">; + +outfile = p(i); Added: trunk/tests/language-behaviour/arrays/162-dot-on-array.out.expected =================================================================== --- trunk/tests/language-behaviour/arrays/162-dot-on-array.out.expected (rev 0) +++ trunk/tests/language-behaviour/arrays/162-dot-on-array.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +two-C Added: trunk/tests/language-behaviour/arrays/162-dot-on-array.swift =================================================================== --- trunk/tests/language-behaviour/arrays/162-dot-on-array.swift (rev 0) +++ trunk/tests/language-behaviour/arrays/162-dot-on-array.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,36 @@ +type messagefile; + +(messagefile t) greeting(string s) { + app { + echo s stdout=@filename(t); + } +} + +messagefile outfile <"162-dot-on-array.out">; + +type astruct { + string a; + string b; + string c; +}; + +astruct foo[]; + +foo[0].a = "zero-A"; +foo[0].b = "zero-B"; +foo[0].c = "zero-C"; + +foo[1].a = "one-A"; +foo[1].b = "one-B"; +foo[1].c = "one-C"; + +foo[2].a = "two-A"; +foo[2].b = "two-B"; +foo[2].c = "two-C"; + +string s[] = foo.c; + +string u = s[2]; + +outfile = greeting(u); + Added: trunk/tests/language-behaviour/arrays/array_multidimensional-2.swift =================================================================== --- trunk/tests/language-behaviour/arrays/array_multidimensional-2.swift (rev 0) +++ trunk/tests/language-behaviour/arrays/array_multidimensional-2.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,19 @@ +type file; + +(file t) echo_array (string s[][]) { + app { + echo s[0][0] s[1][0] s[1][1] stdout=@filename(t); + } +} + +string greetings[][]; + +greetings[0][0] = "left"; +greetings[0][1] = "right"; +greetings[1][0] = "up"; +greetings[1][1] = "down"; + +file hw <"array_multidimensional_index.out">; + +hw = echo_array(greetings); + Added: trunk/tests/language-behaviour/arrays/array_multidimensional_assign.swift =================================================================== --- trunk/tests/language-behaviour/arrays/array_multidimensional_assign.swift (rev 0) +++ trunk/tests/language-behaviour/arrays/array_multidimensional_assign.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,16 @@ +type file {} + +(file t) echo_array (string s[][]) { + app { + echo s[0][0] s[1][0] s[1][1] stdout=@filename(t); + } +} + +string greetings[][]; + +greetings = [ [ "left", "right" ], ["up", "down"]]; + +file hw <"array_multidimensional_assign.out">; + +hw = echo_array(greetings); + Added: trunk/tests/language-behaviour/arrays/array_multidimensional_index.out.expected =================================================================== --- trunk/tests/language-behaviour/arrays/array_multidimensional_index.out.expected (rev 0) +++ trunk/tests/language-behaviour/arrays/array_multidimensional_index.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +left up down Added: trunk/tests/language-behaviour/arrays/array_multidimensional_index.swift =================================================================== --- trunk/tests/language-behaviour/arrays/array_multidimensional_index.swift (rev 0) +++ trunk/tests/language-behaviour/arrays/array_multidimensional_index.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,14 @@ +type file {} + +(file t) echo_array (string s[][]) { + app { + echo s[0][0] s[1][0] s[1][1] stdout=@filename(t); + } +} + +string greetings[][] = [ [ "left", "right" ], ["up", "down"]]; + +file hw <"array_multidimensional_index.out">; + +hw = echo_array(greetings); + Added: trunk/tests/language-behaviour/foreach/0083-for.one.in =================================================================== --- trunk/tests/language-behaviour/foreach/0083-for.one.in (rev 0) +++ trunk/tests/language-behaviour/foreach/0083-for.one.in 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +LLLL Added: trunk/tests/language-behaviour/foreach/0083-for.one.in.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/0083-for.one.in.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/0083-for.one.in.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +./0083-for.one.in Added: trunk/tests/language-behaviour/foreach/0083-for.swift =================================================================== --- trunk/tests/language-behaviour/foreach/0083-for.swift (rev 0) +++ trunk/tests/language-behaviour/foreach/0083-for.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,17 @@ +type file; + + +(file t) echo(string m) { + app { + echo m stdout=@filename(t); + } +} + + +file f1[] ; + +foreach i1 in f1 { + string fn = @filename(i1); + file o ; + o = echo(fn); +} Added: trunk/tests/language-behaviour/foreach/0083-for.two.in =================================================================== --- trunk/tests/language-behaviour/foreach/0083-for.two.in (rev 0) +++ trunk/tests/language-behaviour/foreach/0083-for.two.in 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +RRRR Added: trunk/tests/language-behaviour/foreach/0083-for.two.in.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/0083-for.two.in.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/0083-for.two.in.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +./0083-for.two.in Added: trunk/tests/language-behaviour/foreach/0084-for.swift =================================================================== --- trunk/tests/language-behaviour/foreach/0084-for.swift (rev 0) +++ trunk/tests/language-behaviour/foreach/0084-for.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,14 @@ +type file; + + +(file t) echo(string m) { + app { + echo m stdout=@filename(t); + } +} + + +file f1[] ; + +foreach i1 in f1 { +} Added: trunk/tests/language-behaviour/foreach/050-foreach.blue.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/050-foreach.blue.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/050-foreach.blue.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +test Added: trunk/tests/language-behaviour/foreach/050-foreach.green.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/050-foreach.green.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/050-foreach.green.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +test Added: trunk/tests/language-behaviour/foreach/050-foreach.red.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/050-foreach.red.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/050-foreach.red.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +test Added: trunk/tests/language-behaviour/foreach/050-foreach.swift =================================================================== --- trunk/tests/language-behaviour/foreach/050-foreach.swift (rev 0) +++ trunk/tests/language-behaviour/foreach/050-foreach.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,15 @@ +type messagefile {} + +(messagefile t) greeting() { + app { + echo "test" stdout=@filename(t); + } +} + +string array[] = ["red", "green", "blue"]; + +foreach s in array { + messagefile outfile ; + outfile = greeting(); +} + Added: trunk/tests/language-behaviour/foreach/051-foreach.blue.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/051-foreach.blue.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/051-foreach.blue.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +The filename is: 051-foreach.blue.out and the loop var is: blue Added: trunk/tests/language-behaviour/foreach/051-foreach.green.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/051-foreach.green.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/051-foreach.green.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +The filename is: 051-foreach.green.out and the loop var is: green Added: trunk/tests/language-behaviour/foreach/051-foreach.red.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/051-foreach.red.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/051-foreach.red.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +The filename is: 051-foreach.red.out and the loop var is: red Added: trunk/tests/language-behaviour/foreach/051-foreach.swift =================================================================== --- trunk/tests/language-behaviour/foreach/051-foreach.swift (rev 0) +++ trunk/tests/language-behaviour/foreach/051-foreach.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,20 @@ +type messagefile {} + +(messagefile t) greeting(string l) { + app { + echo @strcat("The filename is: ", @filename(t), + " and the loop var is: ", l) + stdout=@filename(t); + } +} + +string array[] = ["red", "green", "blue"]; + +foreach s in array { + messagefile outfile < + single_file_mapper; + file=@strcat("051-foreach.",s,".out") + >; + outfile = greeting(s); +} + Added: trunk/tests/language-behaviour/foreach/052-foreach-index.blue.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/052-foreach-index.blue.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/052-foreach-index.blue.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +The filename is: 052-foreach-index.blue.out, the loop var is: blueand the index is: 2 Added: trunk/tests/language-behaviour/foreach/052-foreach-index.green.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/052-foreach-index.green.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/052-foreach-index.green.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +The filename is: 052-foreach-index.green.out, the loop var is: greenand the index is: 1 Added: trunk/tests/language-behaviour/foreach/052-foreach-index.red.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/052-foreach-index.red.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/052-foreach-index.red.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +The filename is: 052-foreach-index.red.out, the loop var is: redand the index is: 0 Added: trunk/tests/language-behaviour/foreach/052-foreach-index.swift =================================================================== --- trunk/tests/language-behaviour/foreach/052-foreach-index.swift (rev 0) +++ trunk/tests/language-behaviour/foreach/052-foreach-index.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,26 @@ +type messagefile {} + +(messagefile t) greeting(int ix, string l) { + app { + echo @strcat("The filename is: ", @filename(t), + ", the loop var is: ", l, + "and the index is: ", ix) + stdout=@filename(t); + } +} + +string array[] = ["red", "green", "blue"]; + +// this highlights a bug, at least after all commits +// that 'index' is being treated as a string, not as +// an integer... + +// try this test earlier on, though +foreach s, index in array { + messagefile outfile < + single_file_mapper; + file=@strcat("052-foreach-index.",s,".out") + >; + outfile = greeting(index, s); +} + Added: trunk/tests/language-behaviour/foreach/056-foreach-if.swift =================================================================== --- trunk/tests/language-behaviour/foreach/056-foreach-if.swift (rev 0) +++ trunk/tests/language-behaviour/foreach/056-foreach-if.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,26 @@ +type messagefile {} + +(messagefile t) greeting(int ix, string l) { + app { + echo @strcat("The filename is: ", @filename(t), + ", the loop var is: ", l, + "and the index is: ", ix) + stdout=@filename(t); + } +} + +string array[] = ["red", "green", "blue"]; + +// this highlights a bug, at least after all commits +// that 'index' is being treated as a string, not as +// an integer... + +messagefile outfiles[]; + +// try this test earlier on, though +foreach s, index in array { + if( index %% 2 == 1) { + outfiles[index] = greeting(index, s); + } +} + Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.check.sh =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.check.sh (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.check.sh 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,17 @@ +#!/bin/bash + +set -x + +for count in `seq --format "%04.f" 0 1 9` +do + [ -f "057-foreach-twice-range.first.$count.out" ] || exit 1 + CONTENTS1=$( cat 057-foreach-twice-range.first.$count.out.expected ) + CONTENTS2=$( cat 057-foreach-twice-range.first.$count.out ) + [[ $CONTENTS1 == $CONTENTS2 ]] || exit 1 + [ -f "057-foreach-twice-range.second.$count.out" ] || exit 1 + CONTENTS3=$( cat 057-foreach-twice-range.second.$count.out.expected ) + CONTENTS4=$( cat 057-foreach-twice-range.second.$count.out ) + [[ $CONTENTS3 == $CONTENTS4 ]] || exit 1 +done +exit 0 + Property changes on: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.clean.sh =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.clean.sh (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.clean.sh 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,7 @@ +#!/bin/bash + +set -x + +rm -v 057-foreach-twice-range.*.out || exit 1 + +exit 0 Property changes on: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.clean.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0000.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0000.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0000.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +test1-0 Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0001.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0001.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0001.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +test1-1 Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0002.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0002.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0002.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +test1-2 Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0003.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0003.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0003.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +test1-3 Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0004.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0004.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0004.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +test1-4 Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0005.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0005.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0005.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +test1-5 Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0006.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0006.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0006.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +test1-6 Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0007.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0007.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0007.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +test1-7 Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0008.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0008.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0008.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +test1-8 Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0009.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0009.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.first.0009.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +test1-9 Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0000.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0000.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0000.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +test2-0 Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0001.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0001.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0001.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +test2-1 Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0002.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0002.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0002.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +test2-2 Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0003.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0003.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0003.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +test2-3 Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0004.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0004.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0004.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +test2-4 Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0005.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0005.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0005.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +test2-5 Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0006.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0006.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0006.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +test2-6 Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0007.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0007.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0007.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +test2-7 Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0008.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0008.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0008.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +test2-8 Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0009.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0009.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.second.0009.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +test2-9 Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.setup.sh =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.setup.sh (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.setup.sh 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,3 @@ +#!/bin/bash + +cp -v $GROUP/057*expected . || exit 1 Property changes on: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.setup.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/foreach/057-foreach-twice-range.swift =================================================================== --- trunk/tests/language-behaviour/foreach/057-foreach-twice-range.swift (rev 0) +++ trunk/tests/language-behaviour/foreach/057-foreach-twice-range.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,20 @@ +type file; + +app (file o) echo (string msg) +{ + echo msg stdout=@o; +} + +file out[]; +file out2[]; + +foreach a,i in [0:9] { + string s = @strcat("test1-", i); + out[i] = echo(s); +} + +foreach a,i in [0:9] { + string s = @strcat("test2-", i); + out2[i] = echo(s); +} + Added: trunk/tests/language-behaviour/foreach/058-foreach-twice-string.check.sh =================================================================== --- trunk/tests/language-behaviour/foreach/058-foreach-twice-string.check.sh (rev 0) +++ trunk/tests/language-behaviour/foreach/058-foreach-twice-string.check.sh 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,17 @@ +#!/bin/bash + +set -x + +for count in `seq --format "%04.f" 0 1 2` +do + [ -f "058-foreach-twice-string.first.$count.out" ] || exit 1 + CONTENTS1=$( cat 058-foreach-twice-string.first.$count.out.expected ) + CONTENTS2=$( cat 058-foreach-twice-string.first.$count.out ) + [[ $CONTENTS1 == $CONTENTS2 ]] || exit 1 + [ -f "058-foreach-twice-string.second.$count.out" ] || exit 1 + CONTENTS3=$( cat 058-foreach-twice-string.second.$count.out.expected ) + CONTENTS4=$( cat 058-foreach-twice-string.second.$count.out ) + [[ $CONTENTS3 == $CONTENTS4 ]] || exit 1 +done +exit 0 + Property changes on: trunk/tests/language-behaviour/foreach/058-foreach-twice-string.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/foreach/058-foreach-twice-string.clean.sh =================================================================== --- trunk/tests/language-behaviour/foreach/058-foreach-twice-string.clean.sh (rev 0) +++ trunk/tests/language-behaviour/foreach/058-foreach-twice-string.clean.sh 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,6 @@ +#!/bin/bash + +set -x + +rm -v 058-foreach-twice-string.*.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/foreach/058-foreach-twice-string.clean.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/foreach/058-foreach-twice-string.first.0000.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/058-foreach-twice-string.first.0000.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/058-foreach-twice-string.first.0000.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +zero Added: trunk/tests/language-behaviour/foreach/058-foreach-twice-string.first.0001.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/058-foreach-twice-string.first.0001.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/058-foreach-twice-string.first.0001.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +one Added: trunk/tests/language-behaviour/foreach/058-foreach-twice-string.first.0002.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/058-foreach-twice-string.first.0002.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/058-foreach-twice-string.first.0002.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +two Added: trunk/tests/language-behaviour/foreach/058-foreach-twice-string.second.0000.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/058-foreach-twice-string.second.0000.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/058-foreach-twice-string.second.0000.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +zero Added: trunk/tests/language-behaviour/foreach/058-foreach-twice-string.second.0001.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/058-foreach-twice-string.second.0001.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/058-foreach-twice-string.second.0001.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +one Added: trunk/tests/language-behaviour/foreach/058-foreach-twice-string.second.0002.out.expected =================================================================== --- trunk/tests/language-behaviour/foreach/058-foreach-twice-string.second.0002.out.expected (rev 0) +++ trunk/tests/language-behaviour/foreach/058-foreach-twice-string.second.0002.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +two Added: trunk/tests/language-behaviour/foreach/058-foreach-twice-string.setup.sh =================================================================== --- trunk/tests/language-behaviour/foreach/058-foreach-twice-string.setup.sh (rev 0) +++ trunk/tests/language-behaviour/foreach/058-foreach-twice-string.setup.sh 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,3 @@ +#!/bin/bash + +cp -v $GROUP/058*expected . || exit 1 Property changes on: trunk/tests/language-behaviour/foreach/058-foreach-twice-string.setup.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/foreach/058-foreach-twice-string.swift =================================================================== --- trunk/tests/language-behaviour/foreach/058-foreach-twice-string.swift (rev 0) +++ trunk/tests/language-behaviour/foreach/058-foreach-twice-string.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,19 @@ +type file; + +app (file o) echo (string f) +{ + echo @f stdout=@o; +} + +file out[]; +file out2[]; +string words[] = ["zero", "one", "two"]; + +foreach w,i in words { + out[i] = echo(w); +} + +foreach w,i in words { + out2[i] = echo(w); +} + Added: trunk/tests/language-behaviour/mappers/0032-strcat-mapper-param.1.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/0032-strcat-mapper-param.1.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/0032-strcat-mapper-param.1.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +0032-strcat-mapper-param.1 Added: trunk/tests/language-behaviour/mappers/0032-strcat-mapper-param.swift =================================================================== --- trunk/tests/language-behaviour/mappers/0032-strcat-mapper-param.swift (rev 0) +++ trunk/tests/language-behaviour/mappers/0032-strcat-mapper-param.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,18 @@ +type file; + + +(file t) echo(string m) { + app { + echo m stdout=@filename(t); + } +} + + +// file f1[] ; + + +file f1 <"0032-strcat-mapper-param.1">; + + string fn = @filename(f1); + file o ; + o = echo(fn); Added: trunk/tests/language-behaviour/mappers/070-singlefilemapper.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/070-singlefilemapper.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/070-singlefilemapper.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +070-singlefilemapper.out Added: trunk/tests/language-behaviour/mappers/070-singlefilemapper.swift =================================================================== --- trunk/tests/language-behaviour/mappers/070-singlefilemapper.swift (rev 0) +++ trunk/tests/language-behaviour/mappers/070-singlefilemapper.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,12 @@ +type messagefile; + +(messagefile t) write() { + app { + echo @filename(t) stdout=@filename(t); + } +} + +messagefile outfile <"070-singlefilemapper.out">; + +outfile = write(); + Added: trunk/tests/language-behaviour/mappers/071-singlefilemapper-input.check.sh =================================================================== --- trunk/tests/language-behaviour/mappers/071-singlefilemapper-input.check.sh (rev 0) +++ trunk/tests/language-behaviour/mappers/071-singlefilemapper-input.check.sh 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,8 @@ +#!/bin/bash + +set -x + +[ -f 071-singlefilemapper-input.in ] || exit 1 +grep 071-singlefilemapper-input.in 071-singlefilemapper-input.out || exit 1 + +exit 0 Property changes on: trunk/tests/language-behaviour/mappers/071-singlefilemapper-input.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/mappers/071-singlefilemapper-input.clean.sh =================================================================== --- trunk/tests/language-behaviour/mappers/071-singlefilemapper-input.clean.sh (rev 0) +++ trunk/tests/language-behaviour/mappers/071-singlefilemapper-input.clean.sh 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,8 @@ +#!/bin/bash + +set -x + +rm -v 071-singlefilemapper-input.in \ + 071-singlefilemapper-input.out || exit 1 + +exit 0 Property changes on: trunk/tests/language-behaviour/mappers/071-singlefilemapper-input.clean.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/mappers/071-singlefilemapper-input.in =================================================================== --- trunk/tests/language-behaviour/mappers/071-singlefilemapper-input.in (rev 0) +++ trunk/tests/language-behaviour/mappers/071-singlefilemapper-input.in 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +foo Added: trunk/tests/language-behaviour/mappers/071-singlefilemapper-input.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/071-singlefilemapper-input.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/071-singlefilemapper-input.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +071-singlefilemapper-input.in Added: trunk/tests/language-behaviour/mappers/071-singlefilemapper-input.setup.sh =================================================================== --- trunk/tests/language-behaviour/mappers/071-singlefilemapper-input.setup.sh (rev 0) +++ trunk/tests/language-behaviour/mappers/071-singlefilemapper-input.setup.sh 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,7 @@ +#!/bin/bash + +set -x + +cp -v $GROUP/071-singlefilemapper-input.in . || exit 1 + +exit 0 Property changes on: trunk/tests/language-behaviour/mappers/071-singlefilemapper-input.setup.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/mappers/071-singlefilemapper-input.swift =================================================================== --- trunk/tests/language-behaviour/mappers/071-singlefilemapper-input.swift (rev 0) +++ trunk/tests/language-behaviour/mappers/071-singlefilemapper-input.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,11 @@ +type messagefile; + +app (messagefile o) write(messagefile i) { + echo @filename(i) stdout=@filename(o); +} + +messagefile infile <"071-singlefilemapper-input.in">; +messagefile outfile <"071-singlefilemapper-input.out">; + +outfile = write(infile); + Added: trunk/tests/language-behaviour/mappers/072-simplemapper.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/072-simplemapper.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/072-simplemapper.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +072-simplemapper.out Added: trunk/tests/language-behaviour/mappers/072-simplemapper.swift =================================================================== --- trunk/tests/language-behaviour/mappers/072-simplemapper.swift (rev 0) +++ trunk/tests/language-behaviour/mappers/072-simplemapper.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,14 @@ +type messagefile; + +(messagefile t) write() { + app { + echo @filename(t) stdout=@filename(t); + } +} + +messagefile outfile ; + +outfile = write(); + Added: trunk/tests/language-behaviour/mappers/0721-simplemapper-array.0000.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/0721-simplemapper-array.0000.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/0721-simplemapper-array.0000.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +0721-simplemapper-array.0000.out Added: trunk/tests/language-behaviour/mappers/0721-simplemapper-array.0005.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/0721-simplemapper-array.0005.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/0721-simplemapper-array.0005.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +0721-simplemapper-array.0005.out Added: trunk/tests/language-behaviour/mappers/0721-simplemapper-array.swift =================================================================== --- trunk/tests/language-behaviour/mappers/0721-simplemapper-array.swift (rev 0) +++ trunk/tests/language-behaviour/mappers/0721-simplemapper-array.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,15 @@ +type messagefile; + +(messagefile t) write() { + app { + echo @filename(t) stdout=@filename(t); + } +} + +messagefile outfile[] ; + +outfile[0] = write(); +outfile[5] = write(); + Added: trunk/tests/language-behaviour/mappers/0722-simplemapper-padding.000000000.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/0722-simplemapper-padding.000000000.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/0722-simplemapper-padding.000000000.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +0722-simplemapper-padding.000000000.out Added: trunk/tests/language-behaviour/mappers/0722-simplemapper-padding.000000005.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/0722-simplemapper-padding.000000005.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/0722-simplemapper-padding.000000005.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +0722-simplemapper-padding.000000005.out Added: trunk/tests/language-behaviour/mappers/0722-simplemapper-padding.000075943.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/0722-simplemapper-padding.000075943.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/0722-simplemapper-padding.000075943.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +0722-simplemapper-padding.000075943.out Added: trunk/tests/language-behaviour/mappers/0722-simplemapper-padding.swift =================================================================== --- trunk/tests/language-behaviour/mappers/0722-simplemapper-padding.swift (rev 0) +++ trunk/tests/language-behaviour/mappers/0722-simplemapper-padding.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,17 @@ +type messagefile; + +(messagefile t) write() { + app { + echo @filename(t) stdout=@filename(t); + } +} + +messagefile outfile[] ; + +outfile[0] = write(); +outfile[5] = write(); +outfile[75943] = write(); + Added: trunk/tests/language-behaviour/mappers/0723-simplemapper-nopadding.0.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/0723-simplemapper-nopadding.0.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/0723-simplemapper-nopadding.0.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +0723-simplemapper-nopadding.0.out Added: trunk/tests/language-behaviour/mappers/0723-simplemapper-nopadding.5.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/0723-simplemapper-nopadding.5.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/0723-simplemapper-nopadding.5.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +0723-simplemapper-nopadding.5.out Added: trunk/tests/language-behaviour/mappers/0723-simplemapper-nopadding.75943.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/0723-simplemapper-nopadding.75943.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/0723-simplemapper-nopadding.75943.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +0723-simplemapper-nopadding.75943.out Added: trunk/tests/language-behaviour/mappers/0723-simplemapper-nopadding.swift =================================================================== --- trunk/tests/language-behaviour/mappers/0723-simplemapper-nopadding.swift (rev 0) +++ trunk/tests/language-behaviour/mappers/0723-simplemapper-nopadding.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,17 @@ +type messagefile; + +(messagefile t) write() { + app { + echo @filename(t) stdout=@filename(t); + } +} + +messagefile outfile[] ; + +outfile[0] = write(); +outfile[5] = write(); +outfile[75943] = write(); + Added: trunk/tests/language-behaviour/mappers/073-simplemapper.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/073-simplemapper.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/073-simplemapper.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +073-simplemapper.out Added: trunk/tests/language-behaviour/mappers/073-simplemapper.swift =================================================================== --- trunk/tests/language-behaviour/mappers/073-simplemapper.swift (rev 0) +++ trunk/tests/language-behaviour/mappers/073-simplemapper.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,17 @@ +// this one is like test 072-simplemapper, but checks that +// a dot is added to the front of the suffix if its missing + +type messagefile; + +(messagefile t) write() { + app { + echo @filename(t) stdout=@filename(t); + } +} + +messagefile outfile ; + +outfile = write(); + Added: trunk/tests/language-behaviour/mappers/075-array-mapper.first.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/075-array-mapper.first.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/075-array-mapper.first.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +075-array-mapper.first.out Added: trunk/tests/language-behaviour/mappers/075-array-mapper.second.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/075-array-mapper.second.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/075-array-mapper.second.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +075-array-mapper.second.out Added: trunk/tests/language-behaviour/mappers/075-array-mapper.swift =================================================================== --- trunk/tests/language-behaviour/mappers/075-array-mapper.swift (rev 0) +++ trunk/tests/language-behaviour/mappers/075-array-mapper.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,18 @@ +type messagefile; + +(messagefile t) write() { + app { + echo @filename(t) stdout=@filename(t); + } +} + +string fns[]=["075-array-mapper.first.out", + "075-array-mapper.second.out", + "075-array-mapper.third.out"]; + +messagefile outfile[] ; + +outfile[0] = write(); +outfile[1] = write(); +outfile[2] = write(); + Added: trunk/tests/language-behaviour/mappers/075-array-mapper.third.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/075-array-mapper.third.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/075-array-mapper.third.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +075-array-mapper.third.out Added: trunk/tests/language-behaviour/mappers/0751-fixed-array-mapper.first.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/0751-fixed-array-mapper.first.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/0751-fixed-array-mapper.first.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +slot 0 Added: trunk/tests/language-behaviour/mappers/0751-fixed-array-mapper.second.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/0751-fixed-array-mapper.second.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/0751-fixed-array-mapper.second.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +slot 1 Added: trunk/tests/language-behaviour/mappers/0751-fixed-array-mapper.swift =================================================================== --- trunk/tests/language-behaviour/mappers/0751-fixed-array-mapper.swift (rev 0) +++ trunk/tests/language-behaviour/mappers/0751-fixed-array-mapper.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,16 @@ +type messagefile; + +(messagefile t) write(string s) { + app { + echo s stdout=@filename(t); + } +} + +string fns="0751-fixed-array-mapper.first.out 0751-fixed-array-mapper.second.out 0751-fixed-array-mapper.third.out"; + +messagefile outfile[] ; + +outfile[0] = write("slot 0"); +outfile[1] = write("slot 1"); +outfile[2] = write("slot 2"); + Added: trunk/tests/language-behaviour/mappers/0751-fixed-array-mapper.third.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/0751-fixed-array-mapper.third.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/0751-fixed-array-mapper.third.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +slot 2 Added: trunk/tests/language-behaviour/mappers/07511-fixed-array-mapper-input.check.sh =================================================================== --- trunk/tests/language-behaviour/mappers/07511-fixed-array-mapper-input.check.sh (rev 0) +++ trunk/tests/language-behaviour/mappers/07511-fixed-array-mapper-input.check.sh 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,12 @@ +#!/bin/bash + +set -x + +cat stdout.txt + +X=$( grep -c "file: 07511" stdout.txt ) +[ $? == 0 ] || exit 1 +echo $X +(( $X == 3 )) || exit 1 + +exit 0 Property changes on: trunk/tests/language-behaviour/mappers/07511-fixed-array-mapper-input.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/mappers/07511-fixed-array-mapper-input.clean.sh =================================================================== --- trunk/tests/language-behaviour/mappers/07511-fixed-array-mapper-input.clean.sh (rev 0) +++ trunk/tests/language-behaviour/mappers/07511-fixed-array-mapper-input.clean.sh 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,7 @@ +#!/bin/bash + +set -x + +rm -v $GROUP/07511-fixed-array-mapper-input.*.in || exit 1 + +exit 0 Property changes on: trunk/tests/language-behaviour/mappers/07511-fixed-array-mapper-input.clean.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/mappers/07511-fixed-array-mapper-input.setup.sh =================================================================== --- trunk/tests/language-behaviour/mappers/07511-fixed-array-mapper-input.setup.sh (rev 0) +++ trunk/tests/language-behaviour/mappers/07511-fixed-array-mapper-input.setup.sh 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,7 @@ +#!/bin/bash + +set -x + +cp -v $GROUP/07511-fixed-array-mapper-input.*.in . || exit 1 + +exit 0 Property changes on: trunk/tests/language-behaviour/mappers/07511-fixed-array-mapper-input.setup.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/mappers/07511-fixed-array-mapper-input.swift =================================================================== --- trunk/tests/language-behaviour/mappers/07511-fixed-array-mapper-input.swift (rev 0) +++ trunk/tests/language-behaviour/mappers/07511-fixed-array-mapper-input.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,19 @@ +type messagefile; + +/* +app p(messagefile t) { + echo "foo" stdin=@filename(t); +} +*/ +string fns="07511-fixed-array-mapper-input.first.in 07511-fixed-array-mapper-input.second.in 07511-fixed-array-mapper-input.third.in"; + +messagefile infile[] ; + +/* +p(infile[0]); +p(infile[1]); +p(infile[2]); +*/ +tracef("file: %s\n", @filename(infile[0])); +tracef("file: %s\n", @filename(infile[1])); +tracef("file: %s\n", @filename(infile[2])); Added: trunk/tests/language-behaviour/mappers/07513-fixed-array-mapper-filename.real.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/07513-fixed-array-mapper-filename.real.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/07513-fixed-array-mapper-filename.real.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +q r s t Added: trunk/tests/language-behaviour/mappers/07513-fixed-array-mapper-filename.swift =================================================================== --- trunk/tests/language-behaviour/mappers/07513-fixed-array-mapper-filename.swift (rev 0) +++ trunk/tests/language-behaviour/mappers/07513-fixed-array-mapper-filename.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,19 @@ +type messagefile; + +(messagefile t) write(string s) { + app { + echo s stdout=@filename(t); + } +} + +string fns="q r s t"; + +messagefile outfile[] ; +messagefile realoutput <"07513-fixed-array-mapper-filename.real.out">; + +string fn; + +fn = @filename(outfile); + +realoutput = write(fn); + Added: trunk/tests/language-behaviour/mappers/07514-fixed-array-mapper-filenames.a.in =================================================================== --- trunk/tests/language-behaviour/mappers/07514-fixed-array-mapper-filenames.a.in (rev 0) +++ trunk/tests/language-behaviour/mappers/07514-fixed-array-mapper-filenames.a.in 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +foo Added: trunk/tests/language-behaviour/mappers/07514-fixed-array-mapper-filenames.b.in =================================================================== --- trunk/tests/language-behaviour/mappers/07514-fixed-array-mapper-filenames.b.in (rev 0) +++ trunk/tests/language-behaviour/mappers/07514-fixed-array-mapper-filenames.b.in 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +foo Added: trunk/tests/language-behaviour/mappers/07514-fixed-array-mapper-filenames.real.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/07514-fixed-array-mapper-filenames.real.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/07514-fixed-array-mapper-filenames.real.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +07514-fixed-array-mapper-filenames.a.in 07514-fixed-array-mapper-filenames.b.in Added: trunk/tests/language-behaviour/mappers/07514-fixed-array-mapper-filenames.swift =================================================================== --- trunk/tests/language-behaviour/mappers/07514-fixed-array-mapper-filenames.swift (rev 0) +++ trunk/tests/language-behaviour/mappers/07514-fixed-array-mapper-filenames.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,17 @@ +type messagefile; + +(messagefile t) write(messagefile s[]) { + app { + echo @filenames(s) stdout=@filename(t); + } +} + +string fns="07514-fixed-array-mapper-filenames.a.in 07514-fixed-array-mapper-filenames.b.in"; + +messagefile outfile[] ; +messagefile realoutput <"07514-fixed-array-mapper-filenames.real.out">; + +string fn; + +realoutput = write(outfile); + Added: trunk/tests/language-behaviour/mappers/0752-csv-mapper.csv =================================================================== --- trunk/tests/language-behaviour/mappers/0752-csv-mapper.csv (rev 0) +++ trunk/tests/language-behaviour/mappers/0752-csv-mapper.csv 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,4 @@ +l,r +0752-csv-mapper.left-zero.out,0752-csv-mapper.right-zero.out +0752-csv-mapper.left-one.out,0752-csv-mapper.right-one.out +0752-csv-mapper.left-two.out,0752-csv-mapper.right-two.out Added: trunk/tests/language-behaviour/mappers/0752-csv-mapper.left-two.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/0752-csv-mapper.left-two.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/0752-csv-mapper.left-two.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +slot 2 Added: trunk/tests/language-behaviour/mappers/0752-csv-mapper.left-zero.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/0752-csv-mapper.left-zero.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/0752-csv-mapper.left-zero.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +slot 0 Added: trunk/tests/language-behaviour/mappers/0752-csv-mapper.right-one.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/0752-csv-mapper.right-one.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/0752-csv-mapper.right-one.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +slot 1 Added: trunk/tests/language-behaviour/mappers/0752-csv-mapper.swift =================================================================== --- trunk/tests/language-behaviour/mappers/0752-csv-mapper.swift (rev 0) +++ trunk/tests/language-behaviour/mappers/0752-csv-mapper.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,19 @@ +type messagefile; + +type cols { + messagefile l; + messagefile r; +} + +(messagefile t) write(string s) { + app { + echo s stdout=@filename(t); + } +} + +cols outfile[] ; + +outfile[0].l = write("slot 0"); +outfile[1].r = write("slot 1"); +outfile[2].l = write("slot 2"); + Added: trunk/tests/language-behaviour/mappers/0753-filesystem-mapper.a.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/0753-filesystem-mapper.a.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/0753-filesystem-mapper.a.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +0753-filesystem-mapper.blue.in Added: trunk/tests/language-behaviour/mappers/0753-filesystem-mapper.b.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/0753-filesystem-mapper.b.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/0753-filesystem-mapper.b.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +0753-filesystem-mapper.green.in Added: trunk/tests/language-behaviour/mappers/0753-filesystem-mapper.blue.in =================================================================== Added: trunk/tests/language-behaviour/mappers/0753-filesystem-mapper.c.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/0753-filesystem-mapper.c.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/0753-filesystem-mapper.c.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +0753-filesystem-mapper.red.in Added: trunk/tests/language-behaviour/mappers/0753-filesystem-mapper.green.in =================================================================== Added: trunk/tests/language-behaviour/mappers/0753-filesystem-mapper.red.in =================================================================== Added: trunk/tests/language-behaviour/mappers/0754-csv-mapper-input.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/0754-csv-mapper-input.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/0754-csv-mapper-input.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +10319 Added: trunk/tests/language-behaviour/mappers/0754-csv-mapper-input.swift =================================================================== --- trunk/tests/language-behaviour/mappers/0754-csv-mapper-input.swift (rev 0) +++ trunk/tests/language-behaviour/mappers/0754-csv-mapper-input.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,19 @@ +type messagefile; + +type cols { + messagefile l; + messagefile r; +} + +(messagefile t) write(messagefile s) { + app { + cat stdin=@filename(s) stdout=@filename(t); + } +} + +cols infiles[] ; + +messagefile outfile <"0754-csv-mapper-input.out">; + +outfile = write(infiles[1].r); + Added: trunk/tests/language-behaviour/mappers/0754-csv-mapper.csv =================================================================== --- trunk/tests/language-behaviour/mappers/0754-csv-mapper.csv (rev 0) +++ trunk/tests/language-behaviour/mappers/0754-csv-mapper.csv 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,4 @@ +l,r +0754-csv-mapper.left-zero.in,0754-csv-mapper.right-zero.in +0754-csv-mapper.left-one.in,0754-csv-mapper.right-one.in +0754-csv-mapper.left-two.in,0754-csv-mapper.right-two.in Added: trunk/tests/language-behaviour/mappers/0754-csv-mapper.left-one.in =================================================================== --- trunk/tests/language-behaviour/mappers/0754-csv-mapper.left-one.in (rev 0) +++ trunk/tests/language-behaviour/mappers/0754-csv-mapper.left-one.in 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +14708 Added: trunk/tests/language-behaviour/mappers/0754-csv-mapper.left-two.in =================================================================== --- trunk/tests/language-behaviour/mappers/0754-csv-mapper.left-two.in (rev 0) +++ trunk/tests/language-behaviour/mappers/0754-csv-mapper.left-two.in 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +102 Added: trunk/tests/language-behaviour/mappers/0754-csv-mapper.left-zero.in =================================================================== --- trunk/tests/language-behaviour/mappers/0754-csv-mapper.left-zero.in (rev 0) +++ trunk/tests/language-behaviour/mappers/0754-csv-mapper.left-zero.in 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +9807 Added: trunk/tests/language-behaviour/mappers/0754-csv-mapper.right-one.in =================================================================== --- trunk/tests/language-behaviour/mappers/0754-csv-mapper.right-one.in (rev 0) +++ trunk/tests/language-behaviour/mappers/0754-csv-mapper.right-one.in 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +10319 Added: trunk/tests/language-behaviour/mappers/0754-csv-mapper.right-two.in =================================================================== --- trunk/tests/language-behaviour/mappers/0754-csv-mapper.right-two.in (rev 0) +++ trunk/tests/language-behaviour/mappers/0754-csv-mapper.right-two.in 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +8709 Added: trunk/tests/language-behaviour/mappers/0754-csv-mapper.right-zero.in =================================================================== --- trunk/tests/language-behaviour/mappers/0754-csv-mapper.right-zero.in (rev 0) +++ trunk/tests/language-behaviour/mappers/0754-csv-mapper.right-zero.in 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +2544 Added: trunk/tests/language-behaviour/mappers/0755-ext-mapper.0.3.2.1.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/0755-ext-mapper.0.3.2.1.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/0755-ext-mapper.0.3.2.1.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +slot 1 Added: trunk/tests/language-behaviour/mappers/0755-ext-mapper.AAA.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/0755-ext-mapper.AAA.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/0755-ext-mapper.AAA.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +slot 0 Added: trunk/tests/language-behaviour/mappers/0755-ext-mapper.____.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/0755-ext-mapper.____.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/0755-ext-mapper.____.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +slot 2 Added: trunk/tests/language-behaviour/mappers/0755-ext-mapper.sh =================================================================== --- trunk/tests/language-behaviour/mappers/0755-ext-mapper.sh (rev 0) +++ trunk/tests/language-behaviour/mappers/0755-ext-mapper.sh 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,4 @@ +echo "[0].l 0755-ext-mapper.AAA.out" +echo "[1].r 0755-ext-mapper.0.3.2.1.out" +echo "[2].l 0755-ext-mapper.____.out" + Property changes on: trunk/tests/language-behaviour/mappers/0755-ext-mapper.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/mappers/0755-ext-mapper.swift =================================================================== --- trunk/tests/language-behaviour/mappers/0755-ext-mapper.swift (rev 0) +++ trunk/tests/language-behaviour/mappers/0755-ext-mapper.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,19 @@ +type messagefile; + +type cols { + messagefile l; + messagefile r; +} + +(messagefile t) write(string s) { + app { + echo s stdout=@filename(t); + } +} + +cols outfile[] ; + +outfile[0].l = write("slot 0"); +outfile[1].r = write("slot 1"); +outfile[2].l = write("slot 2"); + Added: trunk/tests/language-behaviour/mappers/07551-ext-mapper-single.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/07551-ext-mapper-single.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/07551-ext-mapper-single.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +slot 0 Added: trunk/tests/language-behaviour/mappers/07551-ext-mapper-single.sh =================================================================== --- trunk/tests/language-behaviour/mappers/07551-ext-mapper-single.sh (rev 0) +++ trunk/tests/language-behaviour/mappers/07551-ext-mapper-single.sh 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,2 @@ +#!/bin/bash +echo "$ 07551-ext-mapper-single.out" Property changes on: trunk/tests/language-behaviour/mappers/07551-ext-mapper-single.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/mappers/07551-ext-mapper-single.swift =================================================================== --- trunk/tests/language-behaviour/mappers/07551-ext-mapper-single.swift (rev 0) +++ trunk/tests/language-behaviour/mappers/07551-ext-mapper-single.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,12 @@ +type messagefile; + +(messagefile t) write(string s) { + app { + echo s stdout=@filename(t); + } +} + +messagefile outfile ; + +outfile = write("slot 0"); + Added: trunk/tests/language-behaviour/mappers/07552-ext-mapper-numeric.inside.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/07552-ext-mapper-numeric.inside.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/07552-ext-mapper-numeric.inside.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +5000 Added: trunk/tests/language-behaviour/mappers/07552-ext-mapper-numeric.mapper.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/07552-ext-mapper-numeric.mapper.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/07552-ext-mapper-numeric.mapper.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +-ssss 5000 Added: trunk/tests/language-behaviour/mappers/07552-ext-mapper-numeric.sh =================================================================== --- trunk/tests/language-behaviour/mappers/07552-ext-mapper-numeric.sh (rev 0) +++ trunk/tests/language-behaviour/mappers/07552-ext-mapper-numeric.sh 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,6 @@ +#!/bin/bash + +echo $@ > 07552-ext-mapper-numeric.mapper.out + +echo "$ 07552-ext-mapper-numeric.inside.out" + Property changes on: trunk/tests/language-behaviour/mappers/07552-ext-mapper-numeric.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/mappers/07552-ext-mapper-numeric.swift =================================================================== --- trunk/tests/language-behaviour/mappers/07552-ext-mapper-numeric.swift (rev 0) +++ trunk/tests/language-behaviour/mappers/07552-ext-mapper-numeric.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,13 @@ +type messagefile; + +(messagefile t) greeting(int n) { + app { + echo n stdout=@filename(t); + } +} + +int n = 5000; +messagefile outfile ; + +outfile = greeting(n); + Added: trunk/tests/language-behaviour/mappers/07554-ext-mapper-struct.sh =================================================================== --- trunk/tests/language-behaviour/mappers/07554-ext-mapper-struct.sh (rev 0) +++ trunk/tests/language-behaviour/mappers/07554-ext-mapper-struct.sh 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,3 @@ +#!/bin/bash +echo "eerste 07554-ext-mapper-struct.a.out" +echo "twede 07554-ext-mapper-struct.b.out" Property changes on: trunk/tests/language-behaviour/mappers/07554-ext-mapper-struct.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/mappers/07554-ext-mapper-struct.swift =================================================================== --- trunk/tests/language-behaviour/mappers/07554-ext-mapper-struct.swift (rev 0) +++ trunk/tests/language-behaviour/mappers/07554-ext-mapper-struct.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,18 @@ +type messagefile; + +type struct { +messagefile eerste; +messagefile twede; +}; + +(messagefile t) write(string s) { + app { + echo s stdout=@filename(t); + } +} + +struct outfiles ; + +outfiles.eerste = write("1st"); +outfiles.twede = write("2nd"); + Added: trunk/tests/language-behaviour/mappers/07555-ext-mapper-twostruct.sh =================================================================== --- trunk/tests/language-behaviour/mappers/07555-ext-mapper-twostruct.sh (rev 0) +++ trunk/tests/language-behaviour/mappers/07555-ext-mapper-twostruct.sh 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,5 @@ +#!/bin/bash +echo "eerste 07555-ext-mapper-twostruct.a.out" +echo "twede 07555-ext-mapper-twostruct.b.out" +echo "derde.links 07555-ext-mapper-twostruct.cl.out" +echo "derde.rechts 07555-ext-mapper-twostruct.cr.out" Property changes on: trunk/tests/language-behaviour/mappers/07555-ext-mapper-twostruct.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/mappers/07555-ext-mapper-twostruct.swift =================================================================== --- trunk/tests/language-behaviour/mappers/07555-ext-mapper-twostruct.swift (rev 0) +++ trunk/tests/language-behaviour/mappers/07555-ext-mapper-twostruct.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,26 @@ +type file; + +type structInner { + file links; + file rechts; +} + +type struct { + file eerste; + file twede; + structInner derde; +}; + +(file t) write(string s) { + app { + echo s stdout=@filename(t); + } +} + +struct outfiles ; + +outfiles.eerste = write("1st"); +outfiles.twede = write("2nd"); +outfiles.derde.links = write("3l"); +outfiles.derde.rechts = write("3r"); + Added: trunk/tests/language-behaviour/mappers/075551-ext-mapper-twostruct-singleproducer.swift =================================================================== --- trunk/tests/language-behaviour/mappers/075551-ext-mapper-twostruct-singleproducer.swift (rev 0) +++ trunk/tests/language-behaviour/mappers/075551-ext-mapper-twostruct-singleproducer.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,23 @@ +type file; + +type structInner { + file links; + file rechts; +} + +type struct { + file eerste; + file twede; + structInner derde; +}; + +(struct t) singlewrite() { + app { + touch @filenames(t); + } +} + +struct outfiles ; + +outfiles = singlewrite(); + Added: trunk/tests/language-behaviour/mappers/0756-ext-mapper-slow.sh =================================================================== --- trunk/tests/language-behaviour/mappers/0756-ext-mapper-slow.sh (rev 0) +++ trunk/tests/language-behaviour/mappers/0756-ext-mapper-slow.sh 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,8 @@ +#!/bin/bash +sleep 10s +echo "[0].l 0756-ext-mapper.AAA.out" +sleep 10s +echo "[1].r 0756-ext-mapper.0.3.2.1.out" +sleep 10s +echo "[2].l 0756-ext-mapper.____.out" +sleep 10s Property changes on: trunk/tests/language-behaviour/mappers/0756-ext-mapper-slow.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/mappers/0756-ext-mapper-slow.swift =================================================================== --- trunk/tests/language-behaviour/mappers/0756-ext-mapper-slow.swift (rev 0) +++ trunk/tests/language-behaviour/mappers/0756-ext-mapper-slow.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,19 @@ +type messagefile; + +type cols { + messagefile l; + messagefile r; +} + +(messagefile t) write(string s) { + app { + echo s stdout=@filename(t); + } +} + +cols outfile[] ; + +outfile[0].l = write("slot 0"); +outfile[1].r = write("slot 1"); +outfile[2].l = write("slot 2"); + Added: trunk/tests/language-behaviour/mappers/0757-ext-mapper-array.sh =================================================================== --- trunk/tests/language-behaviour/mappers/0757-ext-mapper-array.sh (rev 0) +++ trunk/tests/language-behaviour/mappers/0757-ext-mapper-array.sh 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,4 @@ +echo "[0] 0757-ext-mapper-array.AAA.out" +echo "[1] 0757-ext-mapper-array.0.3.2.1.out" +echo "[2] 0757-ext-mapper-array.____.out" + Property changes on: trunk/tests/language-behaviour/mappers/0757-ext-mapper-array.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/mappers/0757-ext-mapper-array.swift =================================================================== --- trunk/tests/language-behaviour/mappers/0757-ext-mapper-array.swift (rev 0) +++ trunk/tests/language-behaviour/mappers/0757-ext-mapper-array.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,14 @@ +type messagefile; + +(messagefile t) write(string s) { + app { + echo s stdout=@filename(t); + } +} + +messagefile outfile[] ; + +outfile[0] = write("slot 0"); +outfile[1] = write("slot 1"); +outfile[2] = write("slot 2"); + Added: trunk/tests/language-behaviour/mappers/0758-ext-mapper-array.sh =================================================================== --- trunk/tests/language-behaviour/mappers/0758-ext-mapper-array.sh (rev 0) +++ trunk/tests/language-behaviour/mappers/0758-ext-mapper-array.sh 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,4 @@ +echo "[0] 0757-ext-mapper-array.AAA.out" +echo "[1] 0757-ext-mapper-array.0.3.2.1.out" +echo "[2] 0757-ext-mapper-array.____.out" + Property changes on: trunk/tests/language-behaviour/mappers/0758-ext-mapper-array.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/mappers/0758-ext-mapper-array.swift =================================================================== --- trunk/tests/language-behaviour/mappers/0758-ext-mapper-array.swift (rev 0) +++ trunk/tests/language-behaviour/mappers/0758-ext-mapper-array.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,13 @@ +type messagefile; + +(messagefile t) write(string s) { + app { + echo s stdout=@filename(t); + } +} + +messagefile outfile[] ; + +foreach f,i in [0:2] { + outfile[i] = write("slot X"); +} Added: trunk/tests/language-behaviour/mappers/0759-ext-mapper-array.sh =================================================================== --- trunk/tests/language-behaviour/mappers/0759-ext-mapper-array.sh (rev 0) +++ trunk/tests/language-behaviour/mappers/0759-ext-mapper-array.sh 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,3 @@ +#!/bin/bash +echo [0] 0759-ext-mapper-array.a.out +echo [1] 0759-ext-mapper-array.q.out Property changes on: trunk/tests/language-behaviour/mappers/0759-ext-mapper-array.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/mappers/0759-ext-mapper-array.swift =================================================================== --- trunk/tests/language-behaviour/mappers/0759-ext-mapper-array.swift (rev 0) +++ trunk/tests/language-behaviour/mappers/0759-ext-mapper-array.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,12 @@ +type file; + +(file t[]) write() { + app { + touch "0759-ext-mapper-array.a.out" "0759-ext-mapper-array.q.out"; + } +} + +file outfile[] ; + +outfile = write(); + Added: trunk/tests/language-behaviour/mappers/07591-ext-mapper-multidimensional-array.sh =================================================================== --- trunk/tests/language-behaviour/mappers/07591-ext-mapper-multidimensional-array.sh (rev 0) +++ trunk/tests/language-behaviour/mappers/07591-ext-mapper-multidimensional-array.sh 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,5 @@ +#!/bin/bash +echo [0][0].a out.n/1foo/0/00/00/ST.TU.pdt +echo [0][0].b out.n/1foo/0/00/00/ST.TU.rmsd + + Property changes on: trunk/tests/language-behaviour/mappers/07591-ext-mapper-multidimensional-array.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/mappers/07591-ext-mapper-multidimensional-array.swift =================================================================== --- trunk/tests/language-behaviour/mappers/07591-ext-mapper-multidimensional-array.swift (rev 0) +++ trunk/tests/language-behaviour/mappers/07591-ext-mapper-multidimensional-array.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,17 @@ + +type F; + +type S { + F a; + F b; +} + +app (S output[][]) touch() { +touch @filenames(output); +} + +S o[][] ; + +o = touch(); + + Added: trunk/tests/language-behaviour/mappers/07592-ext-mapper-multidimensional-array-structs.sh =================================================================== --- trunk/tests/language-behaviour/mappers/07592-ext-mapper-multidimensional-array-structs.sh (rev 0) +++ trunk/tests/language-behaviour/mappers/07592-ext-mapper-multidimensional-array-structs.sh 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,6 @@ +#!/bin/bash +echo [0][0].a out.n/1foo/0/00/00/ST.TU.pdt +echo [0][0].b out.n/1foo/0/00/00/ST.TU.rmsd +echo [0][0].c[0] out.n/1foo/0/00/00/ST.TU.rmsd2 + + Property changes on: trunk/tests/language-behaviour/mappers/07592-ext-mapper-multidimensional-array-structs.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/mappers/07592-ext-mapper-multidimensional-array-structs.swift =================================================================== --- trunk/tests/language-behaviour/mappers/07592-ext-mapper-multidimensional-array-structs.swift (rev 0) +++ trunk/tests/language-behaviour/mappers/07592-ext-mapper-multidimensional-array-structs.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,18 @@ + +type F; + +type S { + F a; + F b; + F c[]; +} + +app (S output[][]) touch() { +touch @filenames(output); +} + +S o[][] ; + +o = touch(); + + Added: trunk/tests/language-behaviour/mappers/076-structured-regexp-mapper.b.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/076-structured-regexp-mapper.b.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/076-structured-regexp-mapper.b.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +Hello, world! Added: trunk/tests/language-behaviour/mappers/076-structured-regexp-mapper.swift =================================================================== --- trunk/tests/language-behaviour/mappers/076-structured-regexp-mapper.swift (rev 0) +++ trunk/tests/language-behaviour/mappers/076-structured-regexp-mapper.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,25 @@ +type messagefile {} + +(messagefile t) greeting() { + app { + echo "Hello, world!" stdout=@filename(t); + } +} + +(messagefile t) greeting2(messagefile ignored) { + app { + echo "Hello, world!" stdout=@filename(t); + } +} + + +messagefile outfile <"076-structured-regexp-mapper.a.out">; +messagefile outfile2 ; + +outfile = greeting(); + +outfile2 = greeting2(outfile); Added: trunk/tests/language-behaviour/mappers/077-regexp-mapper.foo.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/077-regexp-mapper.foo.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/077-regexp-mapper.foo.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +hello Added: trunk/tests/language-behaviour/mappers/077-regexp-mapper.swift =================================================================== --- trunk/tests/language-behaviour/mappers/077-regexp-mapper.swift (rev 0) +++ trunk/tests/language-behaviour/mappers/077-regexp-mapper.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,15 @@ +type messagefile; + +(messagefile t) greeting() { + app { + echo "hello" stdout=@filename(t); + } +} + +messagefile outfile ; + +outfile = greeting(); + Added: trunk/tests/language-behaviour/mappers/078-singlefilemapper-name-expression.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/078-singlefilemapper-name-expression.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/078-singlefilemapper-name-expression.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +078-singlefilemapper-name-expression.out Added: trunk/tests/language-behaviour/mappers/078-singlefilemapper-name-expression.swift =================================================================== --- trunk/tests/language-behaviour/mappers/078-singlefilemapper-name-expression.swift (rev 0) +++ trunk/tests/language-behaviour/mappers/078-singlefilemapper-name-expression.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,14 @@ +type messagefile; + +(messagefile t) write() { + app { + echo @filename(t) stdout=@filename(t); + } +} + +string fn = "078-singlefilemapper-name-expression.out"; + +messagefile outfile ; + +outfile = write(); + Added: trunk/tests/language-behaviour/mappers/0781-singlefilemapper-name-expression.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/0781-singlefilemapper-name-expression.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/0781-singlefilemapper-name-expression.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +0781-singlefilemapper-name-expression.out Added: trunk/tests/language-behaviour/mappers/0781-singlefilemapper-name-expression.swift =================================================================== --- trunk/tests/language-behaviour/mappers/0781-singlefilemapper-name-expression.swift (rev 0) +++ trunk/tests/language-behaviour/mappers/0781-singlefilemapper-name-expression.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,14 @@ +type messagefile; + +(messagefile t) write() { + app { + echo @filename(t) stdout=@filename(t); + } +} + +string fn = "0781-singlefilemapper-name-expression"; + +messagefile outfile ; + +outfile = write(); + Added: trunk/tests/language-behaviour/mappers/079-regression-r970-simple-mapper-expr-prefix.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/079-regression-r970-simple-mapper-expr-prefix.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/079-regression-r970-simple-mapper-expr-prefix.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +079-regression-r970-simple-mapper-expr-prefix.out Added: trunk/tests/language-behaviour/mappers/079-regression-r970-simple-mapper-expr-prefix.swift =================================================================== --- trunk/tests/language-behaviour/mappers/079-regression-r970-simple-mapper-expr-prefix.swift (rev 0) +++ trunk/tests/language-behaviour/mappers/079-regression-r970-simple-mapper-expr-prefix.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,14 @@ +type messagefile; + +(messagefile t) write() { + app { + echo @filename(t) stdout=@filename(t); + } +} + +string fn = "079-regression-r970-simple-mapper-expr-prefix"; + +messagefile outfile ; + +outfile = write(); + Added: trunk/tests/language-behaviour/mappers/0791-regression-r970-simple-mapper-expr-prefix.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/0791-regression-r970-simple-mapper-expr-prefix.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/0791-regression-r970-simple-mapper-expr-prefix.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +0791-regression-r970-simple-mapper-expr-prefix.out Added: trunk/tests/language-behaviour/mappers/0791-regression-r970-simple-mapper-expr-prefix.swift =================================================================== --- trunk/tests/language-behaviour/mappers/0791-regression-r970-simple-mapper-expr-prefix.swift (rev 0) +++ trunk/tests/language-behaviour/mappers/0791-regression-r970-simple-mapper-expr-prefix.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,16 @@ +type messagefile; + +(messagefile t) write() { + app { + echo @filename(t) stdout=@filename(t); + } +} + +string a = "0791-regression-r970"; +string b = "-simple-mapper-"; +string c = "expr-prefix"; + +messagefile outfile ; + +outfile = write(); + Added: trunk/tests/language-behaviour/mappers/150-filesys_mapper.swift =================================================================== --- trunk/tests/language-behaviour/mappers/150-filesys_mapper.swift (rev 0) +++ trunk/tests/language-behaviour/mappers/150-filesys_mapper.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,4 @@ +type file; + +file f[] ; + Added: trunk/tests/language-behaviour/mappers/760-csv-mapper.sh =================================================================== --- trunk/tests/language-behaviour/mappers/760-csv-mapper.sh (rev 0) +++ trunk/tests/language-behaviour/mappers/760-csv-mapper.sh 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,10 @@ +#!/bin/sh + +NAME=$1 +CSV_OUT=$2 + +{ + echo "m" + touch $NAME + echo $NAME +} > $CSV_OUT Property changes on: trunk/tests/language-behaviour/mappers/760-csv-mapper.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/mappers/760-csv-mapper.swift =================================================================== --- trunk/tests/language-behaviour/mappers/760-csv-mapper.swift (rev 0) +++ trunk/tests/language-behaviour/mappers/760-csv-mapper.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,28 @@ + +type file; + +type s +{ + file m; +} + +app (file out) create () +{ + echo_sh "file1" @filename(out); +} + +(file result) list (file inf) +{ + s diffs[] ; + foreach f, i in diffs + { + tracef("%s\n", @f.m); + } +} + +file o<"tmp.csv">; +file i; +file p; + +o = create(); +p = list(o); Added: trunk/tests/language-behaviour/mappers/T074-simplemapper.aleph.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/T074-simplemapper.aleph.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/T074-simplemapper.aleph.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +foo Added: trunk/tests/language-behaviour/mappers/T074-simplemapper.beth.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/T074-simplemapper.beth.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/T074-simplemapper.beth.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +bar Added: trunk/tests/language-behaviour/mappers/T074-simplemapper.gimel.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/T074-simplemapper.gimel.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/T074-simplemapper.gimel.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +baz Added: trunk/tests/language-behaviour/mappers/T074-simplemapper.swift =================================================================== --- trunk/tests/language-behaviour/mappers/T074-simplemapper.swift (rev 0) +++ trunk/tests/language-behaviour/mappers/T074-simplemapper.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,28 @@ + +// The basename of this test must begin with a letter rather than a +// number because the mapper uses the first character to determine +// whether the prefix should be interpreted as a number or as +// a string - see bug 80 + +type messagefile; + +type messagestruct { + messagefile aleph; + messagefile beth; + messagefile gimel; +} + +(messagefile t) stringToFile(string m) { + app { + echo m stdout=@filename(t); + } +} + +messagestruct outstruct ; + +outstruct.aleph = stringToFile("foo"); +outstruct.beth = stringToFile("bar"); +outstruct.gimel = stringToFile("baz"); + Added: trunk/tests/language-behaviour/mappers/T076-simplemapper-bug80.aleph.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/T076-simplemapper-bug80.aleph.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/T076-simplemapper-bug80.aleph.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +foo Added: trunk/tests/language-behaviour/mappers/T076-simplemapper-bug80.beth.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/T076-simplemapper-bug80.beth.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/T076-simplemapper-bug80.beth.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +bar Added: trunk/tests/language-behaviour/mappers/T076-simplemapper-bug80.swift =================================================================== --- trunk/tests/language-behaviour/mappers/T076-simplemapper-bug80.swift (rev 0) +++ trunk/tests/language-behaviour/mappers/T076-simplemapper-bug80.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,34 @@ + +// The basename of this test must begin with a letter rather than a +// number because the mapper uses the first character to determine +// whether the prefix should be interpreted as a number or as +// a string - see bug 80 + +type messagefile; + +type secondstruct { + messagefile epsilon; + messagefile sigma; +} + +type messagestruct { + messagefile aleph; + messagefile beth; + secondstruct subordinate; +} + +(messagefile t) stringToFile(string m) { + app { + echo m stdout=@filename(t); + } +} + +messagestruct outstruct ; + +outstruct.aleph = stringToFile("foo"); +outstruct.beth = stringToFile("bar"); +outstruct.subordinate.epsilon = stringToFile("E"); +outstruct.subordinate.sigma = stringToFile("S"); + Added: trunk/tests/language-behaviour/mappers/T077-simplemapper-bug80.aleph.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/T077-simplemapper-bug80.aleph.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/T077-simplemapper-bug80.aleph.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +foo Added: trunk/tests/language-behaviour/mappers/T077-simplemapper-bug80.beth.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/T077-simplemapper-bug80.beth.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/T077-simplemapper-bug80.beth.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +bar Added: trunk/tests/language-behaviour/mappers/T077-simplemapper-bug80.swift =================================================================== --- trunk/tests/language-behaviour/mappers/T077-simplemapper-bug80.swift (rev 0) +++ trunk/tests/language-behaviour/mappers/T077-simplemapper-bug80.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,39 @@ + +// The basename of this test must begin with a letter rather than a +// number because the mapper uses the first character to determine +// whether the prefix should be interpreted as a number or as +// a string - see bug 80 + +type messagefile; + +type tertiarystruct { + messagefile hamza; +} + +type secondstruct { + messagefile epsilon; + messagefile sigma; + tertiarystruct moresubordinate; +} + +type messagestruct { + messagefile aleph; + messagefile beth; + secondstruct subordinate; +} + +(messagefile t) stringToFile(string m) { + app { + echo m stdout=@filename(t); + } +} + +messagestruct outstruct ; + +outstruct.aleph = stringToFile("foo"); +outstruct.beth = stringToFile("bar"); +outstruct.subordinate.epsilon = stringToFile("E"); +outstruct.subordinate.sigma = stringToFile("S"); +outstruct.subordinate.moresubordinate.hamza = stringToFile("misr"); Added: trunk/tests/language-behaviour/mappers/T077-simplemapper-bug80_subordinate.epsilon.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/T077-simplemapper-bug80_subordinate.epsilon.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/T077-simplemapper-bug80_subordinate.epsilon.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +E Added: trunk/tests/language-behaviour/mappers/T077-simplemapper-bug80_subordinate.sigma.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/T077-simplemapper-bug80_subordinate.sigma.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/T077-simplemapper-bug80_subordinate.sigma.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +S Added: trunk/tests/language-behaviour/mappers/T077-simplemapper-bug80_subordinate_moresubordinate.hamza.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/T077-simplemapper-bug80_subordinate_moresubordinate.hamza.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/T077-simplemapper-bug80_subordinate_moresubordinate.hamza.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +misr Added: trunk/tests/language-behaviour/mappers/T078-simplemapper-nosuffix.swift =================================================================== --- trunk/tests/language-behaviour/mappers/T078-simplemapper-nosuffix.swift (rev 0) +++ trunk/tests/language-behaviour/mappers/T078-simplemapper-nosuffix.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,17 @@ +// this one is like test 073-simplemapper, but doesn't +// add the missing dot in front of the suffix + +type messagefile; + +(messagefile t) write() { + app { + echo @filename(t) stdout=@filename(t); + } +} + +messagefile outfile ; + +outfile = write(); + Added: trunk/tests/language-behaviour/mappers/T078-simplemapper-nosuffix_nodot.out.expected =================================================================== --- trunk/tests/language-behaviour/mappers/T078-simplemapper-nosuffix_nodot.out.expected (rev 0) +++ trunk/tests/language-behaviour/mappers/T078-simplemapper-nosuffix_nodot.out.expected 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1 @@ +T078-simplemapper-nosuffix_nodot.out Added: trunk/tests/language-behaviour/mappers/T079-simplemapper-nosuffix_exception.swift =================================================================== --- trunk/tests/language-behaviour/mappers/T079-simplemapper-nosuffix_exception.swift (rev 0) +++ trunk/tests/language-behaviour/mappers/T079-simplemapper-nosuffix_exception.swift 2011-06-14 14:02:14 UTC (rev 4613) @@ -0,0 +1,16 @@ +// this one is like test T078-simplemapper-nosuffix, but demonstrates the +// mapping exception on invalid values +type messagefile; + +(messagefile t) write() { + app { + echo @filename(t) stdout=@filename(t); + } +} + +messagefile outfile ; + +outfile = write(); + From achavez at ci.uchicago.edu Thu Jun 16 10:36:32 2011 From: achavez at ci.uchicago.edu (achavez at ci.uchicago.edu) Date: Thu, 16 Jun 2011 10:36:32 -0500 (CDT) Subject: [Swift-commit] r4619 - trunk/tests Message-ID: <20110616153632.DE2929CCA3@svn.ci.uchicago.edu> Author: achavez Date: 2011-06-16 10:36:31 -0500 (Thu, 16 Jun 2011) New Revision: 4619 Modified: trunk/tests/suite.sh Log: Test suite enhanced; Plain text report option added. Modified: trunk/tests/suite.sh =================================================================== --- trunk/tests/suite.sh 2011-06-15 20:39:33 UTC (rev 4618) +++ trunk/tests/suite.sh 2011-06-16 15:36:31 UTC (rev 4619) @@ -1,157 +1,4 @@ #!/bin/bash - -# USAGE NOTES: - -# The script will (optionally) checkout Swift, run several tests in a -# subdirectory called run-DATE, and generate useful HTML output and -# tests.log . Tests are grouped into test GROUPs. - -# Usage: suite.sh * - -# PRIMARY USAGE MODE -# Assuming your code is in /tmp/cog, where you -# have the conventional cog/modules/swift configuration, -# and you have done an ant dist, you can run -# suite.sh -t -o /tmp $PWD/tests/groups/group-all-local.sh -# or cd into /tmp and run -# suite.sh -t cog/modules/swift/tests/groups/group-all-local.sh -# The -t option is "Tree mode"- as in, "test my existing source tree" - -# Run suite.sh -h for quick help -# When something goes wrong, find and check tests.log or use -v - -# SWIFT LOCATION -# The TOPDIR (PWD by default) is set with the -o option. -# Code is checked out into this directory or must already exist there. -# The variables COG_VERSION and SWIFT_VERSION must be set for code checkout -# e.g. COG_VERSION=branches/4.1.8, SWIFT_VERSION=branches/release-0.92 -# Swift is compiled and installed in its source tree -# The run is executed in RUNDIR (TOPDIR/RUNDIRBASE) -# The build test is started in TOPDIR -# Everything for a Swift test is written in its RUNDIR -# The temporary output always goes to OUTPUT (TOPDIR/exec.out) - -# HELPER SCRIPTS -# Each *.swift test may be accompanied by a -# *.setup.sh, *.check.sh, and/or *.clean.sh script -# and a *.timeout specifier -# The scripts may setup and inspect files in RUNDIR including exec.out, -# which must be accessed in stdout.txt, because the currently running -# tested process writes to exec.out, stdout.txt is a copy. -# The GROUP scripts can read the GROUP variable -# The timeout number in the *.timeout file overrides the default -# timeout - -# TEST STRUCTURE -# Tests are GROUPed into directories -# Each GROUP directory has: -# 1) a list of *.swift tests (plus *.sh scripts) -# 2) optionally a sites.template.xml -# 3) optionally a tc.template.data -# 4) optionally a fs.template.data -# 5) optionally a swift.properties -# 6) optionally a title.txt -# 7) preferably a README.txt -# 7) optionally a *.timeout -# template files are lightly processed by sed before use -# Missing files will be pulled from swift/etc - -# WHAT TESTS ARE RUN -# Each *.swift file is a test. -# suite.sh launches all tests in each GROUP in the GROUPLIST. -# The GROUPLIST is obtained from the GROUPARG. -# 1) The GROUPARG can be an external script in the -# groups/ subdirectory by the name of GROUPLISTFILE. -# The GROUPLISTFILE: -# 1) sets the array -# 2) checks any variables needed by make_sites_sed() -# 2) Or, the GROUPARG can just be a directory name that is -# the name of the singleton GROUP - -# OUTPUT is the stdout of the current test -# stdout.txt retains stdout from the previous test (for *.clean.sh) -# output_*.txt is the HTML-linked permanent output from a test - -# All timeouts in this script are in seconds - -# PID TREE: -# Background processes are used so that hung Swift jobs can be killed -# These are the background processes (PIDs are tracked) -# -# suite.sh -# +-monitor() -# +-sleep -# +-process_exec() -# +-bin/swift -# +-java -# -# PID management is now pretty good, but you may want to check ps -# from time to time and keep xload running. -# Note that Coasters may temporarily prevent Swift from exiting upon -# receiving a signal (cf. CoasterService.addLocalHook()). - -# FAILURE CASES -# Some cases are designed to cause Swift to crash. These -# SwiftScripts contain the token THIS-SCRIPT-SHOULD-FAIL somewhere. -# The response of suite.sh to the exit code of these Swift -# executions is reversed. - -# SCHEDULERS -# Environment must contain PROJECT, QUEUE, and WORK -# These variables will be incorporated into the sites.xml -# via make_sites_sed() -> group_sites_xml() -# Note that some schedulers restrict your choice of RUNDIR - -# NAMING -# Site-specific test groups are in providers/ . -# These are named: -# providers// -# or: -# providers// -# E.g., providers/local-pbs/PADS - -# ADDING TESTS TO EXISTING GROUPS -# Simply add a *.swift file to a GROUP directory. -# That script will be launched when the GROUP is tested. -# Optionally, you may add helper scripts (see above) to setup, -# check, and clean up after tests. -# The helper scripts are launched from the RUNDIR and have access -# to files in RUNDIR and environment variables from suite.sh -# such as $GROUP. Thus, you can: -# bring in input files: cp $GROUP/input-file.txt . -# check output: grep TEXT1 stdout.txt -# grep TEXT2 output-file.txt -# clean up (optional): rm output-file.txt -# The results are added to the HTML output, etc., automatically. -# The prefix number on each test is simply for sorting -# (e.g., ls *.swift) - -# ADDING TEST GROUPS -# If no existing group has the sites, tc, etc. that you need to test, -# you will need to add a test group. Simply create a new directory. -# Add files from TEST STRUCTURE if necessary; missing files will be -# filled in with defaults. - -# IMPROVING THIS TEST SUITE -# This is a work in progress. Here are some things you can do: -# * Run it! Report problems to swift-devel -# * Fix broken tests -# * Break down test GROUPs into smaller, meaningful GROUPs. -# It would be good to limit GROUP sizes to 20 or so tests. -# * Current work has focused on the HTML and stdout output, -# which is intended to be high-level and clean. Using -v -# results in extremely verbose output. -# Some happy medium could be achieved by improving the use of -# the LOG (tests.log). - -# PROBLEMS -# If you have a problem: -# * Use -v to get the set -x output. -# * Use ps -H to get the PID tree. - -# WARNINGS -# suite.sh uses shopt - shopt -s nullglob printhelp() { @@ -160,6 +7,7 @@ echo "usage:" printf "\t -a Do not run ant dist \n" printf "\t -c Do not remove dist (clean) \n" + printf "\t -f Generate plain text output file \n" printf "\t -h This message \n" printf "\t -k Skip first N tests \n" printf "\t -n Run N tests and quit \n" @@ -173,6 +21,7 @@ } # Defaults: +TEXTREPORT=0 DEFAULT_TIMEOUT=30 # seconds RUN_ANT=1 CLEAN=1 @@ -193,6 +42,9 @@ -c) CLEAN=0 shift;; + -f) + TEXTREPORT=1 + shift;; -h) printhelp exit 0;; @@ -249,6 +101,11 @@ LOG=$TOPDIR/$LOGBASE OUTPUT=$RUNDIR/exec.out +#Specifying the Path for the plain Text File. +REPORT_PATH=$RUNDIRBASE/tests-$DATE.txt +REPORT=$TOPDIR/$REPORT_PATH + +#Specifying the path for the HTML output file HTMLPATH=$RUNDIRBASE/tests-$DATE.html HTML=$TOPDIR/$HTMLPATH @@ -256,9 +113,11 @@ #BRANCH="branches/tests-01" SCRIPTDIR=$( cd $( dirname $0 ) ; /bin/pwd ) +touch /home/Alberto/$SCRIPTDIR TESTCOUNT=0 - +TESTSFAILED=0 +TESTSPASSED=0 MASTER_PID=$$ # PIDs to kill if suite.sh is killed: @@ -269,7 +128,7 @@ SHUTDOWN=0 echo "RUNNING_IN: $RUNDIR" -echo "HTML_OUTPUT: $HTML" +echo "HTML_OUTPUT: $REPORT" TESTDIR=$TOPDIR/cog/modules/swift/tests @@ -314,14 +173,21 @@ } header() { - CURRENT=$SCRIPTDIR/html/current.html - sed "s at _HTMLBASE_@$HTMLPATH@" < $CURRENT > $TOPDIR/current.html - - HEADER=$SCRIPTDIR/html/header.html - HOST=$( hostname ) - SEDCMD="s/_DATE_/$DATE/;s/_TIME_/$TIME/;s/_HOST_/$HOST"/ - sed $SEDCMD < $HEADER > $HTML - FIRSTTEST=1 + if [ $TEXTREPORT == 1 ]; then + HEADER=$SCRIPTDIR/html/header.txt + HOST=$( hostname ) + SEDCMD="s/_DATE_/$DATE/;s/_TIME_/$TIME/;s/_HOST_/$HOST"/ + sed $SEDCMD < $HEADER > $REPORT + FIRSTTEST=1 + else + CURRENT=$SCRIPTDIR/html/current.html + sed "s at _HTMLBASE_@$HTMLPATH@" < $CURRENT > $TOPDIR/current.html + HEADER=$SCRIPTDIR/html/header.html + HOST=$( hostname ) + SEDCMD="s/_DATE_/$DATE/;s/_TIME_/$TIME/;s/_HOST_/$HOST"/ + sed $SEDCMD < $HEADER > $HTML + FIRSTTEST=1 + fi } html() { @@ -451,42 +317,14 @@ shift done } - + outecho() { TYPE=$1 shift echo "<$TYPE>$1|$2|$3|$4|$5|$6|$7|$8|$9|" } -# Create HTML output -output_html() { - - TYPE=$1 - if [ "$TYPE" == "test" ]; then - - LABEL="$2" # Text on link to output - CMD=$3 # Command issued (td title) - RESULT=$4 # Passed or Failed - - # WIDTH=$( width "$LABEL" ) - if [ "$RESULT" == "Passed" ]; then - html_td class "success" width 25 title "$CMD" - html_a_href $TEST_LOG "$LABEL" - else - echo "FAILED" - cat $RUNDIR/$TEST_LOG < /dev/null - html_td class "failure" width 25 title "$CMD" - html_a_href $TEST_LOG $LABEL - fi - html_~td - - elif [ "$TYPE" == "package" ]; then - BINPACKAGE=$2 - else - html $@ - fi -} - +#Create the table, and the links for the test results HTML output start_test_results() { html_h1 "Test results" html_a_name "tests" @@ -494,57 +332,118 @@ html_table border 0 cellpadding 1 } +# Create either HTML or plain text report. +# $TEXTREPORT monitor whether the report will be plain text or HTML +output_report() { + TYPE=$1 + if [ $TEXTREPORT == 1 ]; then + if [ "$TYPE" == "test" ]; then + + LABEL="$2" # Text on link to output + CMD=$3 # Command issued (td title) + RESULT=$4 # Passed or Failed + + if [ "$RESULT" == "Passed" ]; then + printf %-10.10s "success">>$REPORT + else + echo "FAILED" + cat $RUNDIR/$TEST_LOG < /dev/null + printf %-10.10s "failure">>$REPORT + fi + + elif [ "$TYPE" == "package" ]; then + BINPACKAGE=$2 + else + printf $@>>$REPORT + fi + else + if [ "$TYPE" == "test" ]; then + + LABEL="$2" # Text on link to output + CMD=$3 # Command issued (td title) + RESULT=$4 # Passed or Failed + + # WIDTH=$( width "$LABEL" ) + if [ "$RESULT" == "Passed" ]; then + html_td class "success" width 25 title "$CMD" + html_a_href $TEST_LOG "$LABEL" + else + echo "FAILED" + cat $RUNDIR/$TEST_LOG < /dev/null + html_td class "failure" width 25 title "$CMD" + html_a_href $TEST_LOG $LABEL + fi + html_~td + + elif [ "$TYPE" == "package" ]; then + BINPACKAGE=$2 + else + html $@ + fi + fi +} + start_group() { G=$1 echo echo $G echo - html_tr group - html_th 3 - html "$G" - html_~th - html_~tr + if [ $TEXTREPORT == 1 ]; then + stars + printf "$G\n">>$REPORT + printf %-5.5s "#">>$REPORT + printf %-60.60s "Filename">>$REPORT + printf %-10.10s "Test">>$REPORT + printf %-10.10s "Setup.sh" "Check.sh" "Clean.sh">>$REPORT + printf "\n">>$REPORT + else + html_tr group + html_th 3 + html "$G" + html_~th + html_~tr + fi } start_row() { - html_tr testline - html_td align right width 50 - html "$TESTCOUNT" - html " " - html_~td - html_td align right - html " " - if [[ -n $TESTLINK ]]; then - html_a_href $TESTLINK $TESTNAME - else - html $TESTNAME - fi - html " " - html_~td - html_td - html_table - html_tr - SEQ=1 + if [ $TEXTREPORT == 1 ]; then + printf %-5.5s "$TESTCOUNT">>$REPORT + printf %-60.60s "$TESTNAME">>$REPORT + else + html_tr testline + html_td align right width 50 + html "$TESTCOUNT" + html " " + html_~td + html_td align right + html " " + if [[ -n $TESTLINK ]]; then + html_a_href $TESTLINK $TESTNAME + else + html $TESTNAME + fi + html " " + html_~td + html_td + html_table + html_tr + fi + SEQ=1 } end_row() { - html_~tr - html_~table - html_~td - html_~tr + if [ $TEXTREPORT == 1 ]; then + printf "\n">>$REPORT + else + html_~tr + html_~table + html_~td + html_~tr + fi } -# HTML width of label (for alignment) -width() { - LABEL="$1" - if [ ${#LABEL} -gt 2 ]; then - WIDTH="" - else - WIDTH="width=\"20\"" - fi - echo $WIDTH -} - +# Create test output_*.txt file and copy to stdout.txt +# Rename to copy_output? # TEST_LOG = test log test_log() { TEST_LOG="output_$LOGCOUNT.txt" @@ -557,10 +456,11 @@ } stars() { - for i in {1..90} + for i in {1..120} do - printf "*" + printf "*">>$REPORT done + printf "\n">>$REPORT echo } @@ -661,7 +561,7 @@ RESULT=$( result ) test_log - output_html test $SEQ "$LASTCMD" $RESULT $TEST_LOG + output_report test $SEQ "$LASTCMD" $RESULT $TEST_LOG check_bailout @@ -746,9 +646,21 @@ echo "TOOK (seconds): $(( STOP-START ))" RESULT=$( result ) + NOPASO="Failed" + +#Verifies the value of $RESULT, if the test was successful +#increases $TESTSPASSED by 1, if the test Failed +#increases $TESTSFAILED by 1. + if [ "$RESULT" != "Passed" ]; then + let TESTSFAILED=$TESTSFAILED+1 + else + let TESTSPASSED=$TESTSPASSED+1 + fi + + test_log LASTCMD="$@" - output_html test $SEQ "$LASTCMD" $RESULT $TEST_LOG + output_report test $SEQ "$LASTCMD" $RESULT $TEST_LOG check_bailout @@ -764,7 +676,7 @@ RESULT=$( result ) test_log - output_html test "$SYMBOL" "$LASTCMD" $RESULT + output_report test "$SYMBOL" "$LASTCMD" $RESULT check_bailout } @@ -882,7 +794,7 @@ test_exec rm -f castor*.jar *gt2ft*.jar ant.jar test_exec cd $TOPDIR test_exec tar -pczf $RUNDIR/swift-$DATE.tar.gz $SWIFT_HOME - output_html package "swift-$DATE.tar.gz" + output_report package "swift-$DATE.tar.gz" } # Generate the sites.sed file @@ -965,6 +877,32 @@ fi } +# Print the number of tests run, failed and passed. +# Revision:001 +group_statistics(){ + if [ $TEXTREPORT == 1 ]; then + printf "\n $TESTCOUNT Tests run\t$TESTSFAILED Tests failed\t$TESTSPASSED Tests succeeded. \n\n">>$REPORT + else +# html_tr group +# html_td neutral +# html "$TESTCOUNT Tests run" +# html_~td +# html_td success +# html "$TESTSPASSED Tests succeeded" +# html_~td +# html_td failure +# html "$TESTSFAILED Tests failed" +# html_~td +# html_~tr + printf "
    $TESTCOUNT Tests run. $TESTSPASSED Tests succeeded. $TESTSFAILED Tests failed.
    $TESTCOUNT Tests run. $TESTSPASSED Tests succeeded. $TESTSFAILED Tests failed.
    - list page + list page - archives + archives Swift user support and general questions. @@ -54,10 +54,10 @@ swift-developer - list page + list page - archives + archives From jonmon at ci.uchicago.edu Wed Jun 29 09:49:14 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Wed, 29 Jun 2011 09:49:14 -0500 (CDT) Subject: [Swift-commit] r4705 - trunk/docs/userguide Message-ID: <20110629144914.880809CCBF@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-29 09:49:14 -0500 (Wed, 29 Jun 2011) New Revision: 4705 Modified: trunk/docs/userguide/mappers Log: o added documentation for the structured regular expression mapper Modified: trunk/docs/userguide/mappers =================================================================== --- trunk/docs/userguide/mappers 2011-06-29 14:06:02 UTC (rev 4704) +++ trunk/docs/userguide/mappers 2011-06-29 14:49:14 UTC (rev 4705) @@ -646,7 +646,36 @@ |f|picture.jpg |============= +structured regular expression mapper +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +The structured_regexp_mapper is similar to the regexp_mapper. The +structured_regexp_mapper can be applied to lists while the regexp_mapper cannot. +[options="header, autowidth"] +|========== +|parameter|meaning +|source|The source file name +|match|Regular expression pattern to match, use |()| to match whatever +regular expression is inside the parentheses, and indicate the start and +end of a group; the contents of a group can be retrieved with the +|\\number|special sequence (two backslashes are needed because the +backslash is an escape sequence introducer) +|transform|The pattern of the file name to transform to, use \number to +reference the group matched. +|========== + +Example: +---- +string s[] = ["picture.gif", "hello.gif", "world.gif"]; +file f[] ; +---- + +This example transforms all strings in a list that end in gif to end in jpg and maps +the list to those files. + csv mapper ~~~~~~~~~~ The csv_mapper maps the content of a CSV (comma-separated value) file From jonmon at ci.uchicago.edu Wed Jun 29 10:28:31 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Wed, 29 Jun 2011 10:28:31 -0500 (CDT) Subject: [Swift-commit] r4707 - in SwiftApps/SwiftMontage: etc scripts Message-ID: <20110629152831.AC6E99CCBF@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-29 10:28:31 -0500 (Wed, 29 Jun 2011) New Revision: 4707 Modified: SwiftApps/SwiftMontage/etc/swift_montage.properties SwiftApps/SwiftMontage/scripts/Swift_Montage_Apps.swift SwiftApps/SwiftMontage/scripts/Swift_Montage_Batch.swift SwiftApps/SwiftMontage/scripts/Swift_Montage_Types.swift SwiftApps/SwiftMontage/scripts/montage.swift Log: o merged changes Modified: SwiftApps/SwiftMontage/etc/swift_montage.properties =================================================================== --- SwiftApps/SwiftMontage/etc/swift_montage.properties 2011-06-29 15:01:10 UTC (rev 4706) +++ SwiftApps/SwiftMontage/etc/swift_montage.properties 2011-06-29 15:28:31 UTC (rev 4707) @@ -4,4 +4,5 @@ wrapper.log.always.transfer=true foreach.maxthreads=1024 wrapper.parameter.mode=files - +use.provider.staging=true +provider.staging.pin.swiftfiles=false Modified: SwiftApps/SwiftMontage/scripts/Swift_Montage_Apps.swift =================================================================== --- SwiftApps/SwiftMontage/scripts/Swift_Montage_Apps.swift 2011-06-29 15:01:10 UTC (rev 4706) +++ SwiftApps/SwiftMontage/scripts/Swift_Montage_Apps.swift 2011-06-29 15:28:31 UTC (rev 4707) @@ -1,18 +1,18 @@ -app ( Image mos ) mAdd( Image imgs[], Table img_tbl, MosaicData hdr ) +app ( Image mos ) mAdd( Image imgs[], Table img_tbl, Header hdr ) { mAdd "-p" @dirname( imgs[0] ) "-n" @img_tbl @hdr @mos; } -app ( Image bg_img ) mBackground( Image img, float a, float b, float c ) +app ( Image rc_img ) mBackground( Image img, float a, float b, float c ) { - mBackground "-n" @img @bg_img a b c; + mBackground "-n" @img @rc_img a b c; } -app ( Table corr_tbl ) mBgModel( Table img_tbl, Table fits_tbl ) +app ( Table rect_tbl ) mBgModel( Table img_tbl, Table fits_tbl ) { - mBgModel @img_tbl @fits_tbl @corr_tbl; + mBgModel @img_tbl @fits_tbl @rect_tbl; } @@ -22,23 +22,20 @@ } -app ( Image diff_img ) mDiff( Image proj_img_1, Image proj_img_2, MosaicData hdr ) +app ( Image diff_img ) mDiff( Image proj_img_1, Image proj_img_2, Header hdr ) { -// mDiff "-n" @proj_img_1 @proj_img_2 @diff_img @hdr; mDiff_wrap "-n" @proj_img_1 @proj_img_2 @diff_img @hdr; } -app ( Image diff_img, Status stat ) mDiffFit( Image img_1, Image img_2, MosaicData hdr ) +app ( Image diff_img, Status stat ) mDiffFit( Image img_1, Image img_2, Header hdr ) { -// mDiffFit "-n" "-s" @stat @img_1 @img_2 @diff_img @hdr; mDiffFit_wrap "-n" "-s" @stat @img_1 @img_2 @diff_img @hdr; } app ( Status stat ) mFitplane( Image diff_img ) { -// mFitplane "-s" @stat @diff_img; mFitplane_wrap "-s" @stat @diff_img; } @@ -49,7 +46,7 @@ } -app ( MosaicData hdr ) mMakeHdr( Table img_tbl ) +app ( Header hdr ) mMakeHdr( Table img_tbl ) { mMakeHdr @img_tbl @hdr; } @@ -67,13 +64,13 @@ } -app ( Image proj_img ) mProjectPP( Image raw_img, MosaicData hdr ) +app ( Image proj_img ) mProjectPP( Image raw_img, Header hdr ) { mProjectPP "-X" @raw_img @proj_img @hdr; } -app ( Image proj_img ) mProject( Image raw_img, MosaicData hdr ) +app ( Image proj_img ) mProject( Image raw_img, Header hdr ) { mProject "-X" @raw_img @proj_img @hdr; } @@ -89,9 +86,9 @@ /* */ /*----------------------------------------------------------------------------------*/ -app ( Table back_tbl ) Background_list( Table imgs_tbl, Table corrs_tbl ) +app ( Table back_tbl ) Background_list( Table imgs_tbl, Table rects_tbl ) { - Background_list @imgs_tbl @corrs_tbl @back_tbl; + Background_list @imgs_tbl @rects_tbl @back_tbl; } Modified: SwiftApps/SwiftMontage/scripts/Swift_Montage_Batch.swift =================================================================== --- SwiftApps/SwiftMontage/scripts/Swift_Montage_Batch.swift 2011-06-29 15:01:10 UTC (rev 4706) +++ SwiftApps/SwiftMontage/scripts/Swift_Montage_Batch.swift 2011-06-29 15:28:31 UTC (rev 4707) @@ -19,16 +19,16 @@ } -( Image diff_imgs[] ) mDiffBatch( string src_dir, string dest_dir, Table diff_tbl, MosaicData hdr ) +( Image diff_imgs[] ) mDiffBatch( string src, string dest, Table diff_tbl, Header hdr ) { DiffStruct diffs[] ; foreach d_entry, i in diffs { - Image img_1 ; - Image img_2 ; + Image img_1 ; + Image img_2 ; - Image diff_img ; + Image diff_img ; diff_img = mDiff( img_1, img_2, hdr ); diff_imgs[ i ] = diff_img; @@ -36,7 +36,7 @@ } -( Image diff_imgs[], Table fits_tbl ) mDiffFitBatch( string src_dir, string dest_dir, string stat_dir, string files[], Table diff_tbl, MosaicData hdr ) +( Image diff_imgs[], Table fits_tbl ) mDiffFitBatch( string src, string dest, string stat, string files[], Table diff_tbl, Header hdr ) { DiffStruct diffs[] ; Status stats[]; @@ -45,24 +45,24 @@ foreach d_entry, i in diffs { - Image img_1 ; - Image img_2 ; + Image img_1 ; + Image img_2 ; - Image diff_img ; - Status stat ; + Image diff_img ; + Status stat_file ; - ( diff_img, stat ) = mDiffFit( img_1, img_2, hdr ); + ( diff_img, stat_file ) = mDiffFit( img_1, img_2, hdr ); diff_imgs[ i ] = diff_img; - stats[ i ] = stat; + stats[ i ] = stat_file; } fits_tbl = mConcatFit( status_tbl, stats ); } -( Table fits_tbl ) mFitBatch( string stat_dir, Image diff_imgs[], Table diff_tbl ) +( Table fits_tbl ) mFitBatch( string stat, Image diff_imgs[], Table diff_tbl ) { - Status stats[] ; + Status stats[] ; Table status_tbl = create_status_table( diff_tbl ); @@ -75,7 +75,7 @@ } -( Image proj_imgs[] ) mProjectBatch( string dest, Image raw_imgs[], MosaicData hdr ) +( Image proj_imgs[] ) mProjectBatch( string dest, Image raw_imgs[], Header hdr ) { foreach img, i in raw_imgs { Modified: SwiftApps/SwiftMontage/scripts/Swift_Montage_Types.swift =================================================================== --- SwiftApps/SwiftMontage/scripts/Swift_Montage_Types.swift 2011-06-29 15:01:10 UTC (rev 4706) +++ SwiftApps/SwiftMontage/scripts/Swift_Montage_Types.swift 2011-06-29 15:28:31 UTC (rev 4707) @@ -1,5 +1,5 @@ type Image; -type MosaicData; +type Header; type Table; type JPEG; type Status; Modified: SwiftApps/SwiftMontage/scripts/montage.swift =================================================================== --- SwiftApps/SwiftMontage/scripts/montage.swift 2011-06-29 15:01:10 UTC (rev 4706) +++ SwiftApps/SwiftMontage/scripts/montage.swift 2011-06-29 15:28:31 UTC (rev 4707) @@ -1,36 +1,31 @@ -import "Swift_Montage_Types"; -import "Swift_Montage_Apps"; -import "Swift_Montage_Batch"; +import "SwiftMontage"; -MosaicData header <"header.hdr">; +Header header <"header.hdr">; Table images_tbl <"images.tbl">; -Table raw_images_tbl <"raw-images.tbl">; Table difference_tbl <"diffs.tbl">; Table fits_images_tbl <"fits.tbl">; Table corrections_tbl <"corrections.tbl">; Table stat_tbl <"stats.tbl">; -Image corrected_mos <"final/corrected.fits">; -JPEG corrected_jpg_img <"final/corrected.jpg">; +Image rectified_mos <"final/rectified.fits">; +JPEG rectified_jpg_img <"final/rectified.jpg">; Image projected_images[]; Image difference_images[]; -Image corrected_images[]; +Image rectified_images[]; Image raw_image_files[] ; -//difference_tbl = mOverlaps( raw_images_tbl ); +projected_images = mProjectBatch( "proj_dir", raw_image_files, header ); -projected_images = mProjectBatch( raw_image_files, header ); - images_tbl = mImgtbl( projected_images ); difference_tbl = mOverlaps( images_tbl ); -( difference_images, fits_images_tbl ) = mDiffFitBatch( "proj_dir", "diff_dir", @filenames(projected_images), difference_tbl, header ); +( difference_images, fits_images_tbl ) = mDiffFitBatch( "proj_dir", "diff_dir", "stat_dir", @filenames(projected_images), difference_tbl, header ); corrections_tbl = mBgModel( images_tbl, fits_images_tbl ); -corrected_images = mBackgroundBatch( projected_images, images_tbl, corrections_tbl ); +rectified_images = mBackgroundBatch( "corr_dir", projected_images, images_tbl, corrections_tbl ); -corrected_mos = mAdd( corrected_images, images_tbl, header ); +rectified_mos = mAdd( rectified_images, images_tbl, header ); -corrected_jpg_img = mJPEG( corrected_mos ); +rectified_jpg_img = mJPEG( rectified_mos ); From jonmon at ci.uchicago.edu Wed Jun 29 12:51:28 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Wed, 29 Jun 2011 12:51:28 -0500 (CDT) Subject: [Swift-commit] r4708 - SwiftApps Message-ID: <20110629175128.D482B9CCA2@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-29 12:51:28 -0500 (Wed, 29 Jun 2011) New Revision: 4708 Added: SwiftApps/GOSwift/ Log: o added GOSwift directory From jonmon at ci.uchicago.edu Wed Jun 29 12:54:20 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Wed, 29 Jun 2011 12:54:20 -0500 (CDT) Subject: [Swift-commit] r4709 - SwiftApps/GOSwift Message-ID: <20110629175420.BB1379CCA2@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-29 12:54:20 -0500 (Wed, 29 Jun 2011) New Revision: 4709 Added: SwiftApps/GOSwift/koa-goswift Log: o added the goswift execute script Added: SwiftApps/GOSwift/koa-goswift =================================================================== --- SwiftApps/GOSwift/koa-goswift (rev 0) +++ SwiftApps/GOSwift/koa-goswift 2011-06-29 17:54:20 UTC (rev 4709) @@ -0,0 +1,15 @@ +#!/bin/sh + +if [ -z "$KOA_HOME" ]; then + echo "Error: KOA_HOME must be set" + exit 1 +fi + +if [ -s "$KOA_USER" ]; then + echo "Error: KOA_USER must be set" + exit 1 +fi + +export KOA_API_11=TRUE + +exec $KOA_HOME/pykoa/tools/koa_goswift.py "$@" Property changes on: SwiftApps/GOSwift/koa-goswift ___________________________________________________________________ Added: svn:executable + * From jonmon at ci.uchicago.edu Wed Jun 29 12:55:51 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Wed, 29 Jun 2011 12:55:51 -0500 (CDT) Subject: [Swift-commit] r4710 - in SwiftApps/GOSwift: . bin Message-ID: <20110629175551.4BD979CCA2@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-29 12:55:51 -0500 (Wed, 29 Jun 2011) New Revision: 4710 Added: SwiftApps/GOSwift/bin/ SwiftApps/GOSwift/bin/koa-goswift Removed: SwiftApps/GOSwift/koa-goswift Log: o moved to a different directory Copied: SwiftApps/GOSwift/bin/koa-goswift (from rev 4709, SwiftApps/GOSwift/koa-goswift) =================================================================== --- SwiftApps/GOSwift/bin/koa-goswift (rev 0) +++ SwiftApps/GOSwift/bin/koa-goswift 2011-06-29 17:55:51 UTC (rev 4710) @@ -0,0 +1,15 @@ +#!/bin/sh + +if [ -z "$KOA_HOME" ]; then + echo "Error: KOA_HOME must be set" + exit 1 +fi + +if [ -s "$KOA_USER" ]; then + echo "Error: KOA_USER must be set" + exit 1 +fi + +export KOA_API_11=TRUE + +exec $KOA_HOME/pykoa/tools/koa_goswift.py "$@" Deleted: SwiftApps/GOSwift/koa-goswift =================================================================== --- SwiftApps/GOSwift/koa-goswift 2011-06-29 17:54:20 UTC (rev 4709) +++ SwiftApps/GOSwift/koa-goswift 2011-06-29 17:55:51 UTC (rev 4710) @@ -1,15 +0,0 @@ -#!/bin/sh - -if [ -z "$KOA_HOME" ]; then - echo "Error: KOA_HOME must be set" - exit 1 -fi - -if [ -s "$KOA_USER" ]; then - echo "Error: KOA_USER must be set" - exit 1 -fi - -export KOA_API_11=TRUE - -exec $KOA_HOME/pykoa/tools/koa_goswift.py "$@" From jonmon at ci.uchicago.edu Wed Jun 29 13:20:06 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Wed, 29 Jun 2011 13:20:06 -0500 (CDT) Subject: [Swift-commit] r4711 - in SwiftApps/GOSwift: . pykoa pykoa/tools sbin Message-ID: <20110629182006.A02AD9CCBF@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-29 13:20:06 -0500 (Wed, 29 Jun 2011) New Revision: 4711 Added: SwiftApps/GOSwift/pykoa/ SwiftApps/GOSwift/pykoa/tools/ SwiftApps/GOSwift/pykoa/tools/koa_goswift.py SwiftApps/GOSwift/sbin/ SwiftApps/GOSwift/sbin/remote-cli.py Log: o backing up files for goswift Added: SwiftApps/GOSwift/pykoa/tools/koa_goswift.py =================================================================== --- SwiftApps/GOSwift/pykoa/tools/koa_goswift.py (rev 0) +++ SwiftApps/GOSwift/pykoa/tools/koa_goswift.py 2011-06-29 18:20:06 UTC (rev 4711) @@ -0,0 +1,43 @@ +#!/usr/bin/python +import os +import sys +import uuid +import datetime +import readline +import time +import signal +from optparse import OptionGroup + +from sqlalchemy.sql import text + +import pykoa +import pykoa.tools +from pykoa.constants import GroupStatusCodes as grpc +from pykoa.consumers import guc_util +from pykoa.koaexception import ToolsException, cli_exception_handler +from pykoa.tools.url_parse import SCPUrl +from pykoa.tools.koa_ep_activate import check_explicit_activate +from pykoa.tools import koa_cancel +from pykoa.tools import koa_transfer +from pykoa.tools import myproxy +from pykoa.tools import koa_wait +from pykoa.data import groups_dao +from pykoa.data import endpoint_dao +from pykoa.data import creds_dao +from pykoa.data import preflight_dao + + + at cli_exception_handler +def main( argv=sys.argv[1:] ): + guc_util.init_guc_env() + + conn = pykoa.connect() + user_row = pykoa.tools.cli_get_user( conn ) + user_id = user_row.id + + sys.stdout.write( "Executing Swift on: " + argv[0] + "\n" ) + return 0 + +if __name__ == "__main__": + rc = main() + sys.exit(rc) Property changes on: SwiftApps/GOSwift/pykoa/tools/koa_goswift.py ___________________________________________________________________ Added: svn:executable + * Added: SwiftApps/GOSwift/sbin/remote-cli.py =================================================================== --- SwiftApps/GOSwift/sbin/remote-cli.py (rev 0) +++ SwiftApps/GOSwift/sbin/remote-cli.py 2011-06-29 18:20:06 UTC (rev 4711) @@ -0,0 +1,542 @@ +#!/usr/bin/python -u +import readline +import shlex +import os +import sys +import subprocess +import signal +import setproctitle + +""" +[gsi]ssh commands all run this program. We get the original command from +SSH_ORIGINAL_COMMAND +XXX: We are losing quotes, or at least token separators using +SSH_ORIGINAL_COMMAND. We should patch sshd to url encode the arguments so +spaces are included. + +Note: Do not import any pykoa modules. Those will stay cached and +could cause problems if you change them on a running instance. +""" + + +# XXX: Use /usr/local/koa symlink +g_base_dir = '/home/koa/live_version' + +shell_aliases = {} +shell_aliases['exit'] = "exit" +shell_aliases['quit'] = "exit" +shell_aliases['?'] = "help" +shell_aliases['h'] = "help" + +HELP_BANNER = """\ +Type ' -h' for basic help on a command. +Type 'man ' for detailed help. + +Task Management: cancel modify + details status + events wait + +Task Creation: scp transfer + +Endpoint Management: endpoint-add endpoint-modify + endpoint-activate endpoint-remove + endpoint-deactivate endpoint-rename + endpoint-list diagnose (beta) + +Other: help profile (deprecated) + history reset + ls versions + man +""" + + +prog_map = {} + +# Builtins and other scripts +prog_map['help'] = "" +prog_map['versions'] = "" +prog_map['history'] = "" +prog_map['reset'] = "%s/bin/koa-reset" % g_base_dir + +# Note: This block generated by ../pykoa/tools/script_map.py +prog_map['cancel'] = 'pykoa.tools.koa_cancel' +prog_map['details'] = 'pykoa.tools.koa_details' +prog_map['diagnose'] = 'pykoa.tools.koa_diagnose' +prog_map['endpoint-activate'] = 'pykoa.tools.koa_ep_activate' +prog_map['endpoint-add'] = 'pykoa.tools.koa_ep_add' +prog_map['endpoint-deactivate'] = 'pykoa.tools.koa_ep_deactivate' +prog_map['endpoint-list'] = 'pykoa.tools.koa_ep_list' +prog_map['endpoint-modify'] = 'pykoa.tools.koa_ep_modify' +prog_map['endpoint-remove'] = 'pykoa.tools.koa_ep_remove' +prog_map['endpoint-rename'] = 'pykoa.tools.koa_ep_rename' +prog_map['events'] = 'pykoa.tools.koa_events' +prog_map['goswift'] = 'pykoa.tools.koa_goswift' +prog_map['ls'] = 'pykoa.tools.koa_ls' +prog_map['man'] = 'pykoa.tools.koa_man' +prog_map['modify'] = 'pykoa.tools.koa_modify' +prog_map['profile'] = 'pykoa.tools.koa_profile' +prog_map['report'] = 'pykoa.tools.koa_report' +prog_map['scp'] = 'pykoa.tools.koa_scp' +prog_map['status'] = 'pykoa.tools.koa_status' +prog_map['transfer'] = 'pykoa.tools.koa_transfer' +prog_map['wait'] = 'pykoa.tools.koa_wait' + +g_version_set = False +g_manpages = None +g_sig_save = None +g_preloaded = False +g_user = "" + +HELP_COMMANDS = [x for x in prog_map.keys() if x != "report"] + +def get_man_pages(): + # Lazy loading + global g_manpages + if g_manpages: + return g_manpages + g_manpages = os.listdir(g_base_dir + "/man") + g_manpages = [x.replace(".1", "") for x in g_manpages if x.endswith(".1")] + return g_manpages + + +def preload_modules(): + # Note: For extra safety, we do not preload pykoa modules. + # We don't want to change these on production and have to + # boot people off the CLI for changes to be applied. + global g_preloaded + if g_preloaded: + return + import uuid, re, ctypes, logging + import gettext, locale, optparse + import sqlalchemy.sql + import sqlalchemy.exc + import sqlalchemy.dialects.postgresql + import psycopg2 + g_preloaded = True + + +def setup_child(short_name, args): + # Use separate logs rather than the remote cli log. + #import pykoa + #pykoa.config.configure_logging(short_name) + + # Set proper title for ps instead of 'remote-cli.py' + if args: + title = "[%s %s]" % (short_name, " ".join(args)) + else: + title = "[%s]" % short_name + setproctitle.setproctitle(title) + + +def completer(text, state): + cmds = HELP_COMMANDS[:] + # Auto complete man command + if text.startswith("man"): + cmds += ["man " + x for x in get_man_pages()] + if text.startswith("help"): + cmds += ["help " + x for x in HELP_COMMANDS] + options = [x for x in cmds if x.startswith(text)] + try: + return options[state] + except IndexError: + return None + + +# Note: only called for shell mode +def line_translate(line): + line = line.strip() + cmd = shell_aliases.get(line) + if not cmd: + cmd = line + return cmd + + +def do_version(args): + if "-v" in args: + # verbose + print "SVN Version:", \ + os.popen("svnversion " + g_base_dir).readline().strip() + return 0 + + if args: + print """\ +Usage: versions [-v] + +Display versions of services supported by the server. + +Type 'man versions' for details. \ +""" + if "-h" in args or "--help" in args: + return 0 + else: + return 2 + + print "transfer/1.2" + print "transfer/1.1" + print "transfer/1.0" + return 0 + + +def shell(): + """ + Read commands from user and execute them + """ + + # Read history + readline.set_history_length(1000) + load_history() + + readline.set_completer(completer) + readline.parse_and_bind("tab: complete") + # For some reason, - is in the default delims. + # Reset it to default bash delimiters. + readline.set_completer_delims("\t\n\"\\'`@$><=;|&{(") + + print "Welcome to globusonline.org, %s. Type 'help' for help." % ( + g_user) + while True: + try: + line = raw_input("$ ") + # readline automatically adds lines to the history buffer + line = line_translate(line) + if line == "exit": + break + args = do_split(line) + if args is not None: + handle_cmd(args) + except KeyboardInterrupt: + sys.stdout.write("\n") + except EOFError: + break + + save_history() + + +def connect_to_db(): + import psycopg2 + from ConfigParser import SafeConfigParser + + s = SafeConfigParser() + s.read("/etc/koa/koa.ini") + host = s.get("db", "dbhost") + conn = psycopg2.connect(database='koa', host=host, user='cliuser', + password='cliuser') + conn.set_isolation_level(0) # Autocommit + return conn + + +def load_history(): + """ + Load history from db. + If a user row doesn't exist, add a row so the save function can just assume + an UPDATE will work. (Postgres doesn't support MERGE yet) + """ + conn = connect_to_db() + cur = conn.cursor() + cur.execute("select history from user_history where name = %s", + (g_user,)) + ret = cur.fetchone() + if ret: + # Could have a null history, if they logged in and died + if ret[0]: + for cmd in ret[0].rstrip().split('\n'): + readline.add_history(cmd) + else: + cur.execute("insert into user_history (name) values (%s)", + (g_user,)) + cur.close() + conn.close() + + +def save_history(): + """ + Save history to database. + We just make a text blob, lines with '\n' endings + """ + n = readline.get_current_history_length() + buf = "" + for i in range(0, n): + cmd = readline.get_history_item(i + 1) + if cmd.strip(): + buf += cmd + "\n" + + conn = connect_to_db() + cur = conn.cursor() + cur.execute("update user_history set history = %s where name = %s", + (buf, g_user)) + cur.close() + conn.close() + + +def restore_signals(): + # We don't want to inherit an ignored SIGINT mask, at least + # for xfer and scp commands that the user may want to cancel. + signal.signal(signal.SIGINT, g_sig_save) + + +def do_variable_set(v): + key, value = v.split("=", 1) + if key == "v": + return do_set_version(value) + else: + sys.stderr.write("Unknown variable '%s'\n" % key) + return False + + +def do_set_version(value): + global g_version_set + if ":" not in value: + sys.stderr.write("Please specify your user agent string when " + + "requesting a version.\n") + sys.stderr.write("Example: v=1.0:MyProgram/3.1 \n") + return False + try: + version, user_agent = value.split(":") + except: + sys.stderr.write("Invalid user agent string\n") + return False + + if len(user_agent) < 6: + sys.stderr.write("User agent string too short\n") + return False + + service = 'transfer' + if '/' in version: + try: + service, version = version.split("/") + except: + sys.stderr.write("Invalid version string\n") + return False + + if service != 'transfer': + sys.stderr.write("Unknown service '%s'\n" % service) + return False + + if version == "1.0": + g_version_set = True + return True + + if version in ("1.1", "1.2"): + # The existence of this variable is checked, value can be anything + os.environ["KOA_API_11"] = "TRUE" + g_version_set = True + return True + + sys.stderr.write("This service does not support '%s/%s'\n" % ( + service, version)) + return False + + +def do_help(args): + if args: + print """\ +Usage: help [command] + +With no arguments, display available commands. Help 'command' is equivalent +to calling 'command -h'. \ +""" + if "-h" in args or "--help" in args: + return 0 + else: + return 2 + print HELP_BANNER + return 0 + + +def do_split(s): + """ + Split @s into parts, using 'quotes' and \ escaping. + On error, display error to stderr and return None. + Save original command (with quotes) to KOA_COMMAND. + """ + try: + os.environ['KOA_COMMAND'] = s + ret = shlex.split(s) + return ret + except ValueError, e: + sys.stderr.write("Error: %s\n" % e) + return None + + +def do_history(args): + end = readline.get_current_history_length() + start = 0 + + usage = """\ +Usage: history [N] + +Display commands used in current and previous sessions. +If N is given, display only the most recent N commands.\ +""" + + if args: + if "-h" in args or "--help" in args: + print usage + return 0 + elif not args[0].startswith("-"): + try: + limit = int(args[0]) + start = end - limit + except ValueError: + sys.stderr.write("Invalid number '%s'\n" % args[0]) + print usage + return 2 + else: + print usage + return 2 + + for i in range(start, end): + cmd = readline.get_history_item(i + 1) + print " %-6d %s" % (i + 1, cmd) + + +def log_timing(cmd): + if False: + import time + print "%.03f %s" % (time.time(), cmd) + + +def _run_command(args): + """ + Fork and exec/import module + """ + cmd = args[0] + args = args[1:] + is_module = False + if cmd.startswith("pykoa.tools"): + # Make sure interactive and noninteractive have the + # same code paths + preload_modules() + is_module = True + + pid = os.fork() + if pid == 0: + restore_signals() + if not is_module: + # Exec + args = [os.path.basename(cmd)] + args + os.execv(cmd, args) + else: + short_name = cmd.split(".")[-1] + log_timing('setup-child') + setup_child(short_name, args) + log_timing('import') + #old_modules = sys.modules.keys()[:] + mod = __import__(cmd, globals(), locals(), ['main']) + #for m in sys.modules.keys(): + #if m not in old_modules: + #print "new: %s" % m + log_timing('run') + rc = mod.main(args) + log_timing('done') + sys.exit(rc) + else: + rc = os.waitpid(pid, 0)[1] + rc = os.WEXITSTATUS(rc) + return rc + + +def run_command(args): + """ + Run command and return rc code + """ + # Disable sigint to ourself while cmd is running + # Readline puts in a signal handler. Save it. + global g_sig_save + g_sig_save = signal.getsignal(signal.SIGINT) + signal.signal(signal.SIGINT, signal.SIG_IGN) + rc = _run_command(args) + signal.signal(signal.SIGINT, g_sig_save) + return rc + + +def handle_cmd(args): + """ + Run command and return exit code + """ + if not args: + return 1 + + if args and args[0].startswith("v="): + sys.stderr.write("Error: Version may only be set " + \ + "when starting a shell\n") + return 1 + + # help cmd = alias for cmd -h + progname = args[0] + if progname == "help" and len(args) == 2: + progname = args[1] + args[1:] = ["-h"] + + if progname == "help": + return do_help(args[1:]) + elif progname == "versions": + return do_version(args[1:]) + elif progname == "history": + return do_history(args[1:]) + else: + prog = prog_map.get(progname) + if not prog: + msg = "Command '%s' not found. Type 'help' for help.\n" + sys.stderr.write(msg % progname) + return 1 + fire = [prog] + args[1:] + return run_command(fire) + + +def main(): + global g_user + + # Down for maintenance? + FLAG_FILE = "/tmp/koa-down" + if os.path.exists(FLAG_FILE): + for l in open(FLAG_FILE): + sys.stderr.write(l) + return 1 + + # We are running as a user account via ssh/gsissh. Set our user name. + # We could do os.getuid() and pwd.getpwuid(), but ssh sets USER for us + # so that's more efficient. + g_user = os.environ['KOA_USER'] = os.environ['USER'] + os.environ['KOA_HOME'] = g_base_dir + os.environ['PYTHONPATH'] = g_base_dir + sys.path.append(g_base_dir) + os.environ['PATH'] = '/usr/local/globus/bin:/usr/local/globus/sbin:' + \ + os.environ['PATH'] + os.environ['GLOBUS_LOCATION'] = '/usr/local/globus' + os.environ['LD_LIBRARY_PATH'] = '/usr/local/globus/lib' + + cmd = os.environ.get('SSH_ORIGINAL_COMMAND', '') + cmd = cmd.strip() + + # Attempt parse + args = do_split(cmd) + if args is None: + return 1 + + # Check variable setting + if args and "=" in args[0]: + if not do_variable_set(args[0]): + return 1 + args = args[1:] + + # Set default version level + if not g_version_set: + os.environ["KOA_API_11"] = "TRUE" + + if not args: + setproctitle.setproctitle("[cli shell]") + preload_modules() + shell() + rc = 0 + else: + setproctitle.setproctitle("[cli run]") + rc = handle_cmd(args) + + return rc + + +if __name__ == "__main__": + rc = main() + sys.exit(rc) + Property changes on: SwiftApps/GOSwift/sbin/remote-cli.py ___________________________________________________________________ Added: svn:executable + * From jonmon at ci.uchicago.edu Wed Jun 29 14:52:35 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Wed, 29 Jun 2011 14:52:35 -0500 (CDT) Subject: [Swift-commit] r4712 - SwiftApps/GOSwift/pykoa/tools Message-ID: <20110629195235.DDE879CCA2@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-29 14:52:35 -0500 (Wed, 29 Jun 2011) New Revision: 4712 Modified: SwiftApps/GOSwift/pykoa/tools/koa_goswift.py Log: o added so the command can now be run from GlobusOnline and does something. Modified: SwiftApps/GOSwift/pykoa/tools/koa_goswift.py =================================================================== --- SwiftApps/GOSwift/pykoa/tools/koa_goswift.py 2011-06-29 18:20:06 UTC (rev 4711) +++ SwiftApps/GOSwift/pykoa/tools/koa_goswift.py 2011-06-29 19:52:35 UTC (rev 4712) @@ -27,15 +27,56 @@ from pykoa.data import preflight_dao +def setup_opts(argv): + # Set up help message + help_screen = """ \ +goswift [options] < \"goswift.package\" + +Executes Swift under Globus Online. The must be logical sites. This will not work for physical sites. +Add site using enpoint-add and configure site using endpoint-modify. + +Note: localhost runs on the VM.\ +""" + + # parse out options + parser = pykoa.tools.get_option_parser(help_screen) + parser.add_option("--dry-run", dest="do_not_execute", + default=False, action="store_true", + help="Output the Swift command line that will execute the workflow") + + + (options, args) = pykoa.tools.parse_args(parser, argv) + + return (parser, options, args) + +# Do not know what this syntax is @cli_exception_handler def main( argv=sys.argv[1:] ): + (parser, options, args) = setup_opts(argv) + + # Not sure what these lines do yet, just copied from koa-ly.py guc_util.init_guc_env() conn = pykoa.connect() user_row = pykoa.tools.cli_get_user( conn ) user_id = user_row.id - sys.stdout.write( "Executing Swift on: " + argv[0] + "\n" ) + # If I did not specify at least one site, print help message + if len(args) < 1: + parser.print_help() + return 1 + + # get a space seperated list of the sites to execute on + sites=" ".join( map ( str, args ) ) + sys.stdout.write( "\nExecuting Swift on: " + sites + "\n" ) + + # If I do not execute the script, just print out all pertatent information + if options.do_not_execute: + sys.stdout.write( "swift -sites.file sites.xml -tc.file tc -config cf -cdm.file cdm script.swift\n\n" ) + return 0 + + # Execute the script + return 0 if __name__ == "__main__": From jonmon at ci.uchicago.edu Wed Jun 29 15:20:26 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Wed, 29 Jun 2011 15:20:26 -0500 (CDT) Subject: [Swift-commit] r4713 - in SwiftApps/GOSwift: . man Message-ID: <20110629202026.A284C9CCBF@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-29 15:20:26 -0500 (Wed, 29 Jun 2011) New Revision: 4713 Added: SwiftApps/GOSwift/man/ SwiftApps/GOSwift/man/goswift.1 Log: o man entry for the goswift command. This will evolve as goswift evolves Added: SwiftApps/GOSwift/man/goswift.1 =================================================================== --- SwiftApps/GOSwift/man/goswift.1 (rev 0) +++ SwiftApps/GOSwift/man/goswift.1 2011-06-29 20:20:26 UTC (rev 4713) @@ -0,0 +1,33 @@ +.TH GOSWIFT 1 development "dev" "Development" +.SH NAME +goswift \- Execute Swift underneath the Globus Online infastructure +.SH SYNOPSIS +.B goswift +.B [ --dry-run ] +.BI +.I < goswift.package + +.SH DESCRIPTION +The +.B +goswift +command executes the Swift parallel scripting language underneath Globus Online on user specified execute points. +The execute points must be a logical endpoint. + +.SH OPTIONS +.TP +.B --dry-run +This will go through the process of parsing the data from given to the +.BI +goswift +command and output all the pertatent information. + +.SH EXAMPLES +.TP +.B goswift localhost ci#pads ci#beagle +Note: that localhost is automatically defined and it is the VM that Globus Online is executing on. + +.SH EXIT STATUS +.B +goswift +can return several different error codes. From skenny at ci.uchicago.edu Wed Jun 29 15:42:08 2011 From: skenny at ci.uchicago.edu (skenny at ci.uchicago.edu) Date: Wed, 29 Jun 2011 15:42:08 -0500 (CDT) Subject: [Swift-commit] r4714 - trunk/bin Message-ID: <20110629204208.EB6789CCBF@svn.ci.uchicago.edu> Author: skenny Date: 2011-06-29 15:42:08 -0500 (Wed, 29 Jun 2011) New Revision: 4714 Modified: trunk/bin/chxml Log: check for superfluous parameters Modified: trunk/bin/chxml =================================================================== --- trunk/bin/chxml 2011-06-29 20:20:26 UTC (rev 4713) +++ trunk/bin/chxml 2011-06-29 20:42:08 UTC (rev 4714) @@ -1,74 +1,86 @@ #!/usr/bin/env python -# given a filename chxml will ensure it is well-formed xml and -# contains essential swift attributes +# ensures that that there is a sites file specified and that it contains +# well-formed xml as well as essential attributes for the specified provider import xml.parsers.expat,sys,os,commands from glob import glob -def parsefile(file): - parser = xml.parsers.expat.ParserCreate() - parser.ParseFile(open(file, "r")) +class siteProps: -startTags= [] -endTags=[] + def __init__(self,argstr): + self.sites_file = "" + self.startTags= [] + self.endTags=[] + self.globusParams = 0 + self.execProvider = "" + + if len(argstr)<2: + print "please specify a sites file" + sys.exit() + i = 0 + for o in argstr: + if o == "'-sites.file'": + self.sites_file = argstr[i+1].split("'")[1] + elif o == "'-config'": + config_file = open(argstr[i+1].split("'")[1],"r") + for line in config_file.readlines(): + if line.strip().startswith('#'): + continue + if line.find("sites.file")>-1: + self.sites_file = line.split("=")[1].strip() + i = i+1 + if (self.sites_file == ""): + swift_loc = commands.getoutput("which swift") + swift_home = swift_loc.split("bin")[0] + self.sites_file = swift_home+"etc/sites.xml" + print "no sites file specified, setting to default: "+self.sites_file -def start_element(name, attrs): - startTags.append(name) -def end_element(name): - endTags.append(name) -# parse args to find sites.xml file + def parsefile(self): + parser = xml.parsers.expat.ParserCreate() + parser.ParseFile(open(self.sites_file, "r")) -sites_file = "" -argstr = sys.argv + def start_element(self, name, attrs): + self.startTags.append(name) + for x, y in attrs.iteritems(): + if (name=="execution" and x=="provider" and y=="local"): + self.execProvider = "local" + if (y=="globus"): + self.globusParams = 1 -if len(argstr)<2: - print "please specify a sites file" - sys.exit() -i = 0 -for o in argstr: - if o == "'-sites.file'": - sites_file = argstr[i+1].split("'")[1] - elif o == "'-config'": - config_file = open(argstr[i+1].split("'")[1],"r") - for line in config_file.readlines(): - if line.strip().startswith('#'): - continue - if line.find("sites.file")>-1: - sites_file = line.split("=")[1].strip() - i = i+1 -if (sites_file == ""): - swift_loc = commands.getoutput("which swift") - swift_home = swift_loc.split("bin")[0] - sites_file = swift_home+"etc/sites.xml" - print "no sites file specified, setting to default: "+sites_file + def end_element(self, name): + self.endTags.append(name) + +#------------------------main---------------------------------- + +mysite = siteProps(sys.argv) try: - parsefile(sites_file) + mysite.parsefile() except Exception, e: print "Error: there is a problem with your sites file" - print "%s is %s" % (sites_file, e) + print "%s is %s" % (mysite.sites_file, e) sys.exit() - + p = xml.parsers.expat.ParserCreate() -p.StartElementHandler = start_element -p.EndElementHandler = end_element -p.ParseFile(open(sites_file,"r")) +p.StartElementHandler = mysite.start_element +p.EndElementHandler = mysite.end_element +p.ParseFile(open(mysite.sites_file,"r")) config = 0 pool = 0 -for tag in startTags: +for tag in mysite.startTags: if tag=="config": config = 1 else: if tag=="pool": pool= 1 -if (pool and config): - pass -else: - print "Error: there is a problem with your sites file "+sys.argv[1] - - +if (pool<1 or config<1): + print "Error: there is a problem with your sites file "+mysite.sites_file +if (mysite.globusParams == 1 and mysite.execProvider == "local"): + print "Error: "+mysite.sites_file+" contains parameters that do not apply to the selected execution provider" + sys.exit() + From jonmon at ci.uchicago.edu Wed Jun 29 16:30:14 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Wed, 29 Jun 2011 16:30:14 -0500 (CDT) Subject: [Swift-commit] r4715 - in SwiftApps/GOSwift: man pykoa/tools Message-ID: <20110629213014.855C99CCA2@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-29 16:30:14 -0500 (Wed, 29 Jun 2011) New Revision: 4715 Modified: SwiftApps/GOSwift/man/goswift.1 SwiftApps/GOSwift/pykoa/tools/koa_goswift.py Log: o changes to options. Modified: SwiftApps/GOSwift/man/goswift.1 =================================================================== --- SwiftApps/GOSwift/man/goswift.1 2011-06-29 20:42:08 UTC (rev 4714) +++ SwiftApps/GOSwift/man/goswift.1 2011-06-29 21:30:14 UTC (rev 4715) @@ -22,6 +22,11 @@ goswift command and output all the pertatent information. +.TP +.B -d +Set the deadline of the task. If the task has not completed by the deadline it will beautomatically canceled. A suffix of 'm', 'h', or 'd' may be specified to indicate minutes, hours, or days. If a unit suffix is not given it is assumed to be minutes. Example: '30m', '4h', '1d'. The default is '30m' (30 minutes). + + .SH EXAMPLES .TP .B goswift localhost ci#pads ci#beagle Modified: SwiftApps/GOSwift/pykoa/tools/koa_goswift.py =================================================================== --- SwiftApps/GOSwift/pykoa/tools/koa_goswift.py 2011-06-29 20:42:08 UTC (rev 4714) +++ SwiftApps/GOSwift/pykoa/tools/koa_goswift.py 2011-06-29 21:30:14 UTC (rev 4715) @@ -33,9 +33,11 @@ goswift [options] < \"goswift.package\" Executes Swift under Globus Online. The must be logical sites. This will not work for physical sites. -Add site using enpoint-add and configure site using endpoint-modify. +Add site using endpoint-add and configure site using endpoint-modify. Note: localhost runs on the VM.\ + +Type 'man goswift' for details. \ """ # parse out options @@ -44,6 +46,10 @@ default=False, action="store_true", help="Output the Swift command line that will execute the workflow") + parser.add_option("-d", dest="deadline", + default="30m", + help="Set the time limit for this workflow. " + \ + "Default: 30m (30 minutes)") (options, args) = pykoa.tools.parse_args(parser, argv) From jonmon at ci.uchicago.edu Wed Jun 29 21:52:02 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Wed, 29 Jun 2011 21:52:02 -0500 (CDT) Subject: [Swift-commit] r4716 - trunk/libexec/log-processing Message-ID: <20110630025202.BD9429CCBF@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-29 21:52:02 -0500 (Wed, 29 Jun 2011) New Revision: 4716 Modified: trunk/libexec/log-processing/README.txt Log: updated the README to use the new swift_plotter script Modified: trunk/libexec/log-processing/README.txt =================================================================== --- trunk/libexec/log-processing/README.txt 2011-06-29 21:30:14 UTC (rev 4715) +++ trunk/libexec/log-processing/README.txt 2011-06-30 02:52:02 UTC (rev 4716) @@ -36,7 +36,7 @@ . Plot with the JFreeChart-based plotter in usertools/plotter: + ------------------------------------------ -lines.zsh load.cfg load.eps load.data +swift_plotter.zsh -s load.cfg load.eps load.data ------------------------------------------ Make a basic job completion plot from Coasters Cpu log lines @@ -53,7 +53,7 @@ . Plot with the JFreeChart-based plotter in usertools/plotter: + ------------------------------------------ -lines.zsh completed.cfg completed.eps completed.data +swift_plotter.zsh -s completed.cfg completed.eps completed.data ------------------------------------------ Make a basic Block allocation plot from Coasters Block log lines @@ -70,7 +70,7 @@ . Plot with the JFreeChart-based plotter in usertools/plotter: + ------------------------------------------ -lines.zsh blocks.{cfg,eps,data} +swift_plotter.zsh -s blocks.{cfg,eps,data} ------------------------------------------ Make a job runtime distribution plot from Coasters Cpu log lines @@ -93,5 +93,5 @@ . Plot with the JFreeChart-based plotter in usertools/plotter: + ------------------------------------------ -lines.zsh buckets.cfg buckets.eps buckets.data +swift_plotter.zsh -s buckets.cfg buckets.eps buckets.data ------------------------------------------ From jonmon at ci.uchicago.edu Thu Jun 30 11:49:23 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Thu, 30 Jun 2011 11:49:23 -0500 (CDT) Subject: [Swift-commit] r4717 - SwiftApps/SwiftMontage/docs Message-ID: <20110630164923.6E3969CCA2@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-30 11:49:23 -0500 (Thu, 30 Jun 2011) New Revision: 4717 Modified: SwiftApps/SwiftMontage/docs/SwiftMontageAPI.txt Log: o changes to the documentaton. Added examples for rectification and not rectifying the final mosaic. Modified: SwiftApps/SwiftMontage/docs/SwiftMontageAPI.txt =================================================================== --- SwiftApps/SwiftMontage/docs/SwiftMontageAPI.txt 2011-06-30 02:52:02 UTC (rev 4716) +++ SwiftApps/SwiftMontage/docs/SwiftMontageAPI.txt 2011-06-30 16:49:23 UTC (rev 4717) @@ -26,7 +26,7 @@ Types ~~~~~ These are all the Types that are declared for Swift. They are located in the -file Swift_Montage_types.swift. +file SwiftMontage_Types.swift. Image ^^^^^ @@ -103,7 +103,7 @@ App Procedures ~~~~~~~~~~~~~~ These are all the app procedures for SwiftMontage. They are located in the -file Swift_Montage_Apps.swift +file SwiftMontage_Apps.swift NOTE: Currently the options to the Montage functions are hard coded and the user cannot choose which options to run. @@ -282,7 +282,7 @@ ~~~~~~~~~~~~~~ These are the Batch scripts. These scripts do most of the file mapping and is where the parallelization is taking place. They are located in the file -Swift_Montage_Batch.swift +SwiftMontage_Batch.swift mBackgroundBatch ^^^^^^^^^^^^^^^^ @@ -364,3 +364,73 @@ WARNING: mProjectBatch currently only calls the general mProject app procedure. It does not check to see if the faster projection mProjectPP can be used. + +Examples +~~~~~~~~ +Below are two examples. The first will create an unrectified gray-scale image +and the second will create a rectified gray-scale image. + +Unrectified gray-scale image +^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +---- +import "SwiftMontage_Types"; +import "SwiftMontage_Apps"; +import "SwiftMontage_Batch"; + +Header header <"header.hdr">; +Table images_tbl <"images.tbl">; +Image rectified_mos <"final/unrectified.fits">; +JPEG rectified_jpg_img <"final/unrectified.jpg">; +Image projected_images[]; + +Image raw_image_files[] ; + +projected_images = mProjectBatch( "proj_dir", raw_image_files, header ); + +images_tbl = mImgtbl( projected_images ); + +unrectified_mos = mAdd( projected_images, images_tbl, header ); + +unrectified_jpg_img = mJPEG( unrectified_mos ); +---- + +Rectified gray-scale image +^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +---- +import "SwiftMontage_Types"; +import "SwiftMontage_Apps"; +import "SwiftMontage_Batch"; + +Header header <"header.hdr">; +Table images_tbl <"images.tbl">; +Table difference_tbl <"diffs.tbl">; +Table fits_images_tbl <"fits.tbl">; +Table rectification_tbl <"rectification.tbl">; +Table stat_tbl <"stats.tbl">; +Image rectified_mos <"final/rectified.fits">; +JPEG rectified_jpg_img <"final/rectified.jpg">; +Image projected_images[]; +Image difference_images[]; +Image rectified_images[]; + +Image raw_image_files[] ; + +projected_images = mProjectBatch( "proj_dir", raw_image_files, header ); + +images_tbl = mImgtbl( projected_images ); + +difference_tbl = mOverlaps( images_tbl ); + +( difference_images, fits_images_tbl ) = mDiffFitBatch( "proj_dir","diff_dir", "stat_dir", + @filenames(projected_images), + difference_tbl, header ); + +rectification_tbl = mBgModel( images_tbl, fits_images_tbl ); + +rectified_images = mBackgroundBatch( "rect_dir", + projected_images, images_tbl, rectification_tbl ); + +rectified_mos = mAdd( rectified_images, images_tbl, header ); + +rectified_jpg_img = mJPEG( rectified_mos ); +---- From jonmon at ci.uchicago.edu Thu Jun 30 11:49:54 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Thu, 30 Jun 2011 11:49:54 -0500 (CDT) Subject: [Swift-commit] r4718 - SwiftApps/SwiftMontage/scripts Message-ID: <20110630164954.80F3F9CCA2@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-30 11:49:54 -0500 (Thu, 30 Jun 2011) New Revision: 4718 Added: SwiftApps/SwiftMontage/scripts/SwiftMontage_Apps.swft SwiftApps/SwiftMontage/scripts/SwiftMontage_Batch.swft SwiftApps/SwiftMontage/scripts/SwiftMontage_Types.swift Removed: SwiftApps/SwiftMontage/scripts/Swift_Montage_Apps.swift SwiftApps/SwiftMontage/scripts/Swift_Montage_Batch.swift SwiftApps/SwiftMontage/scripts/Swift_Montage_Types.swift Modified: SwiftApps/SwiftMontage/scripts/montage.swift Log: o Renamed some files and minor edits. Copied: SwiftApps/SwiftMontage/scripts/SwiftMontage_Apps.swft (from rev 4716, SwiftApps/SwiftMontage/scripts/Swift_Montage_Apps.swift) =================================================================== --- SwiftApps/SwiftMontage/scripts/SwiftMontage_Apps.swft (rev 0) +++ SwiftApps/SwiftMontage/scripts/SwiftMontage_Apps.swft 2011-06-30 16:49:54 UTC (rev 4718) @@ -0,0 +1,98 @@ +app ( Image mos ) mAdd( Image imgs[], Table img_tbl, Header hdr ) +{ + mAdd "-p" @dirname( imgs[0] ) "-n" @img_tbl @hdr @mos; +} + + +app ( Image rc_img ) mBackground( Image img, float a, float b, float c ) +{ + mBackground "-n" @img @rc_img a b c; +} + + +app ( Table rect_tbl ) mBgModel( Table img_tbl, Table fits_tbl ) +{ + mBgModel @img_tbl @fits_tbl @rect_tbl; +} + + +app ( Table fits_tbl ) mConcatFit( Table status_tbl, Status stats[] ) +{ + mConcatFit @status_tbl @fits_tbl @dirname( stats[0] ); +} + + +app ( Image diff_img ) mDiff( Image proj_img_1, Image proj_img_2, Header hdr ) +{ + mDiff_wrap "-n" @proj_img_1 @proj_img_2 @diff_img @hdr; +} + + +app ( Image diff_img, Status stat ) mDiffFit( Image img_1, Image img_2, Header hdr ) +{ + mDiffFit_wrap "-n" "-s" @stat @img_1 @img_2 @diff_img @hdr; +} + + +app ( Status stat ) mFitplane( Image diff_img ) +{ + mFitplane_wrap "-s" @stat @diff_img; +} + + +app ( Table img_tbl ) mImgtbl( Image imgs[] ) +{ + mImgtbl @dirname( imgs[0] ) @img_tbl; +} + + +app ( Header hdr ) mMakeHdr( Table img_tbl ) +{ + mMakeHdr @img_tbl @hdr; +} + + +app ( JPEG mos_img_jpg ) mJPEG( Image mos_img ) +{ + mJPEG "-gray" @mos_img "20%" "99.98%" "loglog" "-out" @mos_img_jpg; +} + + +app ( Table diff_tbl ) mOverlaps( Table img_tbl ) +{ + mOverlaps @img_tbl @diff_tbl; +} + + +app ( Image proj_img ) mProjectPP( Image raw_img, Header hdr ) +{ + mProjectPP "-X" @raw_img @proj_img @hdr; +} + + +app ( Image proj_img ) mProject( Image raw_img, Header hdr ) +{ + mProject "-X" @raw_img @proj_img @hdr; +} + +app ( Image shrunk ) mShrink( Image original, int factor ) +{ + mShrink @original @shrunk factor; +} + +/*----------------------------------------------------------------------------------*/ +/* */ +/* Util Scripts */ +/* */ +/*----------------------------------------------------------------------------------*/ + +app ( Table back_tbl ) Background_list( Table imgs_tbl, Table rects_tbl ) +{ + Background_list @imgs_tbl @rects_tbl @back_tbl; +} + + +app ( Table stat_tbl ) create_status_table( Table diff_tbl ) +{ + create_status_table @diff_tbl @stat_tbl; +} Copied: SwiftApps/SwiftMontage/scripts/SwiftMontage_Batch.swft (from rev 4716, SwiftApps/SwiftMontage/scripts/Swift_Montage_Batch.swift) =================================================================== --- SwiftApps/SwiftMontage/scripts/SwiftMontage_Batch.swft (rev 0) +++ SwiftApps/SwiftMontage/scripts/SwiftMontage_Batch.swft 2011-06-30 16:49:54 UTC (rev 4718) @@ -0,0 +1,88 @@ +( Image rect_imgs[] ) mBackgroundBatch( string dest, Image imgs[], Table img_tbl, Table rect_tbl ) +{ + Table back_list = Background_list( img_tbl, rect_tbl ); + + BackgroundStruct back_struct[] = readData2( back_list ); + + foreach background_entry, i in back_struct + { + Image orig_img ; + Image rect_img ; + + float a = background_entry.a; + float b = background_entry.b; + float c = background_entry.c; + rect_img = mBackground( orig_img, a, b, c ); + + rect_imgs[ i ] = rect_img; + } +} + + +( Image diff_imgs[] ) mDiffBatch( string src, string dest, Table diff_tbl, Header hdr ) +{ + DiffStruct diffs[] ; + + foreach d_entry, i in diffs + { + Image img_1 ; + Image img_2 ; + + Image diff_img ; + diff_img = mDiff( img_1, img_2, hdr ); + + diff_imgs[ i ] = diff_img; + } +} + + +( Image diff_imgs[], Table fits_tbl ) mDiffFitBatch( string src, string dest, string stat, string files[], Table diff_tbl, Header hdr ) +{ + DiffStruct diffs[] ; + Status stats[]; + + Table status_tbl = create_status_table( diff_tbl ); + + foreach d_entry, i in diffs + { + Image img_1 ; + Image img_2 ; + + Image diff_img ; + Status stat_file ; + + ( diff_img, stat_file ) = mDiffFit( img_1, img_2, hdr ); + + diff_imgs[ i ] = diff_img; + stats[ i ] = stat_file; + } + fits_tbl = mConcatFit( status_tbl, stats ); +} + + +( Table fits_tbl ) mFitBatch( string stat, Image diff_imgs[], Table diff_tbl ) +{ + Status stats[] ; + + Table status_tbl = create_status_table( diff_tbl ); + + foreach img, i in stats + { + stats[ i ] = mFitplane ( diff_imgs[i] ); + } + + fits_tbl = mConcatFit( status_tbl, stats ); +} + + +( Image proj_imgs[] ) mProjectBatch( string dest, Image raw_imgs[], Header hdr ) +{ + foreach img, i in raw_imgs + { + Image proj_img ; + proj_img = mProject( img, hdr ); +// proj_img = mProjectPP( img, hdr ); + + proj_imgs[ i ] = proj_img; + } +} Copied: SwiftApps/SwiftMontage/scripts/SwiftMontage_Types.swift (from rev 4716, SwiftApps/SwiftMontage/scripts/Swift_Montage_Types.swift) =================================================================== --- SwiftApps/SwiftMontage/scripts/SwiftMontage_Types.swift (rev 0) +++ SwiftApps/SwiftMontage/scripts/SwiftMontage_Types.swift 2011-06-30 16:49:54 UTC (rev 4718) @@ -0,0 +1,23 @@ +type Image; +type Header; +type Table; +type JPEG; +type Status; + +type BackgroundStruct +{ + string fname; + float a; + float b; + float c; +}; + + +type DiffStruct +{ + int cntr1; + int cntr2; + Image plus; + Image minus; + Image diff; +}; Deleted: SwiftApps/SwiftMontage/scripts/Swift_Montage_Apps.swift =================================================================== --- SwiftApps/SwiftMontage/scripts/Swift_Montage_Apps.swift 2011-06-30 16:49:23 UTC (rev 4717) +++ SwiftApps/SwiftMontage/scripts/Swift_Montage_Apps.swift 2011-06-30 16:49:54 UTC (rev 4718) @@ -1,98 +0,0 @@ -app ( Image mos ) mAdd( Image imgs[], Table img_tbl, Header hdr ) -{ - mAdd "-p" @dirname( imgs[0] ) "-n" @img_tbl @hdr @mos; -} - - -app ( Image rc_img ) mBackground( Image img, float a, float b, float c ) -{ - mBackground "-n" @img @rc_img a b c; -} - - -app ( Table rect_tbl ) mBgModel( Table img_tbl, Table fits_tbl ) -{ - mBgModel @img_tbl @fits_tbl @rect_tbl; -} - - -app ( Table fits_tbl ) mConcatFit( Table status_tbl, Status stats[] ) -{ - mConcatFit @status_tbl @fits_tbl @dirname( stats[0] ); -} - - -app ( Image diff_img ) mDiff( Image proj_img_1, Image proj_img_2, Header hdr ) -{ - mDiff_wrap "-n" @proj_img_1 @proj_img_2 @diff_img @hdr; -} - - -app ( Image diff_img, Status stat ) mDiffFit( Image img_1, Image img_2, Header hdr ) -{ - mDiffFit_wrap "-n" "-s" @stat @img_1 @img_2 @diff_img @hdr; -} - - -app ( Status stat ) mFitplane( Image diff_img ) -{ - mFitplane_wrap "-s" @stat @diff_img; -} - - -app ( Table img_tbl ) mImgtbl( Image imgs[] ) -{ - mImgtbl @dirname( imgs[0] ) @img_tbl; -} - - -app ( Header hdr ) mMakeHdr( Table img_tbl ) -{ - mMakeHdr @img_tbl @hdr; -} - - -app ( JPEG mos_img_jpg ) mJPEG( Image mos_img ) -{ - mJPEG "-gray" @mos_img "20%" "99.98%" "loglog" "-out" @mos_img_jpg; -} - - -app ( Table diff_tbl ) mOverlaps( Table img_tbl ) -{ - mOverlaps @img_tbl @diff_tbl; -} - - -app ( Image proj_img ) mProjectPP( Image raw_img, Header hdr ) -{ - mProjectPP "-X" @raw_img @proj_img @hdr; -} - - -app ( Image proj_img ) mProject( Image raw_img, Header hdr ) -{ - mProject "-X" @raw_img @proj_img @hdr; -} - -app ( Image shrunk ) mShrink( Image original, int factor ) -{ - mShrink @original @shrunk factor; -} - -/*----------------------------------------------------------------------------------*/ -/* */ -/* Util Scripts */ -/* */ -/*----------------------------------------------------------------------------------*/ - -app ( Table back_tbl ) Background_list( Table imgs_tbl, Table rects_tbl ) -{ - Background_list @imgs_tbl @rects_tbl @back_tbl; -} - - -app ( Table stat_tbl ) create_status_table( Table diff_tbl ) -{ - create_status_table @diff_tbl @stat_tbl; -} Deleted: SwiftApps/SwiftMontage/scripts/Swift_Montage_Batch.swift =================================================================== --- SwiftApps/SwiftMontage/scripts/Swift_Montage_Batch.swift 2011-06-30 16:49:23 UTC (rev 4717) +++ SwiftApps/SwiftMontage/scripts/Swift_Montage_Batch.swift 2011-06-30 16:49:54 UTC (rev 4718) @@ -1,88 +0,0 @@ -( Image rect_imgs[] ) mBackgroundBatch( string dest, Image imgs[], Table img_tbl, Table rect_tbl ) -{ - Table back_list = Background_list( img_tbl, rect_tbl ); - - BackgroundStruct back_struct[] = readData2( back_list ); - - foreach background_entry, i in back_struct - { - Image orig_img ; - Image rect_img ; - - float a = background_entry.a; - float b = background_entry.b; - float c = background_entry.c; - rect_img = mBackground( orig_img, a, b, c ); - - rect_imgs[ i ] = rect_img; - } -} - - -( Image diff_imgs[] ) mDiffBatch( string src, string dest, Table diff_tbl, Header hdr ) -{ - DiffStruct diffs[] ; - - foreach d_entry, i in diffs - { - Image img_1 ; - Image img_2 ; - - Image diff_img ; - diff_img = mDiff( img_1, img_2, hdr ); - - diff_imgs[ i ] = diff_img; - } -} - - -( Image diff_imgs[], Table fits_tbl ) mDiffFitBatch( string src, string dest, string stat, string files[], Table diff_tbl, Header hdr ) -{ - DiffStruct diffs[] ; - Status stats[]; - - Table status_tbl = create_status_table( diff_tbl ); - - foreach d_entry, i in diffs - { - Image img_1 ; - Image img_2 ; - - Image diff_img ; - Status stat_file ; - - ( diff_img, stat_file ) = mDiffFit( img_1, img_2, hdr ); - - diff_imgs[ i ] = diff_img; - stats[ i ] = stat_file; - } - fits_tbl = mConcatFit( status_tbl, stats ); -} - - -( Table fits_tbl ) mFitBatch( string stat, Image diff_imgs[], Table diff_tbl ) -{ - Status stats[] ; - - Table status_tbl = create_status_table( diff_tbl ); - - foreach img, i in stats - { - stats[ i ] = mFitplane ( diff_imgs[i] ); - } - - fits_tbl = mConcatFit( status_tbl, stats ); -} - - -( Image proj_imgs[] ) mProjectBatch( string dest, Image raw_imgs[], Header hdr ) -{ - foreach img, i in raw_imgs - { - Image proj_img ; - proj_img = mProject( img, hdr ); -// proj_img = mProjectPP( img, hdr ); - - proj_imgs[ i ] = proj_img; - } -} Deleted: SwiftApps/SwiftMontage/scripts/Swift_Montage_Types.swift =================================================================== --- SwiftApps/SwiftMontage/scripts/Swift_Montage_Types.swift 2011-06-30 16:49:23 UTC (rev 4717) +++ SwiftApps/SwiftMontage/scripts/Swift_Montage_Types.swift 2011-06-30 16:49:54 UTC (rev 4718) @@ -1,23 +0,0 @@ -type Image; -type Header; -type Table; -type JPEG; -type Status; - -type BackgroundStruct -{ - string fname; - float a; - float b; - float c; -}; - - -type DiffStruct -{ - int cntr1; - int cntr2; - Image plus; - Image minus; - Image diff; -}; Modified: SwiftApps/SwiftMontage/scripts/montage.swift =================================================================== --- SwiftApps/SwiftMontage/scripts/montage.swift 2011-06-30 16:49:23 UTC (rev 4717) +++ SwiftApps/SwiftMontage/scripts/montage.swift 2011-06-30 16:49:54 UTC (rev 4718) @@ -4,7 +4,7 @@ Table images_tbl <"images.tbl">; Table difference_tbl <"diffs.tbl">; Table fits_images_tbl <"fits.tbl">; -Table corrections_tbl <"corrections.tbl">; +Table rectification_tbl <"rectification.tbl">; Table stat_tbl <"stats.tbl">; Image rectified_mos <"final/rectified.fits">; JPEG rectified_jpg_img <"final/rectified.jpg">; @@ -22,9 +22,9 @@ ( difference_images, fits_images_tbl ) = mDiffFitBatch( "proj_dir", "diff_dir", "stat_dir", @filenames(projected_images), difference_tbl, header ); -corrections_tbl = mBgModel( images_tbl, fits_images_tbl ); +rectification_tbl = mBgModel( images_tbl, fits_images_tbl ); -rectified_images = mBackgroundBatch( "corr_dir", projected_images, images_tbl, corrections_tbl ); +rectified_images = mBackgroundBatch( "rect_dir", projected_images, images_tbl, rectification_tbl ); rectified_mos = mAdd( rectified_images, images_tbl, header ); From jonmon at ci.uchicago.edu Thu Jun 30 18:59:17 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Thu, 30 Jun 2011 18:59:17 -0500 (CDT) Subject: [Swift-commit] r4719 - in trunk: libexec src/org/griphyn/vdl/engine src/org/griphyn/vdl/karajan/lib/swiftscript Message-ID: <20110630235917.419279CCA2@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-30 18:59:17 -0500 (Thu, 30 Jun 2011) New Revision: 4719 Added: trunk/src/org/griphyn/vdl/karajan/lib/swiftscript/ReadStructured.java Removed: trunk/src/org/griphyn/vdl/karajan/lib/swiftscript/ReadData2.java Modified: trunk/libexec/vdl-lib.xml trunk/src/org/griphyn/vdl/engine/ProcedureSignature.java Log: o Renamed readData2 to readStructured. Kept readData2 as an alias to avoid breaking code already using readData2. This alias should be removed eventually. Modified: trunk/libexec/vdl-lib.xml =================================================================== --- trunk/libexec/vdl-lib.xml 2011-06-30 16:49:54 UTC (rev 4718) +++ trunk/libexec/vdl-lib.xml 2011-06-30 23:59:17 UTC (rev 4719) @@ -4,7 +4,8 @@ - + + Modified: trunk/src/org/griphyn/vdl/engine/ProcedureSignature.java =================================================================== --- trunk/src/org/griphyn/vdl/engine/ProcedureSignature.java 2011-06-30 16:49:54 UTC (rev 4718) +++ trunk/src/org/griphyn/vdl/engine/ProcedureSignature.java 2011-06-30 23:59:17 UTC (rev 4719) @@ -136,6 +136,14 @@ readData2.setInvocationMode(INVOCATION_INTERNAL); proceduresMap.put("readData2", readData2); + ProcedureSignature readStructured = new ProcedureSignature("readStructured"); + FormalArgumentSignature rStInputArg = new FormalArgumentSignature(true); + readStructured.addInputArg(rStInputArg); + FormalArgumentSignature rStOutputArg = new FormalArgumentSignature(true); + readStructured.addOutputArg(rStOutputArg); + readStructured.setInvocationMode(INVOCATION_INTERNAL); + proceduresMap.put("readStructured", readStructured); + ProcedureSignature trace = new ProcedureSignature("trace"); trace.setAnyNumOfInputArgs(); trace.setInvocationMode(INVOCATION_INTERNAL); Deleted: trunk/src/org/griphyn/vdl/karajan/lib/swiftscript/ReadData2.java =================================================================== --- trunk/src/org/griphyn/vdl/karajan/lib/swiftscript/ReadData2.java 2011-06-30 16:49:54 UTC (rev 4718) +++ trunk/src/org/griphyn/vdl/karajan/lib/swiftscript/ReadData2.java 2011-06-30 23:59:17 UTC (rev 4719) @@ -1,122 +0,0 @@ -/* - * Created on Oct 8, 2007 - */ -package org.griphyn.vdl.karajan.lib.swiftscript; - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileReader; -import java.io.IOException; - -import org.apache.log4j.Logger; -import org.globus.cog.karajan.arguments.Arg; -import org.globus.cog.karajan.stack.VariableStack; -import org.globus.cog.karajan.workflow.ExecutionException; -import org.griphyn.vdl.karajan.lib.VDLFunction; -import org.griphyn.vdl.mapping.AbsFile; -import org.griphyn.vdl.mapping.DSHandle; -import org.griphyn.vdl.mapping.HandleOpenException; -import org.griphyn.vdl.mapping.Path; -import org.griphyn.vdl.mapping.PhysicalFormat; -import org.griphyn.vdl.type.Types; - -public class ReadData2 extends VDLFunction { - public static final Logger logger = Logger.getLogger(ReadData2.class); - - public static final Arg DEST = new Arg.Positional("dest"); - public static final Arg SRC = new Arg.Positional("src"); - public static boolean warning; - - static { - setArguments(ReadData2.class, new Arg[] { DEST, SRC }); - } - - protected Object function(VariableStack stack) throws ExecutionException, HandleOpenException { - DSHandle dest = (DSHandle) DEST.getValue(stack); - DSHandle src = (DSHandle) SRC.getValue(stack); - waitFor(stack, src); - if (src.getType().equals(Types.STRING)) { - readData(dest, (String) src.getValue()); - } - else { - PhysicalFormat pf = src.getMapper().map(Path.EMPTY_PATH); - if (pf instanceof AbsFile) { - AbsFile af = (AbsFile) pf; - if (!af.getProtocol().equalsIgnoreCase("file")) { - throw new ExecutionException("readData2 only supports local files"); - } - readData(dest, af.getPath()); - } - else { - throw new ExecutionException("readData2 only supports reading from files"); - } - } - return null; - } - - private void readData(DSHandle dest, String path) throws ExecutionException { - File f = new File(path); - try { - BufferedReader br = new BufferedReader(new FileReader(f)); - try { - readLines(dest, br, path); - } - finally { - try { - br.close(); - } - catch (IOException e) { - e.printStackTrace(); - } - } - } - catch (Exception e) { - throw new ExecutionException(e); - } - } - - private void readLines(DSHandle dest, BufferedReader br, String path) - throws ExecutionException, IOException { - int count = 1; - String line = br.readLine(); - while (line != null) { - line = line.trim(); - if (!line.startsWith("#") && !line.equals("")) { - try { - String[] sp = line.split("=", 2); - setValue(dest.getField(Path.parse(sp[0].trim())), sp[1].trim()); - } - catch (Exception e) { - throw new ExecutionException(e.getMessage() + " in " + path + ", line " + count - + ": " + line, e); - } - } - line = br.readLine(); - count++; - } - } - - private void setValue(DSHandle dest, String s) throws ExecutionException { - try { - if (dest.getType().equals(Types.INT)) { - dest.setValue(new Double(Integer.parseInt(s.trim()))); - } - else if (dest.getType().equals(Types.FLOAT)) { - dest.setValue(new Double(s.trim())); - } - else if (dest.getType().equals(Types.BOOLEAN)) { - dest.setValue(new Boolean(s.trim())); - } - else if (dest.getType().equals(Types.STRING)) { - dest.setValue(s); - } - else { - throw new ExecutionException("Don't know how to read type " + dest.getType() - + " for path " + dest.getPathFromRoot()); - } - } - catch (NumberFormatException e) { - throw new ExecutionException("Could not convert value to number: " + s); - } - } -} Added: trunk/src/org/griphyn/vdl/karajan/lib/swiftscript/ReadStructured.java =================================================================== --- trunk/src/org/griphyn/vdl/karajan/lib/swiftscript/ReadStructured.java (rev 0) +++ trunk/src/org/griphyn/vdl/karajan/lib/swiftscript/ReadStructured.java 2011-06-30 23:59:17 UTC (rev 4719) @@ -0,0 +1,122 @@ +/* + * Created on Oct 8, 2007 + */ +package org.griphyn.vdl.karajan.lib.swiftscript; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; + +import org.apache.log4j.Logger; +import org.globus.cog.karajan.arguments.Arg; +import org.globus.cog.karajan.stack.VariableStack; +import org.globus.cog.karajan.workflow.ExecutionException; +import org.griphyn.vdl.karajan.lib.VDLFunction; +import org.griphyn.vdl.mapping.AbsFile; +import org.griphyn.vdl.mapping.DSHandle; +import org.griphyn.vdl.mapping.HandleOpenException; +import org.griphyn.vdl.mapping.Path; +import org.griphyn.vdl.mapping.PhysicalFormat; +import org.griphyn.vdl.type.Types; + +public class ReadStructured extends VDLFunction { + public static final Logger logger = Logger.getLogger(ReadStructured.class); + + public static final Arg DEST = new Arg.Positional("dest"); + public static final Arg SRC = new Arg.Positional("src"); + public static boolean warning; + + static { + setArguments(ReadStructured.class, new Arg[] { DEST, SRC }); + } + + protected Object function(VariableStack stack) throws ExecutionException, HandleOpenException { + DSHandle dest = (DSHandle) DEST.getValue(stack); + DSHandle src = (DSHandle) SRC.getValue(stack); + waitFor(stack, src); + if (src.getType().equals(Types.STRING)) { + readData(dest, (String) src.getValue()); + } + else { + PhysicalFormat pf = src.getMapper().map(Path.EMPTY_PATH); + if (pf instanceof AbsFile) { + AbsFile af = (AbsFile) pf; + if (!af.getProtocol().equalsIgnoreCase("file")) { + throw new ExecutionException("readData2 only supports local files"); + } + readData(dest, af.getPath()); + } + else { + throw new ExecutionException("readData2 only supports reading from files"); + } + } + return null; + } + + private void readData(DSHandle dest, String path) throws ExecutionException { + File f = new File(path); + try { + BufferedReader br = new BufferedReader(new FileReader(f)); + try { + readLines(dest, br, path); + } + finally { + try { + br.close(); + } + catch (IOException e) { + e.printStackTrace(); + } + } + } + catch (Exception e) { + throw new ExecutionException(e); + } + } + + private void readLines(DSHandle dest, BufferedReader br, String path) + throws ExecutionException, IOException { + int count = 1; + String line = br.readLine(); + while (line != null) { + line = line.trim(); + if (!line.startsWith("#") && !line.equals("")) { + try { + String[] sp = line.split("=", 2); + setValue(dest.getField(Path.parse(sp[0].trim())), sp[1].trim()); + } + catch (Exception e) { + throw new ExecutionException(e.getMessage() + " in " + path + ", line " + count + + ": " + line, e); + } + } + line = br.readLine(); + count++; + } + } + + private void setValue(DSHandle dest, String s) throws ExecutionException { + try { + if (dest.getType().equals(Types.INT)) { + dest.setValue(new Double(Integer.parseInt(s.trim()))); + } + else if (dest.getType().equals(Types.FLOAT)) { + dest.setValue(new Double(s.trim())); + } + else if (dest.getType().equals(Types.BOOLEAN)) { + dest.setValue(new Boolean(s.trim())); + } + else if (dest.getType().equals(Types.STRING)) { + dest.setValue(s); + } + else { + throw new ExecutionException("Don't know how to read type " + dest.getType() + + " for path " + dest.getPathFromRoot()); + } + } + catch (NumberFormatException e) { + throw new ExecutionException("Could not convert value to number: " + s); + } + } +} From jonmon at ci.uchicago.edu Thu Jun 30 19:01:43 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Thu, 30 Jun 2011 19:01:43 -0500 (CDT) Subject: [Swift-commit] r4720 - trunk/docs/userguide Message-ID: <20110701000143.AB7649CCA2@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-30 19:01:43 -0500 (Thu, 30 Jun 2011) New Revision: 4720 Modified: trunk/docs/userguide/app_procedures Log: o updated docs: renamed readData2 to readStructured Modified: trunk/docs/userguide/app_procedures =================================================================== --- trunk/docs/userguide/app_procedures 2011-06-30 23:59:17 UTC (rev 4719) +++ trunk/docs/userguide/app_procedures 2011-07-01 00:01:43 UTC (rev 4720) @@ -18,14 +18,14 @@ In this section, this example SwiftScript program is used for reference: ---- -type file; - -app (file o) count(file i) { - wc @i stdout=@o; -} - -file q <"input.txt">; -file r <"output.txt">; +type file; + +app (file o) count(file i) { + wc @i stdout=@o; +} + +file q <"input.txt">; +file r <"output.txt">; ---- The executable for wc will be looked up in tc.data. @@ -278,9 +278,9 @@ For example: ---- -trace(@arg("myparam")); -trace(@arg("optionalparam", "defaultvalue")); ----- +trace(@arg("myparam")); +trace(@arg("optionalparam", "defaultvalue")); +---- ---- $ swift arg.swift -myparam=hello @@ -289,7 +289,7 @@ RunID: 20080220-1548-ylc4pmda SwiftScript trace: defaultvalue SwiftScript trace: hello ----- +---- @extractint ~~~~~~~~~~~ @@ -319,7 +319,7 @@ For example: ---- -string v = @regexp("abcdefghi", "c(def)g","monkey"); +string v = @regexp("abcdefghi", "c(def)g","monkey"); ---- will assign the value "abmonkeyhi" to the variable v. @@ -341,12 +341,12 @@ For example: ---- -string t = "my name is John and i like puppies."; -string name = @strcut(t, "my name is ([^ ]*) "); -string out = @strcat("Your name is ",name); +string t = "my name is John and i like puppies."; +string name = @strcut(t, "my name is ([^ ]*) "); +string out = @strcat("Your name is ",name); trace(out); ----- - +---- + will output the message: Your name is John. @strsplit @@ -357,12 +357,12 @@ Example: ---- -string t = "my name is John and i like puppies."; -string words[] = @strsplit(t, "\\s"); -foreach word in words { - trace(word); -} ----- +string t = "my name is John and i like puppies."; +string words[] = @strsplit(t, "\\s"); +foreach word in words { + trace(word); +} +---- will output one word of the sentence on each line (though not necessarily in order, due to the fact that foreach iterations execute in @@ -415,9 +415,9 @@ the same order as the header row and separated by whitespace. (since Swift 0.4) -readData2 -~~~~~~~~~ -readData2 will read data from a specified file, like readdata, but +readStructured +~~~~~~~~~~~~~~ +readStructured will read data from a specified file, like readdata, but using a different file format more closely related to that used by the ext mapper. @@ -425,32 +425,32 @@ and the value for that position in the structure: ---- -rows[0].columns[0] = 0 -rows[0].columns[1] = 2 -rows[0].columns[2] = 4 -rows[1].columns[0] = 1 -rows[1].columns[1] = 3 +rows[0].columns[0] = 0 +rows[0].columns[1] = 2 +rows[0].columns[2] = 4 +rows[1].columns[0] = 1 +rows[1].columns[1] = 3 rows[1].columns[2] = 5 ----- +---- which can be read into a structure defined like this: ---- -type vector { - int columns[]; -} - -type matrix { - vector rows[]; -} - -matrix m; - -m = readData2("readData2.in"); ----- +type vector { + int columns[]; +} -(since Swift 0.7) +type matrix { + vector rows[]; +} +matrix m; + +m = readStructured("readStructured.in"); +---- + +(since Swift 0.7, was readData2(deprecated)) + trace ~~~~~ trace will log its parameters. By default these will appear on both From jonmon at ci.uchicago.edu Thu Jun 30 19:10:55 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Thu, 30 Jun 2011 19:10:55 -0500 (CDT) Subject: [Swift-commit] r4721 - trunk/src/org/griphyn/vdl/karajan/lib/swiftscript Message-ID: <20110701001055.F09819CCA2@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-30 19:10:55 -0500 (Thu, 30 Jun 2011) New Revision: 4721 Modified: trunk/src/org/griphyn/vdl/karajan/lib/swiftscript/Misc.java Log: o exists was added twice to setArguments and existfile was not added at all. fixed that. Modified: trunk/src/org/griphyn/vdl/karajan/lib/swiftscript/Misc.java =================================================================== --- trunk/src/org/griphyn/vdl/karajan/lib/swiftscript/Misc.java 2011-07-01 00:01:43 UTC (rev 4720) +++ trunk/src/org/griphyn/vdl/karajan/lib/swiftscript/Misc.java 2011-07-01 00:10:55 UTC (rev 4721) @@ -50,7 +50,7 @@ setArguments("swiftscript_tostring", new Arg[] { PA_INPUT }); setArguments("swiftscript_dirname", new Arg[] { Arg.VARGS }); setArguments("swiftscript_length", new Arg[] { Arg.VARGS }); - setArguments("swiftscript_exists", new Arg[] { Arg.VARGS }); + setArguments("swiftscript_existsfile", new Arg[] { Arg.VARGS }); } private static final Logger traceLogger = From achavez at ci.uchicago.edu Tue Jun 28 12:53:58 2011 From: achavez at ci.uchicago.edu (achavez at ci.uchicago.edu) Date: Tue, 28 Jun 2011 12:53:58 -0500 (CDT) Subject: [Swift-commit] r4699 - in trunk/tests/language-behaviour: . IO arrays compounds control_structures datatypes mappers params procedures strings variables Message-ID: <20110628175358.2813C9CCC5@svn.ci.uchicago.edu> Author: achavez Date: 2011-06-28 12:53:57 -0500 (Tue, 28 Jun 2011) New Revision: 4699 Added: trunk/tests/language-behaviour/IO/0013-out-of-order.out.expected trunk/tests/language-behaviour/IO/0013-out-of-order.swift trunk/tests/language-behaviour/IO/0021-param-bind.out.expected trunk/tests/language-behaviour/IO/0021-param-bind.swift trunk/tests/language-behaviour/IO/061-cattwo.swift trunk/tests/language-behaviour/IO/062-two-in-a-row.a.out.expected trunk/tests/language-behaviour/IO/062-two-in-a-row.b.out.expected trunk/tests/language-behaviour/IO/062-two-in-a-row.swift trunk/tests/language-behaviour/arrays/111-array-individual-assigns.out.expected trunk/tests/language-behaviour/arrays/162-dot-on-array.out.expected trunk/tests/language-behaviour/arrays/array_multidimensional_index.out.expected trunk/tests/language-behaviour/arrays/q5.check.sh trunk/tests/language-behaviour/arrays/q5.clean.sh trunk/tests/language-behaviour/arrays/q5.swift trunk/tests/language-behaviour/datatypes/023-complex-type.out.expected trunk/tests/language-behaviour/datatypes/023-complex-type.swift trunk/tests/language-behaviour/datatypes/0231-complex-type.check.sh trunk/tests/language-behaviour/datatypes/0231-complex-type.clean.sh trunk/tests/language-behaviour/datatypes/027-single-character-typename.clean.sh trunk/tests/language-behaviour/datatypes/028-double-character-typename.clean.sh trunk/tests/language-behaviour/datatypes/032-boolconst.check.sh trunk/tests/language-behaviour/datatypes/032-boolconst.clean.sh trunk/tests/language-behaviour/datatypes/053-pass-int.check.sh trunk/tests/language-behaviour/datatypes/053-pass-int.clean.sh trunk/tests/language-behaviour/datatypes/054-pass-int.check.sh trunk/tests/language-behaviour/datatypes/054-pass-int.clean.sh trunk/tests/language-behaviour/datatypes/055-pass-int.check.sh trunk/tests/language-behaviour/datatypes/055-pass-int.clean.sh trunk/tests/language-behaviour/datatypes/regress-r2292.clean.sh trunk/tests/language-behaviour/mappers/0025-compound.swift trunk/tests/language-behaviour/mappers/07511-fixed-array-mapper-input.first.in trunk/tests/language-behaviour/mappers/07511-fixed-array-mapper-input.second.in trunk/tests/language-behaviour/mappers/07511-fixed-array-mapper-input.third.in trunk/tests/language-behaviour/params/ trunk/tests/language-behaviour/params/002-param.out.expected trunk/tests/language-behaviour/params/002-param.swift trunk/tests/language-behaviour/params/0022-default.out.expected trunk/tests/language-behaviour/params/0022-default.swift trunk/tests/language-behaviour/params/0023-default-override.out.expected trunk/tests/language-behaviour/params/0023-default-override.swift trunk/tests/language-behaviour/procedures/065-delay.swift trunk/tests/language-behaviour/procedures/0651-several-delay.swift trunk/tests/language-behaviour/procedures/delayedcat.sh trunk/tests/language-behaviour/strings/761-dirname.clean.sh trunk/tests/language-behaviour/strings/761-dirname.swift trunk/tests/language-behaviour/variables/088-sequential-assign.swift Removed: trunk/tests/language-behaviour/001-echo.out.expected trunk/tests/language-behaviour/001-echo.swift trunk/tests/language-behaviour/0011-echo.out.expected trunk/tests/language-behaviour/0011-echo.swift trunk/tests/language-behaviour/0012-echo-map.out.expected trunk/tests/language-behaviour/0012-echo-map.swift trunk/tests/language-behaviour/0013-out-of-order.out.expected trunk/tests/language-behaviour/0013-out-of-order.swift trunk/tests/language-behaviour/002-param.out.expected trunk/tests/language-behaviour/002-param.swift trunk/tests/language-behaviour/0021-param-bind.out.expected trunk/tests/language-behaviour/0021-param-bind.swift trunk/tests/language-behaviour/0022-default.out.expected trunk/tests/language-behaviour/0022-default.swift trunk/tests/language-behaviour/0023-default-override.out.expected trunk/tests/language-behaviour/0023-default-override.swift trunk/tests/language-behaviour/0025-compound.swift trunk/tests/language-behaviour/0032-strcat-mapper-param.1.out.expected trunk/tests/language-behaviour/0032-strcat-mapper-param.swift trunk/tests/language-behaviour/0083-for.one.in trunk/tests/language-behaviour/0083-for.one.in.out.expected trunk/tests/language-behaviour/0083-for.swift trunk/tests/language-behaviour/0083-for.two.in trunk/tests/language-behaviour/0083-for.two.in.out.expected trunk/tests/language-behaviour/0084-for.swift trunk/tests/language-behaviour/020-array.out.expected trunk/tests/language-behaviour/020-array.swift trunk/tests/language-behaviour/021-array-in-proc-param.out.expected trunk/tests/language-behaviour/021-array-in-proc-param.swift trunk/tests/language-behaviour/022-array-with-exprs.out.expected trunk/tests/language-behaviour/022-array-with-exprs.swift trunk/tests/language-behaviour/023-complex-type.out.expected trunk/tests/language-behaviour/023-complex-type.swift trunk/tests/language-behaviour/025-array-passing.out.expected trunk/tests/language-behaviour/025-array-passing.swift trunk/tests/language-behaviour/027-array-assignment.out.expected trunk/tests/language-behaviour/027-array-assignment.swift trunk/tests/language-behaviour/028-array-assignment.swift trunk/tests/language-behaviour/029-array-assignment-sequence.swift trunk/tests/language-behaviour/050-foreach.blue.out.expected trunk/tests/language-behaviour/050-foreach.green.out.expected trunk/tests/language-behaviour/050-foreach.red.out.expected trunk/tests/language-behaviour/050-foreach.swift trunk/tests/language-behaviour/051-foreach.blue.out.expected trunk/tests/language-behaviour/051-foreach.green.out.expected trunk/tests/language-behaviour/051-foreach.red.out.expected trunk/tests/language-behaviour/051-foreach.swift trunk/tests/language-behaviour/052-foreach-index.blue.out.expected trunk/tests/language-behaviour/052-foreach-index.green.out.expected trunk/tests/language-behaviour/052-foreach-index.red.out.expected trunk/tests/language-behaviour/052-foreach-index.swift trunk/tests/language-behaviour/056-foreach-if.swift trunk/tests/language-behaviour/057-foreach-twice-range.check.sh trunk/tests/language-behaviour/057-foreach-twice-range.clean.sh trunk/tests/language-behaviour/057-foreach-twice-range.first.0000.out.expected trunk/tests/language-behaviour/057-foreach-twice-range.first.0001.out.expected trunk/tests/language-behaviour/057-foreach-twice-range.first.0002.out.expected trunk/tests/language-behaviour/057-foreach-twice-range.first.0003.out.expected trunk/tests/language-behaviour/057-foreach-twice-range.first.0004.out.expected trunk/tests/language-behaviour/057-foreach-twice-range.first.0005.out.expected trunk/tests/language-behaviour/057-foreach-twice-range.first.0006.out.expected trunk/tests/language-behaviour/057-foreach-twice-range.first.0007.out.expected trunk/tests/language-behaviour/057-foreach-twice-range.first.0008.out.expected trunk/tests/language-behaviour/057-foreach-twice-range.first.0009.out.expected trunk/tests/language-behaviour/057-foreach-twice-range.second.0000.out.expected trunk/tests/language-behaviour/057-foreach-twice-range.second.0001.out.expected trunk/tests/language-behaviour/057-foreach-twice-range.second.0002.out.expected trunk/tests/language-behaviour/057-foreach-twice-range.second.0003.out.expected trunk/tests/language-behaviour/057-foreach-twice-range.second.0004.out.expected trunk/tests/language-behaviour/057-foreach-twice-range.second.0005.out.expected trunk/tests/language-behaviour/057-foreach-twice-range.second.0006.out.expected trunk/tests/language-behaviour/057-foreach-twice-range.second.0007.out.expected trunk/tests/language-behaviour/057-foreach-twice-range.second.0008.out.expected trunk/tests/language-behaviour/057-foreach-twice-range.second.0009.out.expected trunk/tests/language-behaviour/057-foreach-twice-range.setup.sh trunk/tests/language-behaviour/057-foreach-twice-range.swift trunk/tests/language-behaviour/058-foreach-twice-string.check.sh trunk/tests/language-behaviour/058-foreach-twice-string.clean.sh trunk/tests/language-behaviour/058-foreach-twice-string.first.0000.out.expected trunk/tests/language-behaviour/058-foreach-twice-string.first.0001.out.expected trunk/tests/language-behaviour/058-foreach-twice-string.first.0002.out.expected trunk/tests/language-behaviour/058-foreach-twice-string.second.0000.out.expected trunk/tests/language-behaviour/058-foreach-twice-string.second.0001.out.expected trunk/tests/language-behaviour/058-foreach-twice-string.second.0002.out.expected trunk/tests/language-behaviour/058-foreach-twice-string.setup.sh trunk/tests/language-behaviour/058-foreach-twice-string.swift trunk/tests/language-behaviour/061-cattwo.1.in trunk/tests/language-behaviour/061-cattwo.2.in trunk/tests/language-behaviour/061-cattwo.clean.sh trunk/tests/language-behaviour/061-cattwo.out.expected trunk/tests/language-behaviour/061-cattwo.setup.sh trunk/tests/language-behaviour/061-cattwo.swift trunk/tests/language-behaviour/062-two-in-a-row.a.out.expected trunk/tests/language-behaviour/062-two-in-a-row.b.out.expected trunk/tests/language-behaviour/062-two-in-a-row.swift trunk/tests/language-behaviour/065-delay.swift trunk/tests/language-behaviour/0651-several-delay.swift trunk/tests/language-behaviour/066-many.check.sh trunk/tests/language-behaviour/066-many.clean.sh trunk/tests/language-behaviour/066-many.setup.sh trunk/tests/language-behaviour/066-many.swift trunk/tests/language-behaviour/066-many.time trunk/tests/language-behaviour/066-many.timeout trunk/tests/language-behaviour/070-singlefilemapper.out.expected trunk/tests/language-behaviour/070-singlefilemapper.swift trunk/tests/language-behaviour/071-singlefilemapper-input.check.sh trunk/tests/language-behaviour/071-singlefilemapper-input.clean.sh trunk/tests/language-behaviour/071-singlefilemapper-input.in trunk/tests/language-behaviour/071-singlefilemapper-input.out.expected trunk/tests/language-behaviour/071-singlefilemapper-input.setup.sh trunk/tests/language-behaviour/071-singlefilemapper-input.swift trunk/tests/language-behaviour/072-simplemapper.out.expected trunk/tests/language-behaviour/072-simplemapper.swift trunk/tests/language-behaviour/0721-simplemapper-array.0000.out.expected trunk/tests/language-behaviour/0721-simplemapper-array.0005.out.expected trunk/tests/language-behaviour/0721-simplemapper-array.swift trunk/tests/language-behaviour/0722-simplemapper-padding.000000000.out.expected trunk/tests/language-behaviour/0722-simplemapper-padding.000000005.out.expected trunk/tests/language-behaviour/0722-simplemapper-padding.000075943.out.expected trunk/tests/language-behaviour/0722-simplemapper-padding.swift trunk/tests/language-behaviour/0723-simplemapper-nopadding.0.out.expected trunk/tests/language-behaviour/0723-simplemapper-nopadding.5.out.expected trunk/tests/language-behaviour/0723-simplemapper-nopadding.75943.out.expected trunk/tests/language-behaviour/0723-simplemapper-nopadding.swift trunk/tests/language-behaviour/073-simplemapper.out.expected trunk/tests/language-behaviour/073-simplemapper.swift trunk/tests/language-behaviour/075-array-mapper.first.out.expected trunk/tests/language-behaviour/075-array-mapper.second.out.expected trunk/tests/language-behaviour/075-array-mapper.swift trunk/tests/language-behaviour/075-array-mapper.third.out.expected trunk/tests/language-behaviour/0751-fixed-array-mapper.first.out.expected trunk/tests/language-behaviour/0751-fixed-array-mapper.second.out.expected trunk/tests/language-behaviour/0751-fixed-array-mapper.swift trunk/tests/language-behaviour/0751-fixed-array-mapper.third.out.expected trunk/tests/language-behaviour/07511-fixed-array-mapper-input.check.sh trunk/tests/language-behaviour/07511-fixed-array-mapper-input.clean.sh trunk/tests/language-behaviour/07511-fixed-array-mapper-input.first.in trunk/tests/language-behaviour/07511-fixed-array-mapper-input.second.in trunk/tests/language-behaviour/07511-fixed-array-mapper-input.setup.sh trunk/tests/language-behaviour/07511-fixed-array-mapper-input.swift trunk/tests/language-behaviour/07511-fixed-array-mapper-input.third.in trunk/tests/language-behaviour/07513-fixed-array-mapper-filename.real.out.expected trunk/tests/language-behaviour/07513-fixed-array-mapper-filename.swift trunk/tests/language-behaviour/07514-fixed-array-mapper-filenames.a.in trunk/tests/language-behaviour/07514-fixed-array-mapper-filenames.b.in trunk/tests/language-behaviour/07514-fixed-array-mapper-filenames.real.out.expected trunk/tests/language-behaviour/07514-fixed-array-mapper-filenames.swift trunk/tests/language-behaviour/0752-csv-mapper.csv trunk/tests/language-behaviour/0752-csv-mapper.left-two.out.expected trunk/tests/language-behaviour/0752-csv-mapper.left-zero.out.expected trunk/tests/language-behaviour/0752-csv-mapper.right-one.out.expected trunk/tests/language-behaviour/0752-csv-mapper.swift trunk/tests/language-behaviour/0753-filesystem-mapper.a.out.expected trunk/tests/language-behaviour/0753-filesystem-mapper.b.out.expected trunk/tests/language-behaviour/0753-filesystem-mapper.blue.in trunk/tests/language-behaviour/0753-filesystem-mapper.c.out.expected trunk/tests/language-behaviour/0753-filesystem-mapper.green.in trunk/tests/language-behaviour/0753-filesystem-mapper.red.in trunk/tests/language-behaviour/0754-csv-mapper-input.out.expected trunk/tests/language-behaviour/0754-csv-mapper-input.swift trunk/tests/language-behaviour/0754-csv-mapper.csv trunk/tests/language-behaviour/0754-csv-mapper.left-one.in trunk/tests/language-behaviour/0754-csv-mapper.left-two.in trunk/tests/language-behaviour/0754-csv-mapper.left-zero.in trunk/tests/language-behaviour/0754-csv-mapper.right-one.in trunk/tests/language-behaviour/0754-csv-mapper.right-two.in trunk/tests/language-behaviour/0754-csv-mapper.right-zero.in trunk/tests/language-behaviour/0755-ext-mapper.0.3.2.1.out.expected trunk/tests/language-behaviour/0755-ext-mapper.AAA.out.expected trunk/tests/language-behaviour/0755-ext-mapper.____.out.expected trunk/tests/language-behaviour/0755-ext-mapper.sh trunk/tests/language-behaviour/0755-ext-mapper.swift trunk/tests/language-behaviour/07551-ext-mapper-single.out.expected trunk/tests/language-behaviour/07551-ext-mapper-single.sh trunk/tests/language-behaviour/07551-ext-mapper-single.swift trunk/tests/language-behaviour/07552-ext-mapper-numeric.inside.out.expected trunk/tests/language-behaviour/07552-ext-mapper-numeric.mapper.out.expected trunk/tests/language-behaviour/07552-ext-mapper-numeric.sh trunk/tests/language-behaviour/07552-ext-mapper-numeric.swift trunk/tests/language-behaviour/07554-ext-mapper-struct.sh trunk/tests/language-behaviour/07554-ext-mapper-struct.swift trunk/tests/language-behaviour/07555-ext-mapper-twostruct.sh trunk/tests/language-behaviour/07555-ext-mapper-twostruct.swift trunk/tests/language-behaviour/075551-ext-mapper-twostruct-singleproducer.swift trunk/tests/language-behaviour/0756-ext-mapper-slow.sh trunk/tests/language-behaviour/0756-ext-mapper-slow.swift trunk/tests/language-behaviour/0757-ext-mapper-array.sh trunk/tests/language-behaviour/0757-ext-mapper-array.swift trunk/tests/language-behaviour/0758-ext-mapper-array.sh trunk/tests/language-behaviour/0758-ext-mapper-array.swift trunk/tests/language-behaviour/0759-ext-mapper-array.sh trunk/tests/language-behaviour/0759-ext-mapper-array.swift trunk/tests/language-behaviour/07591-ext-mapper-multidimensional-array.sh trunk/tests/language-behaviour/07591-ext-mapper-multidimensional-array.swift trunk/tests/language-behaviour/07592-ext-mapper-multidimensional-array-structs.sh trunk/tests/language-behaviour/07592-ext-mapper-multidimensional-array-structs.swift trunk/tests/language-behaviour/076-structured-regexp-mapper.b.out.expected trunk/tests/language-behaviour/076-structured-regexp-mapper.swift trunk/tests/language-behaviour/077-regexp-mapper.foo.out.expected trunk/tests/language-behaviour/077-regexp-mapper.swift trunk/tests/language-behaviour/078-singlefilemapper-name-expression.out.expected trunk/tests/language-behaviour/078-singlefilemapper-name-expression.swift trunk/tests/language-behaviour/0781-singlefilemapper-name-expression.out.expected trunk/tests/language-behaviour/0781-singlefilemapper-name-expression.swift trunk/tests/language-behaviour/079-regression-r970-simple-mapper-expr-prefix.out.expected trunk/tests/language-behaviour/079-regression-r970-simple-mapper-expr-prefix.swift trunk/tests/language-behaviour/0791-regression-r970-simple-mapper-expr-prefix.out.expected trunk/tests/language-behaviour/0791-regression-r970-simple-mapper-expr-prefix.swift trunk/tests/language-behaviour/083-array-assign.swift trunk/tests/language-behaviour/086-iterate-concurrent.check.sh trunk/tests/language-behaviour/086-iterate-concurrent.clean.sh trunk/tests/language-behaviour/086-iterate-concurrent.setup.sh trunk/tests/language-behaviour/086-iterate-concurrent.swift trunk/tests/language-behaviour/087-iterate-previous.check.sh trunk/tests/language-behaviour/087-iterate-previous.clean.sh trunk/tests/language-behaviour/087-iterate-previous.setup.sh trunk/tests/language-behaviour/087-iterate-previous.swift trunk/tests/language-behaviour/088-sequential-assign.swift trunk/tests/language-behaviour/110-array-range-exprs.swift trunk/tests/language-behaviour/1101-array-range.swift trunk/tests/language-behaviour/1102-array-range-step.swift trunk/tests/language-behaviour/111-array-individual-assigns.out.expected trunk/tests/language-behaviour/111-array-individual-assigns.swift trunk/tests/language-behaviour/150-filesys_mapper.swift trunk/tests/language-behaviour/162-dot-on-array.out.expected trunk/tests/language-behaviour/162-dot-on-array.swift trunk/tests/language-behaviour/760-csv-mapper.sh trunk/tests/language-behaviour/760-csv-mapper.swift trunk/tests/language-behaviour/IO/761-dirname.swift trunk/tests/language-behaviour/IO/q5.swift trunk/tests/language-behaviour/T074-simplemapper.aleph.out.expected trunk/tests/language-behaviour/T074-simplemapper.beth.out.expected trunk/tests/language-behaviour/T074-simplemapper.gimel.out.expected trunk/tests/language-behaviour/T074-simplemapper.swift trunk/tests/language-behaviour/T076-simplemapper-bug80.aleph.out.expected trunk/tests/language-behaviour/T076-simplemapper-bug80.beth.out.expected trunk/tests/language-behaviour/T076-simplemapper-bug80.swift trunk/tests/language-behaviour/T077-simplemapper-bug80.aleph.out.expected trunk/tests/language-behaviour/T077-simplemapper-bug80.beth.out.expected trunk/tests/language-behaviour/T077-simplemapper-bug80.swift trunk/tests/language-behaviour/T077-simplemapper-bug80_subordinate.epsilon.out.expected trunk/tests/language-behaviour/T077-simplemapper-bug80_subordinate.sigma.out.expected trunk/tests/language-behaviour/T077-simplemapper-bug80_subordinate_moresubordinate.hamza.out.expected trunk/tests/language-behaviour/T078-simplemapper-nosuffix.swift trunk/tests/language-behaviour/T078-simplemapper-nosuffix_nodot.out.expected trunk/tests/language-behaviour/T079-simplemapper-nosuffix_exception.swift trunk/tests/language-behaviour/array_multidimensional-2.swift trunk/tests/language-behaviour/array_multidimensional_assign.swift trunk/tests/language-behaviour/array_multidimensional_index.out.expected trunk/tests/language-behaviour/array_multidimensional_index.swift trunk/tests/language-behaviour/datatypes/0231-complex-type.out.expected trunk/tests/language-behaviour/datatypes/032-boolconst.f.out.expected trunk/tests/language-behaviour/datatypes/032-boolconst.t.out.expected trunk/tests/language-behaviour/datatypes/053-pass-int.out.expected trunk/tests/language-behaviour/datatypes/054-pass-int.out.expected trunk/tests/language-behaviour/datatypes/055-pass-int.out.expected trunk/tests/language-behaviour/delayedcat.sh trunk/tests/language-behaviour/readData.circle.in trunk/tests/language-behaviour/readData.circle.out.expected trunk/tests/language-behaviour/readData.circleArray.in trunk/tests/language-behaviour/readData.circleArray.out.expected trunk/tests/language-behaviour/readData.float.out.expected trunk/tests/language-behaviour/readData.int.in trunk/tests/language-behaviour/readData.int.out.expected trunk/tests/language-behaviour/readData.intArray.in trunk/tests/language-behaviour/readData.intArray.out.expected trunk/tests/language-behaviour/readData.stringArray.in trunk/tests/language-behaviour/readData.stringArray.out.expected trunk/tests/language-behaviour/readData.swift trunk/tests/language-behaviour/readData2.in trunk/tests/language-behaviour/readData2.out.expected trunk/tests/language-behaviour/readData2.swift trunk/tests/language-behaviour/writeDataPrimitive.out.expected trunk/tests/language-behaviour/writeDataPrimitive.swift trunk/tests/language-behaviour/writeDataStringArray.swift trunk/tests/language-behaviour/writeDataStringArray2.out.expected trunk/tests/language-behaviour/writeDataStringArray2.swift trunk/tests/language-behaviour/writeDataStruct.out.expected trunk/tests/language-behaviour/writeDataStruct.swift trunk/tests/language-behaviour/writeDataStructArray2.out.expected trunk/tests/language-behaviour/writeDataStructArray2.swift Modified: trunk/tests/language-behaviour/IO/001-echo.swift trunk/tests/language-behaviour/IO/0012-echo-map.swift trunk/tests/language-behaviour/IO/060-duplicate.check.sh trunk/tests/language-behaviour/IO/060-duplicate.swift trunk/tests/language-behaviour/IO/087-external-dataset.swift trunk/tests/language-behaviour/IO/130-fmri.swift trunk/tests/language-behaviour/IO/q2.swift trunk/tests/language-behaviour/IO/q21.swift trunk/tests/language-behaviour/IO/q22.swift trunk/tests/language-behaviour/IO/q23.swift trunk/tests/language-behaviour/IO/q3.swift trunk/tests/language-behaviour/IO/q6.swift trunk/tests/language-behaviour/IO/q7.swift trunk/tests/language-behaviour/IO/readData.swift trunk/tests/language-behaviour/IO/readData2.swift trunk/tests/language-behaviour/IO/writeDataStringArray2.swift trunk/tests/language-behaviour/arrays/028-array-assignment.clean.sh trunk/tests/language-behaviour/arrays/111-array-individual-assigns.check.sh trunk/tests/language-behaviour/arrays/array_multidimensional_index.swift trunk/tests/language-behaviour/compounds/0024-compound.swift trunk/tests/language-behaviour/compounds/00241-nested-single-compound.swift trunk/tests/language-behaviour/compounds/00242-compound-with-vars.swift trunk/tests/language-behaviour/control_structures/090-case.swift trunk/tests/language-behaviour/datatypes/0231-complex-type.swift trunk/tests/language-behaviour/datatypes/032-boolconst.swift trunk/tests/language-behaviour/datatypes/053-pass-int.swift trunk/tests/language-behaviour/datatypes/054-pass-int.swift trunk/tests/language-behaviour/datatypes/055-pass-int.swift trunk/tests/language-behaviour/procedures/080-declare-assign-proc.swift trunk/tests/language-behaviour/procedures/proc-in-expr.swift Log: Language-behaviour structure changed Deleted: trunk/tests/language-behaviour/001-echo.out.expected =================================================================== --- trunk/tests/language-behaviour/001-echo.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/001-echo.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -hello Deleted: trunk/tests/language-behaviour/001-echo.swift =================================================================== --- trunk/tests/language-behaviour/001-echo.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/001-echo.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,12 +0,0 @@ -type messagefile; - -(messagefile t) greeting() { - app { - echo "hello" stdout=@filename(t); - } -} - -messagefile outfile <"001-echo.out">; - -outfile = greeting(); - Deleted: trunk/tests/language-behaviour/0011-echo.out.expected =================================================================== --- trunk/tests/language-behaviour/0011-echo.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0011-echo.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -hello Deleted: trunk/tests/language-behaviour/0011-echo.swift =================================================================== --- trunk/tests/language-behaviour/0011-echo.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0011-echo.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,10 +0,0 @@ -type messagefile; - -app (messagefile t) greeting() { - echo "hello" stdout=@filename(t); -} - -messagefile outfile <"0011-echo.out">; - -outfile = greeting(); - Deleted: trunk/tests/language-behaviour/0012-echo-map.out.expected =================================================================== --- trunk/tests/language-behaviour/0012-echo-map.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0012-echo-map.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -hello Deleted: trunk/tests/language-behaviour/0012-echo-map.swift =================================================================== --- trunk/tests/language-behaviour/0012-echo-map.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0012-echo-map.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,11 +0,0 @@ -type messagefile; - -(messagefile t) greeting() { - app { - echo "hello" stdout=@filename(t); - } -} - -messagefile outfile <"0012-echo-map.out"> = greeting(); - - Deleted: trunk/tests/language-behaviour/0013-out-of-order.out.expected =================================================================== --- trunk/tests/language-behaviour/0013-out-of-order.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0013-out-of-order.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -hello Deleted: trunk/tests/language-behaviour/0013-out-of-order.swift =================================================================== --- trunk/tests/language-behaviour/0013-out-of-order.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0013-out-of-order.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,12 +0,0 @@ -type messagefile; - -(messagefile t) greeting() { - app { - echo "hello" stdout=@filename(t); - } -} - -messagefile outfile <"0013-out-of-order.out">; - -outfile = greeting(); - Deleted: trunk/tests/language-behaviour/002-param.out.expected =================================================================== --- trunk/tests/language-behaviour/002-param.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/002-param.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -hi Deleted: trunk/tests/language-behaviour/002-param.swift =================================================================== --- trunk/tests/language-behaviour/002-param.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/002-param.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,12 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(string m) { - app { - echo m stdout=@filename(t); - } -} - -messagefile outfile <"002-param.out">; - -outfile = greeting("hi"); - Deleted: trunk/tests/language-behaviour/0021-param-bind.out.expected =================================================================== --- trunk/tests/language-behaviour/0021-param-bind.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0021-param-bind.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -hi there Deleted: trunk/tests/language-behaviour/0021-param-bind.swift =================================================================== --- trunk/tests/language-behaviour/0021-param-bind.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0021-param-bind.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,12 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(string left, string right) { - app { - echo left right stdout=@filename(t); - } -} - -messagefile outfile <"0021-param-bind.out">; - -outfile = greeting(right="there", left="hi"); - Deleted: trunk/tests/language-behaviour/0022-default.out.expected =================================================================== --- trunk/tests/language-behaviour/0022-default.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0022-default.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -hi there Deleted: trunk/tests/language-behaviour/0022-default.swift =================================================================== --- trunk/tests/language-behaviour/0022-default.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0022-default.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,12 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(string left="hi", string right) { - app { - echo left right stdout=@filename(t); - } -} - -messagefile outfile <"0022-default.out">; - -outfile = greeting(right="there"); - Deleted: trunk/tests/language-behaviour/0023-default-override.out.expected =================================================================== --- trunk/tests/language-behaviour/0023-default-override.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0023-default-override.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -foo there Deleted: trunk/tests/language-behaviour/0023-default-override.swift =================================================================== --- trunk/tests/language-behaviour/0023-default-override.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0023-default-override.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,12 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(string left="hi", string right) { - app { - echo left right stdout=@filename(t); - } -} - -messagefile outfile <"0023-default-override.out">; - -outfile = greeting(left="foo",right="there"); - Deleted: trunk/tests/language-behaviour/0025-compound.swift =================================================================== --- trunk/tests/language-behaviour/0025-compound.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0025-compound.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,14 +0,0 @@ -type file; -(file t) echo(int m) { - app { - echo m stdout=@filename(t); - } -} - -(file t) nested_echo(int m) { - t = echo (m); -} - -file a[]; -a[0] = nested_echo(0); - Deleted: trunk/tests/language-behaviour/0032-strcat-mapper-param.1.out.expected =================================================================== --- trunk/tests/language-behaviour/0032-strcat-mapper-param.1.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0032-strcat-mapper-param.1.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -0032-strcat-mapper-param.1 Deleted: trunk/tests/language-behaviour/0032-strcat-mapper-param.swift =================================================================== --- trunk/tests/language-behaviour/0032-strcat-mapper-param.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0032-strcat-mapper-param.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,18 +0,0 @@ -type file; - - -(file t) echo(string m) { - app { - echo m stdout=@filename(t); - } -} - - -// file f1[] ; - - -file f1 <"0032-strcat-mapper-param.1">; - - string fn = @filename(f1); - file o ; - o = echo(fn); Deleted: trunk/tests/language-behaviour/0083-for.one.in =================================================================== --- trunk/tests/language-behaviour/0083-for.one.in 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0083-for.one.in 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -LLLL Deleted: trunk/tests/language-behaviour/0083-for.one.in.out.expected =================================================================== --- trunk/tests/language-behaviour/0083-for.one.in.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0083-for.one.in.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -./0083-for.one.in Deleted: trunk/tests/language-behaviour/0083-for.swift =================================================================== --- trunk/tests/language-behaviour/0083-for.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0083-for.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,17 +0,0 @@ -type file; - - -(file t) echo(string m) { - app { - echo m stdout=@filename(t); - } -} - - -file f1[] ; - -foreach i1 in f1 { - string fn = @filename(i1); - file o ; - o = echo(fn); -} Deleted: trunk/tests/language-behaviour/0083-for.two.in =================================================================== --- trunk/tests/language-behaviour/0083-for.two.in 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0083-for.two.in 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -RRRR Deleted: trunk/tests/language-behaviour/0083-for.two.in.out.expected =================================================================== --- trunk/tests/language-behaviour/0083-for.two.in.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0083-for.two.in.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -./0083-for.two.in Deleted: trunk/tests/language-behaviour/0084-for.swift =================================================================== --- trunk/tests/language-behaviour/0084-for.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0084-for.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,14 +0,0 @@ -type file; - - -(file t) echo(string m) { - app { - echo m stdout=@filename(t); - } -} - - -file f1[] ; - -foreach i1 in f1 { -} Deleted: trunk/tests/language-behaviour/020-array.out.expected =================================================================== --- trunk/tests/language-behaviour/020-array.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/020-array.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -4 Deleted: trunk/tests/language-behaviour/020-array.swift =================================================================== --- trunk/tests/language-behaviour/020-array.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/020-array.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,16 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(int m) { - app { - echo m stdout=@filename(t); - } -} - -messagefile outfile <"020-array.out">; - -int i[] = [ 3, 1, 4, 1, 5]; - -int j = i[2]; - -outfile = greeting(j); - Deleted: trunk/tests/language-behaviour/021-array-in-proc-param.out.expected =================================================================== --- trunk/tests/language-behaviour/021-array-in-proc-param.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/021-array-in-proc-param.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -1 Deleted: trunk/tests/language-behaviour/021-array-in-proc-param.swift =================================================================== --- trunk/tests/language-behaviour/021-array-in-proc-param.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/021-array-in-proc-param.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,14 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(int m) { - app { - echo m stdout=@filename(t); - } -} - -messagefile outfile <"021-array-in-proc-param.out">; - -int i[] = [ 3, 1, 4, 1, 5]; - -outfile = greeting(i[3]); - Deleted: trunk/tests/language-behaviour/022-array-with-exprs.out.expected =================================================================== --- trunk/tests/language-behaviour/022-array-with-exprs.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/022-array-with-exprs.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -22 Deleted: trunk/tests/language-behaviour/022-array-with-exprs.swift =================================================================== --- trunk/tests/language-behaviour/022-array-with-exprs.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/022-array-with-exprs.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,16 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(int m) { - app { - echo m stdout=@filename(t); - } -} - -messagefile outfile <"022-array-with-exprs.out">; - -int i[] = [ 1+91, 3+3, 16+3*2 , 1, 5]; - -int j = i[2]; - -outfile = greeting(j); - Deleted: trunk/tests/language-behaviour/023-complex-type.out.expected =================================================================== --- trunk/tests/language-behaviour/023-complex-type.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/023-complex-type.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -3 Deleted: trunk/tests/language-behaviour/023-complex-type.swift =================================================================== --- trunk/tests/language-behaviour/023-complex-type.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/023-complex-type.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,23 +0,0 @@ -type messagefile {} - -type mystruct { - int first; - string second; -} - -(messagefile t) greeting(int m) { - app { - echo m stdout=@filename(t); - } -} - -messagefile outfile <"023-complex-type.out">; - -mystruct m; - -m.first = 3; - -int i = m.first; - -outfile = greeting(i); - Deleted: trunk/tests/language-behaviour/025-array-passing.out.expected =================================================================== --- trunk/tests/language-behaviour/025-array-passing.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/025-array-passing.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -two Deleted: trunk/tests/language-behaviour/025-array-passing.swift =================================================================== --- trunk/tests/language-behaviour/025-array-passing.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/025-array-passing.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,14 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(string m[]) { - app { - echo m[1] stdout=@filename(t); - } -} - -messagefile outfile <"025-array-passing.out">; - -string msg[] = [ "one", "two" ]; - -outfile = greeting(msg); - Deleted: trunk/tests/language-behaviour/027-array-assignment.out.expected =================================================================== --- trunk/tests/language-behaviour/027-array-assignment.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/027-array-assignment.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -two Deleted: trunk/tests/language-behaviour/027-array-assignment.swift =================================================================== --- trunk/tests/language-behaviour/027-array-assignment.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/027-array-assignment.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,15 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(string m[]) { - app { - echo m[1] stdout=@filename(t); - } -} - -messagefile outfile <"027-array-assignment.out">; - -string msg[]; -msg = [ "one", "two" ]; - -outfile = greeting(msg); - Deleted: trunk/tests/language-behaviour/028-array-assignment.swift =================================================================== --- trunk/tests/language-behaviour/028-array-assignment.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/028-array-assignment.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,18 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(string m[]) { - app { - echo m[1] stdout=@filename(t); - } -} - -messagefile outfile <"027-array-assignment.out">; - -string msg[]; -string baz[]; - -baz = msg; -msg = [ "one", "two" ]; - -outfile = greeting(baz); - Deleted: trunk/tests/language-behaviour/029-array-assignment-sequence.swift =================================================================== --- trunk/tests/language-behaviour/029-array-assignment-sequence.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/029-array-assignment-sequence.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,10 +0,0 @@ -int a,b,c,d,e,f,g; -trace(g); -a=8645; -b=a; -c=b; -d=c; -e=d; -f=e; -g=f; - Deleted: trunk/tests/language-behaviour/050-foreach.blue.out.expected =================================================================== --- trunk/tests/language-behaviour/050-foreach.blue.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/050-foreach.blue.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -test Deleted: trunk/tests/language-behaviour/050-foreach.green.out.expected =================================================================== --- trunk/tests/language-behaviour/050-foreach.green.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/050-foreach.green.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -test Deleted: trunk/tests/language-behaviour/050-foreach.red.out.expected =================================================================== --- trunk/tests/language-behaviour/050-foreach.red.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/050-foreach.red.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -test Deleted: trunk/tests/language-behaviour/050-foreach.swift =================================================================== --- trunk/tests/language-behaviour/050-foreach.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/050-foreach.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,15 +0,0 @@ -type messagefile {} - -(messagefile t) greeting() { - app { - echo "test" stdout=@filename(t); - } -} - -string array[] = ["red", "green", "blue"]; - -foreach s in array { - messagefile outfile ; - outfile = greeting(); -} - Deleted: trunk/tests/language-behaviour/051-foreach.blue.out.expected =================================================================== --- trunk/tests/language-behaviour/051-foreach.blue.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/051-foreach.blue.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -The filename is: 051-foreach.blue.out and the loop var is: blue Deleted: trunk/tests/language-behaviour/051-foreach.green.out.expected =================================================================== --- trunk/tests/language-behaviour/051-foreach.green.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/051-foreach.green.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -The filename is: 051-foreach.green.out and the loop var is: green Deleted: trunk/tests/language-behaviour/051-foreach.red.out.expected =================================================================== --- trunk/tests/language-behaviour/051-foreach.red.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/051-foreach.red.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -The filename is: 051-foreach.red.out and the loop var is: red Deleted: trunk/tests/language-behaviour/051-foreach.swift =================================================================== --- trunk/tests/language-behaviour/051-foreach.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/051-foreach.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,20 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(string l) { - app { - echo @strcat("The filename is: ", @filename(t), - " and the loop var is: ", l) - stdout=@filename(t); - } -} - -string array[] = ["red", "green", "blue"]; - -foreach s in array { - messagefile outfile < - single_file_mapper; - file=@strcat("051-foreach.",s,".out") - >; - outfile = greeting(s); -} - Deleted: trunk/tests/language-behaviour/052-foreach-index.blue.out.expected =================================================================== --- trunk/tests/language-behaviour/052-foreach-index.blue.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/052-foreach-index.blue.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -The filename is: 052-foreach-index.blue.out, the loop var is: blueand the index is: 2 Deleted: trunk/tests/language-behaviour/052-foreach-index.green.out.expected =================================================================== --- trunk/tests/language-behaviour/052-foreach-index.green.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/052-foreach-index.green.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -The filename is: 052-foreach-index.green.out, the loop var is: greenand the index is: 1 Deleted: trunk/tests/language-behaviour/052-foreach-index.red.out.expected =================================================================== --- trunk/tests/language-behaviour/052-foreach-index.red.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/052-foreach-index.red.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -The filename is: 052-foreach-index.red.out, the loop var is: redand the index is: 0 Deleted: trunk/tests/language-behaviour/052-foreach-index.swift =================================================================== --- trunk/tests/language-behaviour/052-foreach-index.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/052-foreach-index.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,26 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(int ix, string l) { - app { - echo @strcat("The filename is: ", @filename(t), - ", the loop var is: ", l, - "and the index is: ", ix) - stdout=@filename(t); - } -} - -string array[] = ["red", "green", "blue"]; - -// this highlights a bug, at least after all commits -// that 'index' is being treated as a string, not as -// an integer... - -// try this test earlier on, though -foreach s, index in array { - messagefile outfile < - single_file_mapper; - file=@strcat("052-foreach-index.",s,".out") - >; - outfile = greeting(index, s); -} - Deleted: trunk/tests/language-behaviour/056-foreach-if.swift =================================================================== --- trunk/tests/language-behaviour/056-foreach-if.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/056-foreach-if.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,26 +0,0 @@ -type messagefile {} - -(messagefile t) greeting(int ix, string l) { - app { - echo @strcat("The filename is: ", @filename(t), - ", the loop var is: ", l, - "and the index is: ", ix) - stdout=@filename(t); - } -} - -string array[] = ["red", "green", "blue"]; - -// this highlights a bug, at least after all commits -// that 'index' is being treated as a string, not as -// an integer... - -messagefile outfiles[]; - -// try this test earlier on, though -foreach s, index in array { - if( index %% 2 == 1) { - outfiles[index] = greeting(index, s); - } -} - Deleted: trunk/tests/language-behaviour/057-foreach-twice-range.check.sh =================================================================== --- trunk/tests/language-behaviour/057-foreach-twice-range.check.sh 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/057-foreach-twice-range.check.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,17 +0,0 @@ -#!/bin/bash - -set -x - -for count in `seq --format "%04.f" 0 1 9` -do - [ -f "057-foreach-twice-range.first.$count.out" ] || exit 1 - CONTENTS1=$( cat 057-foreach-twice-range.first.$count.out.expected ) - CONTENTS2=$( cat 057-foreach-twice-range.first.$count.out ) - [[ $CONTENTS1 == $CONTENTS2 ]] || exit 1 - [ -f "057-foreach-twice-range.second.$count.out" ] || exit 1 - CONTENTS3=$( cat 057-foreach-twice-range.second.$count.out.expected ) - CONTENTS4=$( cat 057-foreach-twice-range.second.$count.out ) - [[ $CONTENTS3 == $CONTENTS4 ]] || exit 1 -done -exit 0 - Deleted: trunk/tests/language-behaviour/057-foreach-twice-range.clean.sh =================================================================== --- trunk/tests/language-behaviour/057-foreach-twice-range.clean.sh 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/057-foreach-twice-range.clean.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,7 +0,0 @@ -#!/bin/bash - -set -x - -rm -v 057-foreach-twice-range.*.out || exit 1 - -exit 0 Deleted: trunk/tests/language-behaviour/057-foreach-twice-range.first.0000.out.expected =================================================================== --- trunk/tests/language-behaviour/057-foreach-twice-range.first.0000.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/057-foreach-twice-range.first.0000.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -test1-0 Deleted: trunk/tests/language-behaviour/057-foreach-twice-range.first.0001.out.expected =================================================================== --- trunk/tests/language-behaviour/057-foreach-twice-range.first.0001.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/057-foreach-twice-range.first.0001.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -test1-1 Deleted: trunk/tests/language-behaviour/057-foreach-twice-range.first.0002.out.expected =================================================================== --- trunk/tests/language-behaviour/057-foreach-twice-range.first.0002.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/057-foreach-twice-range.first.0002.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -test1-2 Deleted: trunk/tests/language-behaviour/057-foreach-twice-range.first.0003.out.expected =================================================================== --- trunk/tests/language-behaviour/057-foreach-twice-range.first.0003.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/057-foreach-twice-range.first.0003.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -test1-3 Deleted: trunk/tests/language-behaviour/057-foreach-twice-range.first.0004.out.expected =================================================================== --- trunk/tests/language-behaviour/057-foreach-twice-range.first.0004.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/057-foreach-twice-range.first.0004.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -test1-4 Deleted: trunk/tests/language-behaviour/057-foreach-twice-range.first.0005.out.expected =================================================================== --- trunk/tests/language-behaviour/057-foreach-twice-range.first.0005.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/057-foreach-twice-range.first.0005.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -test1-5 Deleted: trunk/tests/language-behaviour/057-foreach-twice-range.first.0006.out.expected =================================================================== --- trunk/tests/language-behaviour/057-foreach-twice-range.first.0006.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/057-foreach-twice-range.first.0006.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -test1-6 Deleted: trunk/tests/language-behaviour/057-foreach-twice-range.first.0007.out.expected =================================================================== --- trunk/tests/language-behaviour/057-foreach-twice-range.first.0007.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/057-foreach-twice-range.first.0007.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -test1-7 Deleted: trunk/tests/language-behaviour/057-foreach-twice-range.first.0008.out.expected =================================================================== --- trunk/tests/language-behaviour/057-foreach-twice-range.first.0008.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/057-foreach-twice-range.first.0008.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -test1-8 Deleted: trunk/tests/language-behaviour/057-foreach-twice-range.first.0009.out.expected =================================================================== --- trunk/tests/language-behaviour/057-foreach-twice-range.first.0009.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/057-foreach-twice-range.first.0009.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -test1-9 Deleted: trunk/tests/language-behaviour/057-foreach-twice-range.second.0000.out.expected =================================================================== --- trunk/tests/language-behaviour/057-foreach-twice-range.second.0000.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/057-foreach-twice-range.second.0000.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -test2-0 Deleted: trunk/tests/language-behaviour/057-foreach-twice-range.second.0001.out.expected =================================================================== --- trunk/tests/language-behaviour/057-foreach-twice-range.second.0001.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/057-foreach-twice-range.second.0001.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -test2-1 Deleted: trunk/tests/language-behaviour/057-foreach-twice-range.second.0002.out.expected =================================================================== --- trunk/tests/language-behaviour/057-foreach-twice-range.second.0002.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/057-foreach-twice-range.second.0002.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -test2-2 Deleted: trunk/tests/language-behaviour/057-foreach-twice-range.second.0003.out.expected =================================================================== --- trunk/tests/language-behaviour/057-foreach-twice-range.second.0003.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/057-foreach-twice-range.second.0003.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -test2-3 Deleted: trunk/tests/language-behaviour/057-foreach-twice-range.second.0004.out.expected =================================================================== --- trunk/tests/language-behaviour/057-foreach-twice-range.second.0004.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/057-foreach-twice-range.second.0004.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -test2-4 Deleted: trunk/tests/language-behaviour/057-foreach-twice-range.second.0005.out.expected =================================================================== --- trunk/tests/language-behaviour/057-foreach-twice-range.second.0005.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/057-foreach-twice-range.second.0005.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -test2-5 Deleted: trunk/tests/language-behaviour/057-foreach-twice-range.second.0006.out.expected =================================================================== --- trunk/tests/language-behaviour/057-foreach-twice-range.second.0006.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/057-foreach-twice-range.second.0006.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -test2-6 Deleted: trunk/tests/language-behaviour/057-foreach-twice-range.second.0007.out.expected =================================================================== --- trunk/tests/language-behaviour/057-foreach-twice-range.second.0007.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/057-foreach-twice-range.second.0007.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -test2-7 Deleted: trunk/tests/language-behaviour/057-foreach-twice-range.second.0008.out.expected =================================================================== --- trunk/tests/language-behaviour/057-foreach-twice-range.second.0008.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/057-foreach-twice-range.second.0008.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -test2-8 Deleted: trunk/tests/language-behaviour/057-foreach-twice-range.second.0009.out.expected =================================================================== --- trunk/tests/language-behaviour/057-foreach-twice-range.second.0009.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/057-foreach-twice-range.second.0009.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -test2-9 Deleted: trunk/tests/language-behaviour/057-foreach-twice-range.setup.sh =================================================================== --- trunk/tests/language-behaviour/057-foreach-twice-range.setup.sh 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/057-foreach-twice-range.setup.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,3 +0,0 @@ -#!/bin/bash - -cp -v $GROUP/057*expected . || exit 1 Deleted: trunk/tests/language-behaviour/057-foreach-twice-range.swift =================================================================== --- trunk/tests/language-behaviour/057-foreach-twice-range.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/057-foreach-twice-range.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,20 +0,0 @@ -type file; - -app (file o) echo (string msg) -{ - echo msg stdout=@o; -} - -file out[]; -file out2[]; - -foreach a,i in [0:9] { - string s = @strcat("test1-", i); - out[i] = echo(s); -} - -foreach a,i in [0:9] { - string s = @strcat("test2-", i); - out2[i] = echo(s); -} - Deleted: trunk/tests/language-behaviour/058-foreach-twice-string.check.sh =================================================================== --- trunk/tests/language-behaviour/058-foreach-twice-string.check.sh 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/058-foreach-twice-string.check.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,17 +0,0 @@ -#!/bin/bash - -set -x - -for count in `seq --format "%04.f" 0 1 2` -do - [ -f "058-foreach-twice-string.first.$count.out" ] || exit 1 - CONTENTS1=$( cat 058-foreach-twice-string.first.$count.out.expected ) - CONTENTS2=$( cat 058-foreach-twice-string.first.$count.out ) - [[ $CONTENTS1 == $CONTENTS2 ]] || exit 1 - [ -f "058-foreach-twice-string.second.$count.out" ] || exit 1 - CONTENTS3=$( cat 058-foreach-twice-string.second.$count.out.expected ) - CONTENTS4=$( cat 058-foreach-twice-string.second.$count.out ) - [[ $CONTENTS3 == $CONTENTS4 ]] || exit 1 -done -exit 0 - Deleted: trunk/tests/language-behaviour/058-foreach-twice-string.clean.sh =================================================================== --- trunk/tests/language-behaviour/058-foreach-twice-string.clean.sh 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/058-foreach-twice-string.clean.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,6 +0,0 @@ -#!/bin/bash - -set -x - -rm -v 058-foreach-twice-string.*.out || exit 1 -exit 0 Deleted: trunk/tests/language-behaviour/058-foreach-twice-string.first.0000.out.expected =================================================================== --- trunk/tests/language-behaviour/058-foreach-twice-string.first.0000.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/058-foreach-twice-string.first.0000.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -zero Deleted: trunk/tests/language-behaviour/058-foreach-twice-string.first.0001.out.expected =================================================================== --- trunk/tests/language-behaviour/058-foreach-twice-string.first.0001.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/058-foreach-twice-string.first.0001.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -one Deleted: trunk/tests/language-behaviour/058-foreach-twice-string.first.0002.out.expected =================================================================== --- trunk/tests/language-behaviour/058-foreach-twice-string.first.0002.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/058-foreach-twice-string.first.0002.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -two Deleted: trunk/tests/language-behaviour/058-foreach-twice-string.second.0000.out.expected =================================================================== --- trunk/tests/language-behaviour/058-foreach-twice-string.second.0000.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/058-foreach-twice-string.second.0000.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -zero Deleted: trunk/tests/language-behaviour/058-foreach-twice-string.second.0001.out.expected =================================================================== --- trunk/tests/language-behaviour/058-foreach-twice-string.second.0001.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/058-foreach-twice-string.second.0001.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -one Deleted: trunk/tests/language-behaviour/058-foreach-twice-string.second.0002.out.expected =================================================================== --- trunk/tests/language-behaviour/058-foreach-twice-string.second.0002.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/058-foreach-twice-string.second.0002.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -two Deleted: trunk/tests/language-behaviour/058-foreach-twice-string.setup.sh =================================================================== --- trunk/tests/language-behaviour/058-foreach-twice-string.setup.sh 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/058-foreach-twice-string.setup.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,3 +0,0 @@ -#!/bin/bash - -cp -v $GROUP/058*expected . || exit 1 Deleted: trunk/tests/language-behaviour/058-foreach-twice-string.swift =================================================================== --- trunk/tests/language-behaviour/058-foreach-twice-string.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/058-foreach-twice-string.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,19 +0,0 @@ -type file; - -app (file o) echo (string f) -{ - echo @f stdout=@o; -} - -file out[]; -file out2[]; -string words[] = ["zero", "one", "two"]; - -foreach w,i in words { - out[i] = echo(w); -} - -foreach w,i in words { - out2[i] = echo(w); -} - Deleted: trunk/tests/language-behaviour/061-cattwo.1.in =================================================================== --- trunk/tests/language-behaviour/061-cattwo.1.in 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/061-cattwo.1.in 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -hi Deleted: trunk/tests/language-behaviour/061-cattwo.2.in =================================================================== --- trunk/tests/language-behaviour/061-cattwo.2.in 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/061-cattwo.2.in 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -bye Deleted: trunk/tests/language-behaviour/061-cattwo.clean.sh =================================================================== --- trunk/tests/language-behaviour/061-cattwo.clean.sh 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/061-cattwo.clean.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,7 +0,0 @@ -#!/bin/bash - -set -x - -rm 061-cattwo.[12].in || exit 1 - -exit 0 Deleted: trunk/tests/language-behaviour/061-cattwo.out.expected =================================================================== --- trunk/tests/language-behaviour/061-cattwo.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/061-cattwo.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,2 +0,0 @@ -hi -bye Deleted: trunk/tests/language-behaviour/061-cattwo.setup.sh =================================================================== --- trunk/tests/language-behaviour/061-cattwo.setup.sh 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/061-cattwo.setup.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,7 +0,0 @@ -#!/bin/bash - -set -x - -cp ${GROUP}/061-cattwo.[12].in . || exit 1 - -exit 0 Deleted: trunk/tests/language-behaviour/061-cattwo.swift =================================================================== --- trunk/tests/language-behaviour/061-cattwo.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/061-cattwo.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,16 +0,0 @@ -type file; - - -file inputA <"061-cattwo.1.in">; -file inputB <"061-cattwo.2.in">; - -file output <"061-cattwo.out">; - -(file t) cat(file m, file n) { - app { - cat @filename(m) @filename(n) stdout=@filename(t); - } -} - -output = cat(inputA, inputB); - Deleted: trunk/tests/language-behaviour/062-two-in-a-row.a.out.expected =================================================================== --- trunk/tests/language-behaviour/062-two-in-a-row.a.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/062-two-in-a-row.a.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -Hello, world! Deleted: trunk/tests/language-behaviour/062-two-in-a-row.b.out.expected =================================================================== --- trunk/tests/language-behaviour/062-two-in-a-row.b.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/062-two-in-a-row.b.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -Hello, world! Deleted: trunk/tests/language-behaviour/062-two-in-a-row.swift =================================================================== --- trunk/tests/language-behaviour/062-two-in-a-row.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/062-two-in-a-row.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,21 +0,0 @@ -type messagefile {} - -(messagefile t) greeting() { - app { - echo "Hello, world!" stdout=@filename(t); - } -} - -(messagefile t) greeting2(messagefile ignored) { - app { - echo "Hello, world!" stdout=@filename(t); - } -} - - -messagefile outfile <"062-two-in-a-row.a.out">; -messagefile outfile2 <"062-two-in-a-row.b.out">; - -outfile = greeting(); - -outfile2 = greeting2(outfile); Deleted: trunk/tests/language-behaviour/065-delay.swift =================================================================== --- trunk/tests/language-behaviour/065-delay.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/065-delay.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,6 +0,0 @@ - -app delay() { - sleep "3"; -} - -delay(); Deleted: trunk/tests/language-behaviour/0651-several-delay.swift =================================================================== --- trunk/tests/language-behaviour/0651-several-delay.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0651-several-delay.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,8 +0,0 @@ - -app delay(int i) { - sleep i; -} - -foreach i in [1:3] { - delay(i); -} Deleted: trunk/tests/language-behaviour/066-many.check.sh =================================================================== --- trunk/tests/language-behaviour/066-many.check.sh 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/066-many.check.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,7 +0,0 @@ -#!/bin/bash - -set -x - -[ -f nop ] || exit 1 - -exit 0 Deleted: trunk/tests/language-behaviour/066-many.clean.sh =================================================================== --- trunk/tests/language-behaviour/066-many.clean.sh 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/066-many.clean.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,7 +0,0 @@ -#!/bin/bash - -set -x - -rm -v nop || exit 1 - -exit 0 Deleted: trunk/tests/language-behaviour/066-many.setup.sh =================================================================== --- trunk/tests/language-behaviour/066-many.setup.sh 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/066-many.setup.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,7 +0,0 @@ -#!/bin/bash - -set -x - -touch nop || exit 1 - -exit 0 Deleted: trunk/tests/language-behaviour/066-many.swift =================================================================== --- trunk/tests/language-behaviour/066-many.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/066-many.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,12 +0,0 @@ - -type file; - -app p(file f) -{ - touch @f; -} - -foreach i in [1:3000] { - file f<"nop">; - p(f); -} Deleted: trunk/tests/language-behaviour/066-many.time =================================================================== --- trunk/tests/language-behaviour/066-many.time 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/066-many.time 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -300 Deleted: trunk/tests/language-behaviour/066-many.timeout =================================================================== --- trunk/tests/language-behaviour/066-many.timeout 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/066-many.timeout 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -600 Deleted: trunk/tests/language-behaviour/070-singlefilemapper.out.expected =================================================================== --- trunk/tests/language-behaviour/070-singlefilemapper.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/070-singlefilemapper.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -070-singlefilemapper.out Deleted: trunk/tests/language-behaviour/070-singlefilemapper.swift =================================================================== --- trunk/tests/language-behaviour/070-singlefilemapper.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/070-singlefilemapper.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,12 +0,0 @@ -type messagefile; - -(messagefile t) write() { - app { - echo @filename(t) stdout=@filename(t); - } -} - -messagefile outfile <"070-singlefilemapper.out">; - -outfile = write(); - Deleted: trunk/tests/language-behaviour/071-singlefilemapper-input.check.sh =================================================================== --- trunk/tests/language-behaviour/071-singlefilemapper-input.check.sh 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/071-singlefilemapper-input.check.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,8 +0,0 @@ -#!/bin/bash - -set -x - -[ -f 071-singlefilemapper-input.in ] || exit 1 -grep 071-singlefilemapper-input.in 071-singlefilemapper-input.out || exit 1 - -exit 0 Deleted: trunk/tests/language-behaviour/071-singlefilemapper-input.clean.sh =================================================================== --- trunk/tests/language-behaviour/071-singlefilemapper-input.clean.sh 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/071-singlefilemapper-input.clean.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,8 +0,0 @@ -#!/bin/bash - -set -x - -rm -v 071-singlefilemapper-input.in \ - 071-singlefilemapper-input.out || exit 1 - -exit 0 Deleted: trunk/tests/language-behaviour/071-singlefilemapper-input.in =================================================================== --- trunk/tests/language-behaviour/071-singlefilemapper-input.in 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/071-singlefilemapper-input.in 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -foo Deleted: trunk/tests/language-behaviour/071-singlefilemapper-input.out.expected =================================================================== --- trunk/tests/language-behaviour/071-singlefilemapper-input.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/071-singlefilemapper-input.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -071-singlefilemapper-input.in Deleted: trunk/tests/language-behaviour/071-singlefilemapper-input.setup.sh =================================================================== --- trunk/tests/language-behaviour/071-singlefilemapper-input.setup.sh 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/071-singlefilemapper-input.setup.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,7 +0,0 @@ -#!/bin/bash - -set -x - -cp -v $GROUP/071-singlefilemapper-input.in . || exit 1 - -exit 0 Deleted: trunk/tests/language-behaviour/071-singlefilemapper-input.swift =================================================================== --- trunk/tests/language-behaviour/071-singlefilemapper-input.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/071-singlefilemapper-input.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,11 +0,0 @@ -type messagefile; - -app (messagefile o) write(messagefile i) { - echo @filename(i) stdout=@filename(o); -} - -messagefile infile <"071-singlefilemapper-input.in">; -messagefile outfile <"071-singlefilemapper-input.out">; - -outfile = write(infile); - Deleted: trunk/tests/language-behaviour/072-simplemapper.out.expected =================================================================== --- trunk/tests/language-behaviour/072-simplemapper.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/072-simplemapper.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -072-simplemapper.out Deleted: trunk/tests/language-behaviour/072-simplemapper.swift =================================================================== --- trunk/tests/language-behaviour/072-simplemapper.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/072-simplemapper.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,14 +0,0 @@ -type messagefile; - -(messagefile t) write() { - app { - echo @filename(t) stdout=@filename(t); - } -} - -messagefile outfile ; - -outfile = write(); - Deleted: trunk/tests/language-behaviour/0721-simplemapper-array.0000.out.expected =================================================================== --- trunk/tests/language-behaviour/0721-simplemapper-array.0000.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0721-simplemapper-array.0000.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -0721-simplemapper-array.0000.out Deleted: trunk/tests/language-behaviour/0721-simplemapper-array.0005.out.expected =================================================================== --- trunk/tests/language-behaviour/0721-simplemapper-array.0005.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0721-simplemapper-array.0005.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -0721-simplemapper-array.0005.out Deleted: trunk/tests/language-behaviour/0721-simplemapper-array.swift =================================================================== --- trunk/tests/language-behaviour/0721-simplemapper-array.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0721-simplemapper-array.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,15 +0,0 @@ -type messagefile; - -(messagefile t) write() { - app { - echo @filename(t) stdout=@filename(t); - } -} - -messagefile outfile[] ; - -outfile[0] = write(); -outfile[5] = write(); - Deleted: trunk/tests/language-behaviour/0722-simplemapper-padding.000000000.out.expected =================================================================== --- trunk/tests/language-behaviour/0722-simplemapper-padding.000000000.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0722-simplemapper-padding.000000000.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -0722-simplemapper-padding.000000000.out Deleted: trunk/tests/language-behaviour/0722-simplemapper-padding.000000005.out.expected =================================================================== --- trunk/tests/language-behaviour/0722-simplemapper-padding.000000005.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0722-simplemapper-padding.000000005.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -0722-simplemapper-padding.000000005.out Deleted: trunk/tests/language-behaviour/0722-simplemapper-padding.000075943.out.expected =================================================================== --- trunk/tests/language-behaviour/0722-simplemapper-padding.000075943.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0722-simplemapper-padding.000075943.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -0722-simplemapper-padding.000075943.out Deleted: trunk/tests/language-behaviour/0722-simplemapper-padding.swift =================================================================== --- trunk/tests/language-behaviour/0722-simplemapper-padding.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0722-simplemapper-padding.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,17 +0,0 @@ -type messagefile; - -(messagefile t) write() { - app { - echo @filename(t) stdout=@filename(t); - } -} - -messagefile outfile[] ; - -outfile[0] = write(); -outfile[5] = write(); -outfile[75943] = write(); - Deleted: trunk/tests/language-behaviour/0723-simplemapper-nopadding.0.out.expected =================================================================== --- trunk/tests/language-behaviour/0723-simplemapper-nopadding.0.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0723-simplemapper-nopadding.0.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -0723-simplemapper-nopadding.0.out Deleted: trunk/tests/language-behaviour/0723-simplemapper-nopadding.5.out.expected =================================================================== --- trunk/tests/language-behaviour/0723-simplemapper-nopadding.5.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0723-simplemapper-nopadding.5.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -0723-simplemapper-nopadding.5.out Deleted: trunk/tests/language-behaviour/0723-simplemapper-nopadding.75943.out.expected =================================================================== --- trunk/tests/language-behaviour/0723-simplemapper-nopadding.75943.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0723-simplemapper-nopadding.75943.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -0723-simplemapper-nopadding.75943.out Deleted: trunk/tests/language-behaviour/0723-simplemapper-nopadding.swift =================================================================== --- trunk/tests/language-behaviour/0723-simplemapper-nopadding.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0723-simplemapper-nopadding.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,17 +0,0 @@ -type messagefile; - -(messagefile t) write() { - app { - echo @filename(t) stdout=@filename(t); - } -} - -messagefile outfile[] ; - -outfile[0] = write(); -outfile[5] = write(); -outfile[75943] = write(); - Deleted: trunk/tests/language-behaviour/073-simplemapper.out.expected =================================================================== --- trunk/tests/language-behaviour/073-simplemapper.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/073-simplemapper.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -073-simplemapper.out Deleted: trunk/tests/language-behaviour/073-simplemapper.swift =================================================================== --- trunk/tests/language-behaviour/073-simplemapper.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/073-simplemapper.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,17 +0,0 @@ -// this one is like test 072-simplemapper, but checks that -// a dot is added to the front of the suffix if its missing - -type messagefile; - -(messagefile t) write() { - app { - echo @filename(t) stdout=@filename(t); - } -} - -messagefile outfile ; - -outfile = write(); - Deleted: trunk/tests/language-behaviour/075-array-mapper.first.out.expected =================================================================== --- trunk/tests/language-behaviour/075-array-mapper.first.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/075-array-mapper.first.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -075-array-mapper.first.out Deleted: trunk/tests/language-behaviour/075-array-mapper.second.out.expected =================================================================== --- trunk/tests/language-behaviour/075-array-mapper.second.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/075-array-mapper.second.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -075-array-mapper.second.out Deleted: trunk/tests/language-behaviour/075-array-mapper.swift =================================================================== --- trunk/tests/language-behaviour/075-array-mapper.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/075-array-mapper.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,18 +0,0 @@ -type messagefile; - -(messagefile t) write() { - app { - echo @filename(t) stdout=@filename(t); - } -} - -string fns[]=["075-array-mapper.first.out", - "075-array-mapper.second.out", - "075-array-mapper.third.out"]; - -messagefile outfile[] ; - -outfile[0] = write(); -outfile[1] = write(); -outfile[2] = write(); - Deleted: trunk/tests/language-behaviour/075-array-mapper.third.out.expected =================================================================== --- trunk/tests/language-behaviour/075-array-mapper.third.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/075-array-mapper.third.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -075-array-mapper.third.out Deleted: trunk/tests/language-behaviour/0751-fixed-array-mapper.first.out.expected =================================================================== --- trunk/tests/language-behaviour/0751-fixed-array-mapper.first.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0751-fixed-array-mapper.first.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -slot 0 Deleted: trunk/tests/language-behaviour/0751-fixed-array-mapper.second.out.expected =================================================================== --- trunk/tests/language-behaviour/0751-fixed-array-mapper.second.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0751-fixed-array-mapper.second.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -slot 1 Deleted: trunk/tests/language-behaviour/0751-fixed-array-mapper.swift =================================================================== --- trunk/tests/language-behaviour/0751-fixed-array-mapper.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0751-fixed-array-mapper.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,16 +0,0 @@ -type messagefile; - -(messagefile t) write(string s) { - app { - echo s stdout=@filename(t); - } -} - -string fns="0751-fixed-array-mapper.first.out 0751-fixed-array-mapper.second.out 0751-fixed-array-mapper.third.out"; - -messagefile outfile[] ; - -outfile[0] = write("slot 0"); -outfile[1] = write("slot 1"); -outfile[2] = write("slot 2"); - Deleted: trunk/tests/language-behaviour/0751-fixed-array-mapper.third.out.expected =================================================================== --- trunk/tests/language-behaviour/0751-fixed-array-mapper.third.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0751-fixed-array-mapper.third.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -slot 2 Deleted: trunk/tests/language-behaviour/07511-fixed-array-mapper-input.check.sh =================================================================== --- trunk/tests/language-behaviour/07511-fixed-array-mapper-input.check.sh 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/07511-fixed-array-mapper-input.check.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,12 +0,0 @@ -#!/bin/bash - -set -x - -cat stdout.txt - -X=$( grep -c "file: 07511" stdout.txt ) -[ $? == 0 ] || exit 1 -echo $X -(( $X == 3 )) || exit 1 - -exit 0 Deleted: trunk/tests/language-behaviour/07511-fixed-array-mapper-input.clean.sh =================================================================== --- trunk/tests/language-behaviour/07511-fixed-array-mapper-input.clean.sh 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/07511-fixed-array-mapper-input.clean.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,7 +0,0 @@ -#!/bin/bash - -set -x - -rm -v $GROUP/07511-fixed-array-mapper-input.*.in || exit 1 - -exit 0 Deleted: trunk/tests/language-behaviour/07511-fixed-array-mapper-input.first.in =================================================================== Deleted: trunk/tests/language-behaviour/07511-fixed-array-mapper-input.second.in =================================================================== Deleted: trunk/tests/language-behaviour/07511-fixed-array-mapper-input.setup.sh =================================================================== --- trunk/tests/language-behaviour/07511-fixed-array-mapper-input.setup.sh 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/07511-fixed-array-mapper-input.setup.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,7 +0,0 @@ -#!/bin/bash - -set -x - -cp -v $GROUP/07511-fixed-array-mapper-input.*.in . || exit 1 - -exit 0 Deleted: trunk/tests/language-behaviour/07511-fixed-array-mapper-input.swift =================================================================== --- trunk/tests/language-behaviour/07511-fixed-array-mapper-input.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/07511-fixed-array-mapper-input.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,19 +0,0 @@ -type messagefile; - -/* -app p(messagefile t) { - echo "foo" stdin=@filename(t); -} -*/ -string fns="07511-fixed-array-mapper-input.first.in 07511-fixed-array-mapper-input.second.in 07511-fixed-array-mapper-input.third.in"; - -messagefile infile[] ; - -/* -p(infile[0]); -p(infile[1]); -p(infile[2]); -*/ -tracef("file: %s\n", @filename(infile[0])); -tracef("file: %s\n", @filename(infile[1])); -tracef("file: %s\n", @filename(infile[2])); Deleted: trunk/tests/language-behaviour/07511-fixed-array-mapper-input.third.in =================================================================== Deleted: trunk/tests/language-behaviour/07513-fixed-array-mapper-filename.real.out.expected =================================================================== --- trunk/tests/language-behaviour/07513-fixed-array-mapper-filename.real.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/07513-fixed-array-mapper-filename.real.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -q r s t Deleted: trunk/tests/language-behaviour/07513-fixed-array-mapper-filename.swift =================================================================== --- trunk/tests/language-behaviour/07513-fixed-array-mapper-filename.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/07513-fixed-array-mapper-filename.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,19 +0,0 @@ -type messagefile; - -(messagefile t) write(string s) { - app { - echo s stdout=@filename(t); - } -} - -string fns="q r s t"; - -messagefile outfile[] ; -messagefile realoutput <"07513-fixed-array-mapper-filename.real.out">; - -string fn; - -fn = @filename(outfile); - -realoutput = write(fn); - Deleted: trunk/tests/language-behaviour/07514-fixed-array-mapper-filenames.a.in =================================================================== --- trunk/tests/language-behaviour/07514-fixed-array-mapper-filenames.a.in 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/07514-fixed-array-mapper-filenames.a.in 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -foo Deleted: trunk/tests/language-behaviour/07514-fixed-array-mapper-filenames.b.in =================================================================== --- trunk/tests/language-behaviour/07514-fixed-array-mapper-filenames.b.in 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/07514-fixed-array-mapper-filenames.b.in 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -foo Deleted: trunk/tests/language-behaviour/07514-fixed-array-mapper-filenames.real.out.expected =================================================================== --- trunk/tests/language-behaviour/07514-fixed-array-mapper-filenames.real.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/07514-fixed-array-mapper-filenames.real.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -07514-fixed-array-mapper-filenames.a.in 07514-fixed-array-mapper-filenames.b.in Deleted: trunk/tests/language-behaviour/07514-fixed-array-mapper-filenames.swift =================================================================== --- trunk/tests/language-behaviour/07514-fixed-array-mapper-filenames.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/07514-fixed-array-mapper-filenames.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,17 +0,0 @@ -type messagefile; - -(messagefile t) write(messagefile s[]) { - app { - echo @filenames(s) stdout=@filename(t); - } -} - -string fns="07514-fixed-array-mapper-filenames.a.in 07514-fixed-array-mapper-filenames.b.in"; - -messagefile outfile[] ; -messagefile realoutput <"07514-fixed-array-mapper-filenames.real.out">; - -string fn; - -realoutput = write(outfile); - Deleted: trunk/tests/language-behaviour/0752-csv-mapper.csv =================================================================== --- trunk/tests/language-behaviour/0752-csv-mapper.csv 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0752-csv-mapper.csv 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,4 +0,0 @@ -l,r -0752-csv-mapper.left-zero.out,0752-csv-mapper.right-zero.out -0752-csv-mapper.left-one.out,0752-csv-mapper.right-one.out -0752-csv-mapper.left-two.out,0752-csv-mapper.right-two.out Deleted: trunk/tests/language-behaviour/0752-csv-mapper.left-two.out.expected =================================================================== --- trunk/tests/language-behaviour/0752-csv-mapper.left-two.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0752-csv-mapper.left-two.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -slot 2 Deleted: trunk/tests/language-behaviour/0752-csv-mapper.left-zero.out.expected =================================================================== --- trunk/tests/language-behaviour/0752-csv-mapper.left-zero.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0752-csv-mapper.left-zero.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -slot 0 Deleted: trunk/tests/language-behaviour/0752-csv-mapper.right-one.out.expected =================================================================== --- trunk/tests/language-behaviour/0752-csv-mapper.right-one.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0752-csv-mapper.right-one.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -slot 1 Deleted: trunk/tests/language-behaviour/0752-csv-mapper.swift =================================================================== --- trunk/tests/language-behaviour/0752-csv-mapper.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0752-csv-mapper.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,19 +0,0 @@ -type messagefile; - -type cols { - messagefile l; - messagefile r; -} - -(messagefile t) write(string s) { - app { - echo s stdout=@filename(t); - } -} - -cols outfile[] ; - -outfile[0].l = write("slot 0"); -outfile[1].r = write("slot 1"); -outfile[2].l = write("slot 2"); - Deleted: trunk/tests/language-behaviour/0753-filesystem-mapper.a.out.expected =================================================================== --- trunk/tests/language-behaviour/0753-filesystem-mapper.a.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0753-filesystem-mapper.a.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -0753-filesystem-mapper.blue.in Deleted: trunk/tests/language-behaviour/0753-filesystem-mapper.b.out.expected =================================================================== --- trunk/tests/language-behaviour/0753-filesystem-mapper.b.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0753-filesystem-mapper.b.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -0753-filesystem-mapper.green.in Deleted: trunk/tests/language-behaviour/0753-filesystem-mapper.blue.in =================================================================== Deleted: trunk/tests/language-behaviour/0753-filesystem-mapper.c.out.expected =================================================================== --- trunk/tests/language-behaviour/0753-filesystem-mapper.c.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0753-filesystem-mapper.c.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -0753-filesystem-mapper.red.in Deleted: trunk/tests/language-behaviour/0753-filesystem-mapper.green.in =================================================================== Deleted: trunk/tests/language-behaviour/0753-filesystem-mapper.red.in =================================================================== Deleted: trunk/tests/language-behaviour/0754-csv-mapper-input.out.expected =================================================================== --- trunk/tests/language-behaviour/0754-csv-mapper-input.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0754-csv-mapper-input.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -10319 Deleted: trunk/tests/language-behaviour/0754-csv-mapper-input.swift =================================================================== --- trunk/tests/language-behaviour/0754-csv-mapper-input.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0754-csv-mapper-input.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,19 +0,0 @@ -type messagefile; - -type cols { - messagefile l; - messagefile r; -} - -(messagefile t) write(messagefile s) { - app { - cat stdin=@filename(s) stdout=@filename(t); - } -} - -cols infiles[] ; - -messagefile outfile <"0754-csv-mapper-input.out">; - -outfile = write(infiles[1].r); - Deleted: trunk/tests/language-behaviour/0754-csv-mapper.csv =================================================================== --- trunk/tests/language-behaviour/0754-csv-mapper.csv 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0754-csv-mapper.csv 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,4 +0,0 @@ -l,r -0754-csv-mapper.left-zero.in,0754-csv-mapper.right-zero.in -0754-csv-mapper.left-one.in,0754-csv-mapper.right-one.in -0754-csv-mapper.left-two.in,0754-csv-mapper.right-two.in Deleted: trunk/tests/language-behaviour/0754-csv-mapper.left-one.in =================================================================== --- trunk/tests/language-behaviour/0754-csv-mapper.left-one.in 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0754-csv-mapper.left-one.in 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -14708 Deleted: trunk/tests/language-behaviour/0754-csv-mapper.left-two.in =================================================================== --- trunk/tests/language-behaviour/0754-csv-mapper.left-two.in 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0754-csv-mapper.left-two.in 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -102 Deleted: trunk/tests/language-behaviour/0754-csv-mapper.left-zero.in =================================================================== --- trunk/tests/language-behaviour/0754-csv-mapper.left-zero.in 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0754-csv-mapper.left-zero.in 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -9807 Deleted: trunk/tests/language-behaviour/0754-csv-mapper.right-one.in =================================================================== --- trunk/tests/language-behaviour/0754-csv-mapper.right-one.in 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0754-csv-mapper.right-one.in 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -10319 Deleted: trunk/tests/language-behaviour/0754-csv-mapper.right-two.in =================================================================== --- trunk/tests/language-behaviour/0754-csv-mapper.right-two.in 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0754-csv-mapper.right-two.in 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -8709 Deleted: trunk/tests/language-behaviour/0754-csv-mapper.right-zero.in =================================================================== --- trunk/tests/language-behaviour/0754-csv-mapper.right-zero.in 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0754-csv-mapper.right-zero.in 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -2544 Deleted: trunk/tests/language-behaviour/0755-ext-mapper.0.3.2.1.out.expected =================================================================== --- trunk/tests/language-behaviour/0755-ext-mapper.0.3.2.1.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0755-ext-mapper.0.3.2.1.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -slot 1 Deleted: trunk/tests/language-behaviour/0755-ext-mapper.AAA.out.expected =================================================================== --- trunk/tests/language-behaviour/0755-ext-mapper.AAA.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0755-ext-mapper.AAA.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -slot 0 Deleted: trunk/tests/language-behaviour/0755-ext-mapper.____.out.expected =================================================================== --- trunk/tests/language-behaviour/0755-ext-mapper.____.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0755-ext-mapper.____.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -slot 2 Deleted: trunk/tests/language-behaviour/0755-ext-mapper.sh =================================================================== --- trunk/tests/language-behaviour/0755-ext-mapper.sh 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0755-ext-mapper.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,4 +0,0 @@ -echo "[0].l 0755-ext-mapper.AAA.out" -echo "[1].r 0755-ext-mapper.0.3.2.1.out" -echo "[2].l 0755-ext-mapper.____.out" - Deleted: trunk/tests/language-behaviour/0755-ext-mapper.swift =================================================================== --- trunk/tests/language-behaviour/0755-ext-mapper.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0755-ext-mapper.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,19 +0,0 @@ -type messagefile; - -type cols { - messagefile l; - messagefile r; -} - -(messagefile t) write(string s) { - app { - echo s stdout=@filename(t); - } -} - -cols outfile[] ; - -outfile[0].l = write("slot 0"); -outfile[1].r = write("slot 1"); -outfile[2].l = write("slot 2"); - Deleted: trunk/tests/language-behaviour/07551-ext-mapper-single.out.expected =================================================================== --- trunk/tests/language-behaviour/07551-ext-mapper-single.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/07551-ext-mapper-single.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -slot 0 Deleted: trunk/tests/language-behaviour/07551-ext-mapper-single.sh =================================================================== --- trunk/tests/language-behaviour/07551-ext-mapper-single.sh 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/07551-ext-mapper-single.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,2 +0,0 @@ -#!/bin/bash -echo "$ 07551-ext-mapper-single.out" Deleted: trunk/tests/language-behaviour/07551-ext-mapper-single.swift =================================================================== --- trunk/tests/language-behaviour/07551-ext-mapper-single.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/07551-ext-mapper-single.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,12 +0,0 @@ -type messagefile; - -(messagefile t) write(string s) { - app { - echo s stdout=@filename(t); - } -} - -messagefile outfile ; - -outfile = write("slot 0"); - Deleted: trunk/tests/language-behaviour/07552-ext-mapper-numeric.inside.out.expected =================================================================== --- trunk/tests/language-behaviour/07552-ext-mapper-numeric.inside.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/07552-ext-mapper-numeric.inside.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -5000 Deleted: trunk/tests/language-behaviour/07552-ext-mapper-numeric.mapper.out.expected =================================================================== --- trunk/tests/language-behaviour/07552-ext-mapper-numeric.mapper.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/07552-ext-mapper-numeric.mapper.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ --ssss 5000 Deleted: trunk/tests/language-behaviour/07552-ext-mapper-numeric.sh =================================================================== --- trunk/tests/language-behaviour/07552-ext-mapper-numeric.sh 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/07552-ext-mapper-numeric.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,6 +0,0 @@ -#!/bin/bash - -echo $@ > 07552-ext-mapper-numeric.mapper.out - -echo "$ 07552-ext-mapper-numeric.inside.out" - Deleted: trunk/tests/language-behaviour/07552-ext-mapper-numeric.swift =================================================================== --- trunk/tests/language-behaviour/07552-ext-mapper-numeric.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/07552-ext-mapper-numeric.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,13 +0,0 @@ -type messagefile; - -(messagefile t) greeting(int n) { - app { - echo n stdout=@filename(t); - } -} - -int n = 5000; -messagefile outfile ; - -outfile = greeting(n); - Deleted: trunk/tests/language-behaviour/07554-ext-mapper-struct.sh =================================================================== --- trunk/tests/language-behaviour/07554-ext-mapper-struct.sh 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/07554-ext-mapper-struct.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,3 +0,0 @@ -#!/bin/bash -echo "eerste 07554-ext-mapper-struct.a.out" -echo "twede 07554-ext-mapper-struct.b.out" Deleted: trunk/tests/language-behaviour/07554-ext-mapper-struct.swift =================================================================== --- trunk/tests/language-behaviour/07554-ext-mapper-struct.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/07554-ext-mapper-struct.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,18 +0,0 @@ -type messagefile; - -type struct { -messagefile eerste; -messagefile twede; -}; - -(messagefile t) write(string s) { - app { - echo s stdout=@filename(t); - } -} - -struct outfiles ; - -outfiles.eerste = write("1st"); -outfiles.twede = write("2nd"); - Deleted: trunk/tests/language-behaviour/07555-ext-mapper-twostruct.sh =================================================================== --- trunk/tests/language-behaviour/07555-ext-mapper-twostruct.sh 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/07555-ext-mapper-twostruct.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,5 +0,0 @@ -#!/bin/bash -echo "eerste 07555-ext-mapper-twostruct.a.out" -echo "twede 07555-ext-mapper-twostruct.b.out" -echo "derde.links 07555-ext-mapper-twostruct.cl.out" -echo "derde.rechts 07555-ext-mapper-twostruct.cr.out" Deleted: trunk/tests/language-behaviour/07555-ext-mapper-twostruct.swift =================================================================== --- trunk/tests/language-behaviour/07555-ext-mapper-twostruct.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/07555-ext-mapper-twostruct.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,26 +0,0 @@ -type file; - -type structInner { - file links; - file rechts; -} - -type struct { - file eerste; - file twede; - structInner derde; -}; - -(file t) write(string s) { - app { - echo s stdout=@filename(t); - } -} - -struct outfiles ; - -outfiles.eerste = write("1st"); -outfiles.twede = write("2nd"); -outfiles.derde.links = write("3l"); -outfiles.derde.rechts = write("3r"); - Deleted: trunk/tests/language-behaviour/075551-ext-mapper-twostruct-singleproducer.swift =================================================================== --- trunk/tests/language-behaviour/075551-ext-mapper-twostruct-singleproducer.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/075551-ext-mapper-twostruct-singleproducer.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,23 +0,0 @@ -type file; - -type structInner { - file links; - file rechts; -} - -type struct { - file eerste; - file twede; - structInner derde; -}; - -(struct t) singlewrite() { - app { - touch @filenames(t); - } -} - -struct outfiles ; - -outfiles = singlewrite(); - Deleted: trunk/tests/language-behaviour/0756-ext-mapper-slow.sh =================================================================== --- trunk/tests/language-behaviour/0756-ext-mapper-slow.sh 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0756-ext-mapper-slow.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,8 +0,0 @@ -#!/bin/bash -sleep 10s -echo "[0].l 0756-ext-mapper.AAA.out" -sleep 10s -echo "[1].r 0756-ext-mapper.0.3.2.1.out" -sleep 10s -echo "[2].l 0756-ext-mapper.____.out" -sleep 10s Deleted: trunk/tests/language-behaviour/0756-ext-mapper-slow.swift =================================================================== --- trunk/tests/language-behaviour/0756-ext-mapper-slow.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0756-ext-mapper-slow.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,19 +0,0 @@ -type messagefile; - -type cols { - messagefile l; - messagefile r; -} - -(messagefile t) write(string s) { - app { - echo s stdout=@filename(t); - } -} - -cols outfile[] ; - -outfile[0].l = write("slot 0"); -outfile[1].r = write("slot 1"); -outfile[2].l = write("slot 2"); - Deleted: trunk/tests/language-behaviour/0757-ext-mapper-array.sh =================================================================== --- trunk/tests/language-behaviour/0757-ext-mapper-array.sh 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0757-ext-mapper-array.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,4 +0,0 @@ -echo "[0] 0757-ext-mapper-array.AAA.out" -echo "[1] 0757-ext-mapper-array.0.3.2.1.out" -echo "[2] 0757-ext-mapper-array.____.out" - Deleted: trunk/tests/language-behaviour/0757-ext-mapper-array.swift =================================================================== --- trunk/tests/language-behaviour/0757-ext-mapper-array.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0757-ext-mapper-array.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,14 +0,0 @@ -type messagefile; - -(messagefile t) write(string s) { - app { - echo s stdout=@filename(t); - } -} - -messagefile outfile[] ; - -outfile[0] = write("slot 0"); -outfile[1] = write("slot 1"); -outfile[2] = write("slot 2"); - Deleted: trunk/tests/language-behaviour/0758-ext-mapper-array.sh =================================================================== --- trunk/tests/language-behaviour/0758-ext-mapper-array.sh 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0758-ext-mapper-array.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,4 +0,0 @@ -echo "[0] 0757-ext-mapper-array.AAA.out" -echo "[1] 0757-ext-mapper-array.0.3.2.1.out" -echo "[2] 0757-ext-mapper-array.____.out" - Deleted: trunk/tests/language-behaviour/0758-ext-mapper-array.swift =================================================================== --- trunk/tests/language-behaviour/0758-ext-mapper-array.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0758-ext-mapper-array.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,13 +0,0 @@ -type messagefile; - -(messagefile t) write(string s) { - app { - echo s stdout=@filename(t); - } -} - -messagefile outfile[] ; - -foreach f,i in [0:2] { - outfile[i] = write("slot X"); -} Deleted: trunk/tests/language-behaviour/0759-ext-mapper-array.sh =================================================================== --- trunk/tests/language-behaviour/0759-ext-mapper-array.sh 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0759-ext-mapper-array.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,3 +0,0 @@ -#!/bin/bash -echo [0] 0759-ext-mapper-array.a.out -echo [1] 0759-ext-mapper-array.q.out Deleted: trunk/tests/language-behaviour/0759-ext-mapper-array.swift =================================================================== --- trunk/tests/language-behaviour/0759-ext-mapper-array.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0759-ext-mapper-array.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,12 +0,0 @@ -type file; - -(file t[]) write() { - app { - touch "0759-ext-mapper-array.a.out" "0759-ext-mapper-array.q.out"; - } -} - -file outfile[] ; - -outfile = write(); - Deleted: trunk/tests/language-behaviour/07591-ext-mapper-multidimensional-array.sh =================================================================== --- trunk/tests/language-behaviour/07591-ext-mapper-multidimensional-array.sh 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/07591-ext-mapper-multidimensional-array.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,5 +0,0 @@ -#!/bin/bash -echo [0][0].a out.n/1foo/0/00/00/ST.TU.pdt -echo [0][0].b out.n/1foo/0/00/00/ST.TU.rmsd - - Deleted: trunk/tests/language-behaviour/07591-ext-mapper-multidimensional-array.swift =================================================================== --- trunk/tests/language-behaviour/07591-ext-mapper-multidimensional-array.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/07591-ext-mapper-multidimensional-array.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,17 +0,0 @@ - -type F; - -type S { - F a; - F b; -} - -app (S output[][]) touch() { -touch @filenames(output); -} - -S o[][] ; - -o = touch(); - - Deleted: trunk/tests/language-behaviour/07592-ext-mapper-multidimensional-array-structs.sh =================================================================== --- trunk/tests/language-behaviour/07592-ext-mapper-multidimensional-array-structs.sh 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/07592-ext-mapper-multidimensional-array-structs.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,6 +0,0 @@ -#!/bin/bash -echo [0][0].a out.n/1foo/0/00/00/ST.TU.pdt -echo [0][0].b out.n/1foo/0/00/00/ST.TU.rmsd -echo [0][0].c[0] out.n/1foo/0/00/00/ST.TU.rmsd2 - - Deleted: trunk/tests/language-behaviour/07592-ext-mapper-multidimensional-array-structs.swift =================================================================== --- trunk/tests/language-behaviour/07592-ext-mapper-multidimensional-array-structs.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/07592-ext-mapper-multidimensional-array-structs.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,18 +0,0 @@ - -type F; - -type S { - F a; - F b; - F c[]; -} - -app (S output[][]) touch() { -touch @filenames(output); -} - -S o[][] ; - -o = touch(); - - Deleted: trunk/tests/language-behaviour/076-structured-regexp-mapper.b.out.expected =================================================================== --- trunk/tests/language-behaviour/076-structured-regexp-mapper.b.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/076-structured-regexp-mapper.b.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -Hello, world! Deleted: trunk/tests/language-behaviour/076-structured-regexp-mapper.swift =================================================================== --- trunk/tests/language-behaviour/076-structured-regexp-mapper.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/076-structured-regexp-mapper.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,25 +0,0 @@ -type messagefile {} - -(messagefile t) greeting() { - app { - echo "Hello, world!" stdout=@filename(t); - } -} - -(messagefile t) greeting2(messagefile ignored) { - app { - echo "Hello, world!" stdout=@filename(t); - } -} - - -messagefile outfile <"076-structured-regexp-mapper.a.out">; -messagefile outfile2 ; - -outfile = greeting(); - -outfile2 = greeting2(outfile); Deleted: trunk/tests/language-behaviour/077-regexp-mapper.foo.out.expected =================================================================== --- trunk/tests/language-behaviour/077-regexp-mapper.foo.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/077-regexp-mapper.foo.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -hello Deleted: trunk/tests/language-behaviour/077-regexp-mapper.swift =================================================================== --- trunk/tests/language-behaviour/077-regexp-mapper.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/077-regexp-mapper.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,15 +0,0 @@ -type messagefile; - -(messagefile t) greeting() { - app { - echo "hello" stdout=@filename(t); - } -} - -messagefile outfile ; - -outfile = greeting(); - Deleted: trunk/tests/language-behaviour/078-singlefilemapper-name-expression.out.expected =================================================================== --- trunk/tests/language-behaviour/078-singlefilemapper-name-expression.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/078-singlefilemapper-name-expression.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -078-singlefilemapper-name-expression.out Deleted: trunk/tests/language-behaviour/078-singlefilemapper-name-expression.swift =================================================================== --- trunk/tests/language-behaviour/078-singlefilemapper-name-expression.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/078-singlefilemapper-name-expression.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,14 +0,0 @@ -type messagefile; - -(messagefile t) write() { - app { - echo @filename(t) stdout=@filename(t); - } -} - -string fn = "078-singlefilemapper-name-expression.out"; - -messagefile outfile ; - -outfile = write(); - Deleted: trunk/tests/language-behaviour/0781-singlefilemapper-name-expression.out.expected =================================================================== --- trunk/tests/language-behaviour/0781-singlefilemapper-name-expression.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0781-singlefilemapper-name-expression.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -0781-singlefilemapper-name-expression.out Deleted: trunk/tests/language-behaviour/0781-singlefilemapper-name-expression.swift =================================================================== --- trunk/tests/language-behaviour/0781-singlefilemapper-name-expression.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0781-singlefilemapper-name-expression.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,14 +0,0 @@ -type messagefile; - -(messagefile t) write() { - app { - echo @filename(t) stdout=@filename(t); - } -} - -string fn = "0781-singlefilemapper-name-expression"; - -messagefile outfile ; - -outfile = write(); - Deleted: trunk/tests/language-behaviour/079-regression-r970-simple-mapper-expr-prefix.out.expected =================================================================== --- trunk/tests/language-behaviour/079-regression-r970-simple-mapper-expr-prefix.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/079-regression-r970-simple-mapper-expr-prefix.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -079-regression-r970-simple-mapper-expr-prefix.out Deleted: trunk/tests/language-behaviour/079-regression-r970-simple-mapper-expr-prefix.swift =================================================================== --- trunk/tests/language-behaviour/079-regression-r970-simple-mapper-expr-prefix.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/079-regression-r970-simple-mapper-expr-prefix.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,14 +0,0 @@ -type messagefile; - -(messagefile t) write() { - app { - echo @filename(t) stdout=@filename(t); - } -} - -string fn = "079-regression-r970-simple-mapper-expr-prefix"; - -messagefile outfile ; - -outfile = write(); - Deleted: trunk/tests/language-behaviour/0791-regression-r970-simple-mapper-expr-prefix.out.expected =================================================================== --- trunk/tests/language-behaviour/0791-regression-r970-simple-mapper-expr-prefix.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0791-regression-r970-simple-mapper-expr-prefix.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -0791-regression-r970-simple-mapper-expr-prefix.out Deleted: trunk/tests/language-behaviour/0791-regression-r970-simple-mapper-expr-prefix.swift =================================================================== --- trunk/tests/language-behaviour/0791-regression-r970-simple-mapper-expr-prefix.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/0791-regression-r970-simple-mapper-expr-prefix.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,16 +0,0 @@ -type messagefile; - -(messagefile t) write() { - app { - echo @filename(t) stdout=@filename(t); - } -} - -string a = "0791-regression-r970"; -string b = "-simple-mapper-"; -string c = "expr-prefix"; - -messagefile outfile ; - -outfile = write(); - Deleted: trunk/tests/language-behaviour/083-array-assign.swift =================================================================== --- trunk/tests/language-behaviour/083-array-assign.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/083-array-assign.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,13 +0,0 @@ -type messagefile; - -(messagefile t) greeting(string m) { - app { - echo m stdout=@filename(t); - } -} - -messagefile outfile[]; - -outfile[0] = greeting("hi"); -outfile[1] = greeting("bye"); - Deleted: trunk/tests/language-behaviour/086-iterate-concurrent.check.sh =================================================================== --- trunk/tests/language-behaviour/086-iterate-concurrent.check.sh 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/086-iterate-concurrent.check.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,8 +0,0 @@ -#!/bin/sh - -set -x - -LINES=$( cat _concurrent/outfile-* | grep -c hello ) -[[ ${LINES} == 12 ]] || exit 1 - -exit 0 Deleted: trunk/tests/language-behaviour/086-iterate-concurrent.clean.sh =================================================================== --- trunk/tests/language-behaviour/086-iterate-concurrent.clean.sh 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/086-iterate-concurrent.clean.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,7 +0,0 @@ -#!/bin/sh - -set -x - -rm -rfv _concurrent - -exit 0 Deleted: trunk/tests/language-behaviour/086-iterate-concurrent.setup.sh =================================================================== --- trunk/tests/language-behaviour/086-iterate-concurrent.setup.sh 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/086-iterate-concurrent.setup.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,7 +0,0 @@ -#!/bin/sh - -set -x - -rm -rfv _concurrent - -exit 0 Deleted: trunk/tests/language-behaviour/086-iterate-concurrent.swift =================================================================== --- trunk/tests/language-behaviour/086-iterate-concurrent.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/086-iterate-concurrent.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,12 +0,0 @@ -type messagefile; - -app (messagefile t) greeting() { - echo "hello" stdout=@filename(t); -} - -iterate i { - messagefile outfile; - outfile = greeting(); -} until(i>10); - - Deleted: trunk/tests/language-behaviour/087-iterate-previous.check.sh =================================================================== --- trunk/tests/language-behaviour/087-iterate-previous.check.sh 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/087-iterate-previous.check.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,8 +0,0 @@ -#!/bin/sh - -set -x - -LINES=$( cat file-*.txt | grep -c HOWDY ) -[[ ${LINES} == 7 ]] || exit 1 - -exit 0 Deleted: trunk/tests/language-behaviour/087-iterate-previous.clean.sh =================================================================== --- trunk/tests/language-behaviour/087-iterate-previous.clean.sh 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/087-iterate-previous.clean.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,7 +0,0 @@ -#!/bin/sh - -set -x - -rm -fv file-*.txt - -exit 0 Deleted: trunk/tests/language-behaviour/087-iterate-previous.setup.sh =================================================================== --- trunk/tests/language-behaviour/087-iterate-previous.setup.sh 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/087-iterate-previous.setup.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,7 +0,0 @@ -#!/bin/sh - -set -x - -echo HOWDY > file-0.txt - -exit 0 Deleted: trunk/tests/language-behaviour/087-iterate-previous.swift =================================================================== --- trunk/tests/language-behaviour/087-iterate-previous.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/087-iterate-previous.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,16 +0,0 @@ -type file; - -app (file o) copy(file i) { - cp @i @o; -} - -file input<"file-0.txt">; - -iterate i { - string si = @strcat("file-",i,".txt"); - int j = i+1; - string sj = @strcat("file-",j,".txt"); - file fi; - file fj; - fj = copy(fi); -} until(i==5); Deleted: trunk/tests/language-behaviour/088-sequential-assign.swift =================================================================== --- trunk/tests/language-behaviour/088-sequential-assign.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/088-sequential-assign.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,8 +0,0 @@ -int a; -int b; -int c; -trace(c); -c=b; -b=a; -a=8645; - Deleted: trunk/tests/language-behaviour/110-array-range-exprs.swift =================================================================== --- trunk/tests/language-behaviour/110-array-range-exprs.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/110-array-range-exprs.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,2 +0,0 @@ - -int i[] = [ 1+1 : 5+5 : 1*3 ]; Deleted: trunk/tests/language-behaviour/1101-array-range.swift =================================================================== --- trunk/tests/language-behaviour/1101-array-range.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/1101-array-range.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,8 +0,0 @@ - -int i[] = [0:9]; - -int j[] = [0:9]; - -foreach ix in i { - trace(j[ix]); -} Deleted: trunk/tests/language-behaviour/1102-array-range-step.swift =================================================================== --- trunk/tests/language-behaviour/1102-array-range-step.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/1102-array-range-step.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,8 +0,0 @@ - -int i[] = [0:9]; - -int j[] = [0:19:2]; - -foreach ix in i { - trace(j[ix]); -} Deleted: trunk/tests/language-behaviour/111-array-individual-assigns.out.expected =================================================================== --- trunk/tests/language-behaviour/111-array-individual-assigns.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/111-array-individual-assigns.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -100 Deleted: trunk/tests/language-behaviour/111-array-individual-assigns.swift =================================================================== --- trunk/tests/language-behaviour/111-array-individual-assigns.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/111-array-individual-assigns.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,18 +0,0 @@ - -int i[]; - -i[0]=1; -i[1]=100; -i[2]=10000; - -type messagefile; - -(messagefile t) p(int inp[]) { - app { - echo inp[1] stdout=@filename(t); - } -} - -messagefile outfile <"111-array-individual-assigns.out">; - -outfile = p(i); Deleted: trunk/tests/language-behaviour/150-filesys_mapper.swift =================================================================== --- trunk/tests/language-behaviour/150-filesys_mapper.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/150-filesys_mapper.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,4 +0,0 @@ -type file; - -file f[] ; - Deleted: trunk/tests/language-behaviour/162-dot-on-array.out.expected =================================================================== --- trunk/tests/language-behaviour/162-dot-on-array.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/162-dot-on-array.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -two-C Deleted: trunk/tests/language-behaviour/162-dot-on-array.swift =================================================================== --- trunk/tests/language-behaviour/162-dot-on-array.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/162-dot-on-array.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,36 +0,0 @@ -type messagefile; - -(messagefile t) greeting(string s) { - app { - echo s stdout=@filename(t); - } -} - -messagefile outfile <"162-dot-on-array.out">; - -type astruct { - string a; - string b; - string c; -}; - -astruct foo[]; - -foo[0].a = "zero-A"; -foo[0].b = "zero-B"; -foo[0].c = "zero-C"; - -foo[1].a = "one-A"; -foo[1].b = "one-B"; -foo[1].c = "one-C"; - -foo[2].a = "two-A"; -foo[2].b = "two-B"; -foo[2].c = "two-C"; - -string s[] = foo.c; - -string u = s[2]; - -outfile = greeting(u); - Deleted: trunk/tests/language-behaviour/760-csv-mapper.sh =================================================================== --- trunk/tests/language-behaviour/760-csv-mapper.sh 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/760-csv-mapper.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,10 +0,0 @@ -#!/bin/sh - -NAME=$1 -CSV_OUT=$2 - -{ - echo "m" - touch $NAME - echo $NAME -} > $CSV_OUT Deleted: trunk/tests/language-behaviour/760-csv-mapper.swift =================================================================== --- trunk/tests/language-behaviour/760-csv-mapper.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/760-csv-mapper.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,28 +0,0 @@ - -type file; - -type s -{ - file m; -} - -app (file out) create () -{ - echo_sh "file1" @filename(out); -} - -(file result) list (file inf) -{ - s diffs[] ; - foreach f, i in diffs - { - tracef("%s\n", @f.m); - } -} - -file o<"tmp.csv">; -file i; -file p; - -o = create(); -p = list(o); Modified: trunk/tests/language-behaviour/IO/001-echo.swift =================================================================== --- trunk/tests/language-behaviour/IO/001-echo.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/IO/001-echo.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,12 +1,8 @@ type messagefile; -(messagefile t) greeting() { - app { +app (messagefile t) greeting() { echo "hello" stdout=@filename(t); - } } - messagefile outfile <"001-echo.out">; - outfile = greeting(); Modified: trunk/tests/language-behaviour/IO/0012-echo-map.swift =================================================================== --- trunk/tests/language-behaviour/IO/0012-echo-map.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/IO/0012-echo-map.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,9 +1,7 @@ type messagefile; -(messagefile t) greeting() { - app { +app (messagefile t) greeting() { echo "hello" stdout=@filename(t); - } } messagefile outfile <"0012-echo-map.out"> = greeting(); Copied: trunk/tests/language-behaviour/IO/0013-out-of-order.out.expected (from rev 4653, trunk/tests/language-behaviour/0013-out-of-order.out.expected) =================================================================== --- trunk/tests/language-behaviour/IO/0013-out-of-order.out.expected (rev 0) +++ trunk/tests/language-behaviour/IO/0013-out-of-order.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -0,0 +1 @@ +hello Copied: trunk/tests/language-behaviour/IO/0013-out-of-order.swift (from rev 4653, trunk/tests/language-behaviour/0013-out-of-order.swift) =================================================================== --- trunk/tests/language-behaviour/IO/0013-out-of-order.swift (rev 0) +++ trunk/tests/language-behaviour/IO/0013-out-of-order.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -0,0 +1,10 @@ +type messagefile; + +app (messagefile t) greeting() { + echo "hello" stdout=@filename(t); +} + +messagefile outfile <"0013-out-of-order.out">; + +outfile = greeting(); + Copied: trunk/tests/language-behaviour/IO/0021-param-bind.out.expected (from rev 4653, trunk/tests/language-behaviour/0021-param-bind.out.expected) =================================================================== --- trunk/tests/language-behaviour/IO/0021-param-bind.out.expected (rev 0) +++ trunk/tests/language-behaviour/IO/0021-param-bind.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -0,0 +1 @@ +hi there Copied: trunk/tests/language-behaviour/IO/0021-param-bind.swift (from rev 4653, trunk/tests/language-behaviour/0021-param-bind.swift) =================================================================== --- trunk/tests/language-behaviour/IO/0021-param-bind.swift (rev 0) +++ trunk/tests/language-behaviour/IO/0021-param-bind.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -0,0 +1,9 @@ +type messagefile {} + +app (messagefile t) greeting(string left, string right) { + echo left right stdout=@filename(t); +} + +messagefile outfile <"0021-param-bind.out">; + +outfile = greeting(right="there", left="hi"); Modified: trunk/tests/language-behaviour/IO/060-duplicate.check.sh =================================================================== --- trunk/tests/language-behaviour/IO/060-duplicate.check.sh 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/IO/060-duplicate.check.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,5 +1,5 @@ #!/bin/bash -grep 060-duplicate.in 060-duplicate.out || exit 1 +cat 060-duplicate.out | grep 060-duplicate.in || exit 1 exit 0 Modified: trunk/tests/language-behaviour/IO/060-duplicate.swift =================================================================== --- trunk/tests/language-behaviour/IO/060-duplicate.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/IO/060-duplicate.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -5,10 +5,8 @@ file output <"060-duplicate.out">; -(file t) echo(file m) { - app { +app (file t) echo(file m) { echo @filename(m) stdout=@filename(t); - } } output = echo(input); Copied: trunk/tests/language-behaviour/IO/061-cattwo.swift (from rev 4653, trunk/tests/language-behaviour/061-cattwo.swift) =================================================================== --- trunk/tests/language-behaviour/IO/061-cattwo.swift (rev 0) +++ trunk/tests/language-behaviour/IO/061-cattwo.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -0,0 +1,14 @@ +type file; + + +file inputA <"061-cattwo.1.in">; +file inputB <"061-cattwo.2.in">; + +file output <"061-cattwo.out">; + +app (file t) cat(file m, file n) { + cat @filename(m) @filename(n) stdout=@filename(t); +} + +output = cat(inputA, inputB); + Copied: trunk/tests/language-behaviour/IO/062-two-in-a-row.a.out.expected (from rev 4653, trunk/tests/language-behaviour/062-two-in-a-row.a.out.expected) =================================================================== --- trunk/tests/language-behaviour/IO/062-two-in-a-row.a.out.expected (rev 0) +++ trunk/tests/language-behaviour/IO/062-two-in-a-row.a.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -0,0 +1 @@ +Hello, world! Copied: trunk/tests/language-behaviour/IO/062-two-in-a-row.b.out.expected (from rev 4653, trunk/tests/language-behaviour/062-two-in-a-row.b.out.expected) =================================================================== --- trunk/tests/language-behaviour/IO/062-two-in-a-row.b.out.expected (rev 0) +++ trunk/tests/language-behaviour/IO/062-two-in-a-row.b.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -0,0 +1 @@ +Hello, world! Copied: trunk/tests/language-behaviour/IO/062-two-in-a-row.swift (from rev 4653, trunk/tests/language-behaviour/062-two-in-a-row.swift) =================================================================== --- trunk/tests/language-behaviour/IO/062-two-in-a-row.swift (rev 0) +++ trunk/tests/language-behaviour/IO/062-two-in-a-row.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -0,0 +1,17 @@ +type messagefile {} + +app (messagefile t) greeting() { + echo "Hello, world!" stdout=@filename(t); +} + +app (messagefile t) greeting2(messagefile ignored) { + echo "Hello, world!" stdout=@filename(t); +} + + +messagefile outfile <"062-two-in-a-row.a.out">; +messagefile outfile2 <"062-two-in-a-row.b.out">; + +outfile = greeting(); + +outfile2 = greeting2(outfile); Modified: trunk/tests/language-behaviour/IO/087-external-dataset.swift =================================================================== --- trunk/tests/language-behaviour/IO/087-external-dataset.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/IO/087-external-dataset.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,15 +1,11 @@ type file; -(external o) a() { - app { +app (external o) a() { touch "foo"; - } } -b(external o) { - app { +app b(external o) { touch "bar"; - } } external sync; Modified: trunk/tests/language-behaviour/IO/130-fmri.swift =================================================================== --- trunk/tests/language-behaviour/IO/130-fmri.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/IO/130-fmri.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,4 +1,3 @@ - # attempt to emulate the workflow patterns of the fMRI workflow that # I often fiddle with. @@ -28,28 +27,22 @@ aligned[i] = align(inputs[i], template); } -(volume o) align(volume candidate, volume template) { - app { +app (volume o) align(volume candidate, volume template) { touch @o.v @o.h; - } } // take average of all 4 (or 5?) volumes -(volume avg) average(volume candidates[]) { - app { +app (volume avg) average(volume candidates[]) { touch @avg.v @avg.h; - } } volume brainatlas = average(aligned); // make 3 slices of the average volume, along x, y, z axes -(slice s) slicer(volume atlas, string axis) { - app { +app (slice s) slicer(volume atlas, string axis) { touch @s; - } } slice slices[]; @@ -64,10 +57,8 @@ jpeg final[] ; -(jpeg j) convert(slice s) { - app { +app (jpeg j) convert(slice s) { touch @j; - } } foreach j,i in slices { Deleted: trunk/tests/language-behaviour/IO/761-dirname.swift =================================================================== --- trunk/tests/language-behaviour/IO/761-dirname.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/IO/761-dirname.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,9 +0,0 @@ - -type file{} - -file f<"/d/f.txt">; - -string s = @dirname(f); -string t = @tostring(s); - -tracef("dirname: %s\n", s); Modified: trunk/tests/language-behaviour/IO/q2.swift =================================================================== --- trunk/tests/language-behaviour/IO/q2.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/IO/q2.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,9 +1,7 @@ type messagefile {} -(messagefile t) greeting (string s) { - app { +app (messagefile t) greeting (string s) { echo s stdout=@filename(t); - } } messagefile outfile <"hello2.txt">; Modified: trunk/tests/language-behaviour/IO/q21.swift =================================================================== --- trunk/tests/language-behaviour/IO/q21.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/IO/q21.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,9 +1,7 @@ -type messagefile {} +type messagefile; -(messagefile t) greeting (string s="hello") { - app { +app (messagefile t) greeting (string s="hello") { echo s stdout=@filename(t); - } } messagefile english <"english2.txt">; Modified: trunk/tests/language-behaviour/IO/q22.swift =================================================================== --- trunk/tests/language-behaviour/IO/q22.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/IO/q22.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,10 +1,8 @@ type messagefile {} type countfile {} -(countfile t) countwords (messagefile f) { - app { +app (countfile t) countwords (messagefile f) { wc "-w" @filename(f) stdout=@filename(t); - } } string inputNames = "one.txt two.txt three.txt"; Modified: trunk/tests/language-behaviour/IO/q23.swift =================================================================== --- trunk/tests/language-behaviour/IO/q23.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/IO/q23.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,12 +1,12 @@ +// THIS-SCRIPT-SHOULD-FAIL +// This script should fail because there is no way to pass an argument to a specific swift file within a group. type messagefile {} -(messagefile t) greeting (string s) { - app { +app (messagefile t) greeting (string s) { echo s stdout=@filename(t); - } } -messagefile outfile <"q23.txt">; +messagefile outfile <"q23.out">; string message = @arg("text"); Modified: trunk/tests/language-behaviour/IO/q3.swift =================================================================== --- trunk/tests/language-behaviour/IO/q3.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/IO/q3.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,9 +1,7 @@ type file {} -(file t) echo (string s = "default greeting") { - app { +app (file t) echo (string s = "default greeting") { echo s stdout=@filename(t); - } } file hw = echo(); Deleted: trunk/tests/language-behaviour/IO/q5.swift =================================================================== --- trunk/tests/language-behaviour/IO/q5.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/IO/q5.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,14 +0,0 @@ -type messagefile {} - -(messagefile t) greeting (string s[]) { - app { - echo s[0] s[1] s[2] stdout=@filename(t); - } -} - -messagefile outfile <"q5out.txt">; - -string words[] = ["how","are","you"]; - -outfile = greeting(words); - Modified: trunk/tests/language-behaviour/IO/q6.swift =================================================================== --- trunk/tests/language-behaviour/IO/q6.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/IO/q6.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,9 +1,7 @@ type file {} -(file t) echo (string s) { - app { +app (file t) echo (string s) { echo s stdout=@filename(t); - } } string greetings[] = ["how","are","you"]; Modified: trunk/tests/language-behaviour/IO/q7.swift =================================================================== --- trunk/tests/language-behaviour/IO/q7.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/IO/q7.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,12 +1,10 @@ type file {} -(file t) echo (string s) { - app { +app (file t) echo (string s) { echo s stdout=@filename(t); - } } -string outputNames = "one two three"; +string outputNames[]= ["one", "two", "three"]; file outputFiles[] ; Modified: trunk/tests/language-behaviour/IO/readData.swift =================================================================== --- trunk/tests/language-behaviour/IO/readData.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/IO/readData.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -7,23 +7,17 @@ string name; } -(file f) createInt() { - app{ +app (file f) createInt() { echo "77777" stdout=@filename(f); - } } -(file f) createFloat() { - app{ +app (file f) createFloat() { echo "3.1400001" stdout=@filename(f); - } } -(file f) write(string data) { - app{ +app (file f) write(string data) { echo data stdout=@filename(f); - } } int i; Modified: trunk/tests/language-behaviour/IO/readData2.swift =================================================================== --- trunk/tests/language-behaviour/IO/readData2.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/IO/readData2.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -8,10 +8,8 @@ type file; -(file o) echo(int s) { - app { +app (file o) echo(int s) { echo s stdout=@o; - } } Modified: trunk/tests/language-behaviour/IO/writeDataStringArray2.swift =================================================================== --- trunk/tests/language-behaviour/IO/writeDataStringArray2.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/IO/writeDataStringArray2.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,14 +1,9 @@ type file; - string s[]; - file f <"writeDataStringArray2.out">; - f=writeData(s); - s[2] = "baz"; s[3] = "qux"; s[0] = "foo"; s[1] = "bar"; s[4] = "frrrr"; - Deleted: trunk/tests/language-behaviour/T074-simplemapper.aleph.out.expected =================================================================== --- trunk/tests/language-behaviour/T074-simplemapper.aleph.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/T074-simplemapper.aleph.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -foo Deleted: trunk/tests/language-behaviour/T074-simplemapper.beth.out.expected =================================================================== --- trunk/tests/language-behaviour/T074-simplemapper.beth.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/T074-simplemapper.beth.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -bar Deleted: trunk/tests/language-behaviour/T074-simplemapper.gimel.out.expected =================================================================== --- trunk/tests/language-behaviour/T074-simplemapper.gimel.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/T074-simplemapper.gimel.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -baz Deleted: trunk/tests/language-behaviour/T074-simplemapper.swift =================================================================== --- trunk/tests/language-behaviour/T074-simplemapper.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/T074-simplemapper.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,28 +0,0 @@ - -// The basename of this test must begin with a letter rather than a -// number because the mapper uses the first character to determine -// whether the prefix should be interpreted as a number or as -// a string - see bug 80 - -type messagefile; - -type messagestruct { - messagefile aleph; - messagefile beth; - messagefile gimel; -} - -(messagefile t) stringToFile(string m) { - app { - echo m stdout=@filename(t); - } -} - -messagestruct outstruct ; - -outstruct.aleph = stringToFile("foo"); -outstruct.beth = stringToFile("bar"); -outstruct.gimel = stringToFile("baz"); - Deleted: trunk/tests/language-behaviour/T076-simplemapper-bug80.aleph.out.expected =================================================================== --- trunk/tests/language-behaviour/T076-simplemapper-bug80.aleph.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/T076-simplemapper-bug80.aleph.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -foo Deleted: trunk/tests/language-behaviour/T076-simplemapper-bug80.beth.out.expected =================================================================== --- trunk/tests/language-behaviour/T076-simplemapper-bug80.beth.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/T076-simplemapper-bug80.beth.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -bar Deleted: trunk/tests/language-behaviour/T076-simplemapper-bug80.swift =================================================================== --- trunk/tests/language-behaviour/T076-simplemapper-bug80.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/T076-simplemapper-bug80.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,34 +0,0 @@ - -// The basename of this test must begin with a letter rather than a -// number because the mapper uses the first character to determine -// whether the prefix should be interpreted as a number or as -// a string - see bug 80 - -type messagefile; - -type secondstruct { - messagefile epsilon; - messagefile sigma; -} - -type messagestruct { - messagefile aleph; - messagefile beth; - secondstruct subordinate; -} - -(messagefile t) stringToFile(string m) { - app { - echo m stdout=@filename(t); - } -} - -messagestruct outstruct ; - -outstruct.aleph = stringToFile("foo"); -outstruct.beth = stringToFile("bar"); -outstruct.subordinate.epsilon = stringToFile("E"); -outstruct.subordinate.sigma = stringToFile("S"); - Deleted: trunk/tests/language-behaviour/T077-simplemapper-bug80.aleph.out.expected =================================================================== --- trunk/tests/language-behaviour/T077-simplemapper-bug80.aleph.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/T077-simplemapper-bug80.aleph.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -foo Deleted: trunk/tests/language-behaviour/T077-simplemapper-bug80.beth.out.expected =================================================================== --- trunk/tests/language-behaviour/T077-simplemapper-bug80.beth.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/T077-simplemapper-bug80.beth.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -bar Deleted: trunk/tests/language-behaviour/T077-simplemapper-bug80.swift =================================================================== --- trunk/tests/language-behaviour/T077-simplemapper-bug80.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/T077-simplemapper-bug80.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,39 +0,0 @@ - -// The basename of this test must begin with a letter rather than a -// number because the mapper uses the first character to determine -// whether the prefix should be interpreted as a number or as -// a string - see bug 80 - -type messagefile; - -type tertiarystruct { - messagefile hamza; -} - -type secondstruct { - messagefile epsilon; - messagefile sigma; - tertiarystruct moresubordinate; -} - -type messagestruct { - messagefile aleph; - messagefile beth; - secondstruct subordinate; -} - -(messagefile t) stringToFile(string m) { - app { - echo m stdout=@filename(t); - } -} - -messagestruct outstruct ; - -outstruct.aleph = stringToFile("foo"); -outstruct.beth = stringToFile("bar"); -outstruct.subordinate.epsilon = stringToFile("E"); -outstruct.subordinate.sigma = stringToFile("S"); -outstruct.subordinate.moresubordinate.hamza = stringToFile("misr"); Deleted: trunk/tests/language-behaviour/T077-simplemapper-bug80_subordinate.epsilon.out.expected =================================================================== --- trunk/tests/language-behaviour/T077-simplemapper-bug80_subordinate.epsilon.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/T077-simplemapper-bug80_subordinate.epsilon.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -E Deleted: trunk/tests/language-behaviour/T077-simplemapper-bug80_subordinate.sigma.out.expected =================================================================== --- trunk/tests/language-behaviour/T077-simplemapper-bug80_subordinate.sigma.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/T077-simplemapper-bug80_subordinate.sigma.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -S Deleted: trunk/tests/language-behaviour/T077-simplemapper-bug80_subordinate_moresubordinate.hamza.out.expected =================================================================== --- trunk/tests/language-behaviour/T077-simplemapper-bug80_subordinate_moresubordinate.hamza.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/T077-simplemapper-bug80_subordinate_moresubordinate.hamza.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -misr Deleted: trunk/tests/language-behaviour/T078-simplemapper-nosuffix.swift =================================================================== --- trunk/tests/language-behaviour/T078-simplemapper-nosuffix.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/T078-simplemapper-nosuffix.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,17 +0,0 @@ -// this one is like test 073-simplemapper, but doesn't -// add the missing dot in front of the suffix - -type messagefile; - -(messagefile t) write() { - app { - echo @filename(t) stdout=@filename(t); - } -} - -messagefile outfile ; - -outfile = write(); - Deleted: trunk/tests/language-behaviour/T078-simplemapper-nosuffix_nodot.out.expected =================================================================== --- trunk/tests/language-behaviour/T078-simplemapper-nosuffix_nodot.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/T078-simplemapper-nosuffix_nodot.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -T078-simplemapper-nosuffix_nodot.out Deleted: trunk/tests/language-behaviour/T079-simplemapper-nosuffix_exception.swift =================================================================== --- trunk/tests/language-behaviour/T079-simplemapper-nosuffix_exception.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/T079-simplemapper-nosuffix_exception.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,16 +0,0 @@ -// this one is like test T078-simplemapper-nosuffix, but demonstrates the -// mapping exception on invalid values -type messagefile; - -(messagefile t) write() { - app { - echo @filename(t) stdout=@filename(t); - } -} - -messagefile outfile ; - -outfile = write(); - Deleted: trunk/tests/language-behaviour/array_multidimensional-2.swift =================================================================== --- trunk/tests/language-behaviour/array_multidimensional-2.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/array_multidimensional-2.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,19 +0,0 @@ -type file; - -(file t) echo_array (string s[][]) { - app { - echo s[0][0] s[1][0] s[1][1] stdout=@filename(t); - } -} - -string greetings[][]; - -greetings[0][0] = "left"; -greetings[0][1] = "right"; -greetings[1][0] = "up"; -greetings[1][1] = "down"; - -file hw <"array_multidimensional_index.out">; - -hw = echo_array(greetings); - Deleted: trunk/tests/language-behaviour/array_multidimensional_assign.swift =================================================================== --- trunk/tests/language-behaviour/array_multidimensional_assign.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/array_multidimensional_assign.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,16 +0,0 @@ -type file {} - -(file t) echo_array (string s[][]) { - app { - echo s[0][0] s[1][0] s[1][1] stdout=@filename(t); - } -} - -string greetings[][]; - -greetings = [ [ "left", "right" ], ["up", "down"]]; - -file hw <"array_multidimensional_assign.out">; - -hw = echo_array(greetings); - Deleted: trunk/tests/language-behaviour/array_multidimensional_index.out.expected =================================================================== --- trunk/tests/language-behaviour/array_multidimensional_index.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/array_multidimensional_index.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -left up down Deleted: trunk/tests/language-behaviour/array_multidimensional_index.swift =================================================================== --- trunk/tests/language-behaviour/array_multidimensional_index.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/array_multidimensional_index.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,14 +0,0 @@ -type file {} - -(file t) echo_array (string s[][]) { - app { - echo s[0][0] s[1][0] s[1][1] stdout=@filename(t); - } -} - -string greetings[][] = [ [ "left", "right" ], ["up", "down"]]; - -file hw <"array_multidimensional_index.out">; - -hw = echo_array(greetings); - Modified: trunk/tests/language-behaviour/arrays/028-array-assignment.clean.sh =================================================================== --- trunk/tests/language-behaviour/arrays/028-array-assignment.clean.sh 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/arrays/028-array-assignment.clean.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,5 +1,5 @@ #!/bin/bash set -x -rm -r 027-array-assignment.out 027-array-assignment-* 027-array-assignment.kml 027-array-assignment.xml || exit 1 +rm -rf 027-array-assignment.out 027-array-assignment-* 027-array-assignment.*ml || exit 1 exit 0 Modified: trunk/tests/language-behaviour/arrays/111-array-individual-assigns.check.sh =================================================================== --- trunk/tests/language-behaviour/arrays/111-array-individual-assigns.check.sh 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/arrays/111-array-individual-assigns.check.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,4 +1,4 @@ #!/bin/bash set -x -cat 111-array-individual-assigns | grep 100 || exit 1 +cat 111-array-individual-assigns.out | grep 100 || exit 1 exit 0 Copied: trunk/tests/language-behaviour/arrays/111-array-individual-assigns.out.expected (from rev 4653, trunk/tests/language-behaviour/111-array-individual-assigns.out.expected) =================================================================== --- trunk/tests/language-behaviour/arrays/111-array-individual-assigns.out.expected (rev 0) +++ trunk/tests/language-behaviour/arrays/111-array-individual-assigns.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -0,0 +1 @@ +100 Copied: trunk/tests/language-behaviour/arrays/162-dot-on-array.out.expected (from rev 4653, trunk/tests/language-behaviour/162-dot-on-array.out.expected) =================================================================== --- trunk/tests/language-behaviour/arrays/162-dot-on-array.out.expected (rev 0) +++ trunk/tests/language-behaviour/arrays/162-dot-on-array.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -0,0 +1 @@ +two-C Copied: trunk/tests/language-behaviour/arrays/array_multidimensional_index.out.expected (from rev 4653, trunk/tests/language-behaviour/array_multidimensional_index.out.expected) =================================================================== --- trunk/tests/language-behaviour/arrays/array_multidimensional_index.out.expected (rev 0) +++ trunk/tests/language-behaviour/arrays/array_multidimensional_index.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -0,0 +1 @@ +left up down Modified: trunk/tests/language-behaviour/arrays/array_multidimensional_index.swift =================================================================== --- trunk/tests/language-behaviour/arrays/array_multidimensional_index.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/arrays/array_multidimensional_index.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,7 +1,7 @@ type file {} app (file t) echo_array (string s[][]) { - echo s[0][0] s[1][0] s[1][1] stdout=@filename(t); + echo s[0][0] s[0][1] s[1][0] s[1][1] stdout=@filename(t); } string greetings[][] = [ [ "left", "right" ], ["up", "down"]]; Added: trunk/tests/language-behaviour/arrays/q5.check.sh =================================================================== --- trunk/tests/language-behaviour/arrays/q5.check.sh (rev 0) +++ trunk/tests/language-behaviour/arrays/q5.check.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat q5.out | grep 'how are you'|| exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/arrays/q5.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/arrays/q5.clean.sh =================================================================== --- trunk/tests/language-behaviour/arrays/q5.clean.sh (rev 0) +++ trunk/tests/language-behaviour/arrays/q5.clean.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r q5-* q5.*ml q5.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/arrays/q5.clean.sh ___________________________________________________________________ Added: svn:executable + * Copied: trunk/tests/language-behaviour/arrays/q5.swift (from rev 4653, trunk/tests/language-behaviour/IO/q5.swift) =================================================================== --- trunk/tests/language-behaviour/arrays/q5.swift (rev 0) +++ trunk/tests/language-behaviour/arrays/q5.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -0,0 +1,12 @@ +type messagefile {} + +app (messagefile t) greeting (string s[]) { + echo s[0] s[1] s[2] stdout=@filename(t); +} + +messagefile outfile <"q5.out">; + +string words[] = ["how","are","you"]; + +outfile = greeting(words); + Modified: trunk/tests/language-behaviour/compounds/0024-compound.swift =================================================================== --- trunk/tests/language-behaviour/compounds/0024-compound.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/compounds/0024-compound.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,9 +1,7 @@ type messagefile {} -(messagefile t) greeting(string m) { - app { +app (messagefile t) greeting(string m) { echo m stdout=@filename(t); - } } (messagefile first, messagefile second) compound() { Modified: trunk/tests/language-behaviour/compounds/00241-nested-single-compound.swift =================================================================== --- trunk/tests/language-behaviour/compounds/00241-nested-single-compound.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/compounds/00241-nested-single-compound.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,9 +1,7 @@ type file; -(file t) greeting(string m) { - app { +app (file t) greeting(string m) { echo m stdout=@filename(t); - } } (file first) compound() { Modified: trunk/tests/language-behaviour/compounds/00242-compound-with-vars.swift =================================================================== --- trunk/tests/language-behaviour/compounds/00242-compound-with-vars.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/compounds/00242-compound-with-vars.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,9 +1,7 @@ type messagefile {} -(messagefile t) greeting(string m) { - app { +app (messagefile t) greeting(string m) { echo m stdout=@filename(t); - } } (messagefile first, messagefile second) compound() { @@ -16,5 +14,3 @@ messagefile b <"0024-compound.R.out">; (a,b) = compound(); - - Modified: trunk/tests/language-behaviour/control_structures/090-case.swift =================================================================== --- trunk/tests/language-behaviour/control_structures/090-case.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/control_structures/090-case.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,9 +1,7 @@ type messagefile {} -(messagefile t) greeting(string m) { - app { +app (messagefile t) greeting(string m) { echo m stdout=@filename(t); - } } messagefile outfile <"090-case.out">; @@ -24,4 +22,3 @@ trace(message); outfile = greeting(message); - Copied: trunk/tests/language-behaviour/datatypes/023-complex-type.out.expected (from rev 4653, trunk/tests/language-behaviour/023-complex-type.out.expected) =================================================================== --- trunk/tests/language-behaviour/datatypes/023-complex-type.out.expected (rev 0) +++ trunk/tests/language-behaviour/datatypes/023-complex-type.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -0,0 +1 @@ +3 Copied: trunk/tests/language-behaviour/datatypes/023-complex-type.swift (from rev 4653, trunk/tests/language-behaviour/023-complex-type.swift) =================================================================== --- trunk/tests/language-behaviour/datatypes/023-complex-type.swift (rev 0) +++ trunk/tests/language-behaviour/datatypes/023-complex-type.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -0,0 +1,21 @@ +type messagefile {} + +type mystruct { + int first; + string second; +} + +app (messagefile t) greeting(int m) { + echo m stdout=@filename(t); +} + +messagefile outfile <"023-complex-type.out">; + +mystruct m; + +m.first = 3; + +int i = m.first; + +outfile = greeting(i); + Added: trunk/tests/language-behaviour/datatypes/0231-complex-type.check.sh =================================================================== --- trunk/tests/language-behaviour/datatypes/0231-complex-type.check.sh (rev 0) +++ trunk/tests/language-behaviour/datatypes/0231-complex-type.check.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat -v 0231-complex-type.out | grep '3 44' || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/datatypes/0231-complex-type.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/datatypes/0231-complex-type.clean.sh =================================================================== --- trunk/tests/language-behaviour/datatypes/0231-complex-type.clean.sh (rev 0) +++ trunk/tests/language-behaviour/datatypes/0231-complex-type.clean.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 0231-complex-type-* 0231-complex-type.*ml 0231-complex-type.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/datatypes/0231-complex-type.clean.sh ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/tests/language-behaviour/datatypes/0231-complex-type.out.expected =================================================================== --- trunk/tests/language-behaviour/datatypes/0231-complex-type.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/datatypes/0231-complex-type.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -3 44 Modified: trunk/tests/language-behaviour/datatypes/0231-complex-type.swift =================================================================== --- trunk/tests/language-behaviour/datatypes/0231-complex-type.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/datatypes/0231-complex-type.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -4,10 +4,8 @@ int first, second; } -(messagefile t) greeting(mystruct m) { - app { +app (messagefile t) greeting(mystruct m) { echo m.first m.second stdout=@filename(t); - } } messagefile outfile <"0231-complex-type.out">; Added: trunk/tests/language-behaviour/datatypes/027-single-character-typename.clean.sh =================================================================== --- trunk/tests/language-behaviour/datatypes/027-single-character-typename.clean.sh (rev 0) +++ trunk/tests/language-behaviour/datatypes/027-single-character-typename.clean.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 027-single-character-typename-* 027-single-character-typename.*ml|| exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/datatypes/027-single-character-typename.clean.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/datatypes/028-double-character-typename.clean.sh =================================================================== --- trunk/tests/language-behaviour/datatypes/028-double-character-typename.clean.sh (rev 0) +++ trunk/tests/language-behaviour/datatypes/028-double-character-typename.clean.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 028-double-character-typename-* 028-double-character-typename.*ml || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/datatypes/028-double-character-typename.clean.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/datatypes/032-boolconst.check.sh =================================================================== --- trunk/tests/language-behaviour/datatypes/032-boolconst.check.sh (rev 0) +++ trunk/tests/language-behaviour/datatypes/032-boolconst.check.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -0,0 +1,5 @@ +#!/bin/bash +set -x +cat 032-boolconst.f.out | grep 'false' || exit 1 +cat 032-boolconst.t.out | grep 'true' || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/datatypes/032-boolconst.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/datatypes/032-boolconst.clean.sh =================================================================== --- trunk/tests/language-behaviour/datatypes/032-boolconst.clean.sh (rev 0) +++ trunk/tests/language-behaviour/datatypes/032-boolconst.clean.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 032-boolconst-* 032-boolconst.*ml 032-boolconst.*.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/datatypes/032-boolconst.clean.sh ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/tests/language-behaviour/datatypes/032-boolconst.f.out.expected =================================================================== --- trunk/tests/language-behaviour/datatypes/032-boolconst.f.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/datatypes/032-boolconst.f.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -false Modified: trunk/tests/language-behaviour/datatypes/032-boolconst.swift =================================================================== --- trunk/tests/language-behaviour/datatypes/032-boolconst.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/datatypes/032-boolconst.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,9 +1,7 @@ type messagefile; -(messagefile t) p(boolean b) { - app { +app (messagefile t) p(boolean b) { echo b stdout=@filename(t); - } } messagefile tfile <"032-boolconst.t.out">; Deleted: trunk/tests/language-behaviour/datatypes/032-boolconst.t.out.expected =================================================================== --- trunk/tests/language-behaviour/datatypes/032-boolconst.t.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/datatypes/032-boolconst.t.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -true Added: trunk/tests/language-behaviour/datatypes/053-pass-int.check.sh =================================================================== --- trunk/tests/language-behaviour/datatypes/053-pass-int.check.sh (rev 0) +++ trunk/tests/language-behaviour/datatypes/053-pass-int.check.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat 053-pass-int.out | grep 7 || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/datatypes/053-pass-int.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/datatypes/053-pass-int.clean.sh =================================================================== --- trunk/tests/language-behaviour/datatypes/053-pass-int.clean.sh (rev 0) +++ trunk/tests/language-behaviour/datatypes/053-pass-int.clean.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 053-pass-int-* 053-pass-int.*ml 053-pass-int.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/datatypes/053-pass-int.clean.sh ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/tests/language-behaviour/datatypes/053-pass-int.out.expected =================================================================== --- trunk/tests/language-behaviour/datatypes/053-pass-int.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/datatypes/053-pass-int.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -7 Modified: trunk/tests/language-behaviour/datatypes/053-pass-int.swift =================================================================== --- trunk/tests/language-behaviour/datatypes/053-pass-int.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/datatypes/053-pass-int.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,9 +1,7 @@ type messagefile {} -(messagefile t) greeting(string m, int i) { - app { +app (messagefile t) greeting(string m, int i) { echo i stdout=@filename(t); - } } messagefile outfile <"053-pass-int.out">; Added: trunk/tests/language-behaviour/datatypes/054-pass-int.check.sh =================================================================== --- trunk/tests/language-behaviour/datatypes/054-pass-int.check.sh (rev 0) +++ trunk/tests/language-behaviour/datatypes/054-pass-int.check.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat 054-pass-int.out | grep 99 || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/datatypes/054-pass-int.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/datatypes/054-pass-int.clean.sh =================================================================== --- trunk/tests/language-behaviour/datatypes/054-pass-int.clean.sh (rev 0) +++ trunk/tests/language-behaviour/datatypes/054-pass-int.clean.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 054-pass-int-* 054-pass-int.*ml 054-pass-int.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/datatypes/054-pass-int.clean.sh ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/tests/language-behaviour/datatypes/054-pass-int.out.expected =================================================================== --- trunk/tests/language-behaviour/datatypes/054-pass-int.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/datatypes/054-pass-int.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -99 Modified: trunk/tests/language-behaviour/datatypes/054-pass-int.swift =================================================================== --- trunk/tests/language-behaviour/datatypes/054-pass-int.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/datatypes/054-pass-int.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,9 +1,7 @@ type messagefile {} -(messagefile t) greeting(string m, int i) { - app { +app (messagefile t) greeting(string m, int i) { echo i stdout=@filename(t); - } } messagefile outfile <"054-pass-int.out">; Added: trunk/tests/language-behaviour/datatypes/055-pass-int.check.sh =================================================================== --- trunk/tests/language-behaviour/datatypes/055-pass-int.check.sh (rev 0) +++ trunk/tests/language-behaviour/datatypes/055-pass-int.check.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +cat 055-pass-int.out | grep 99 || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/datatypes/055-pass-int.check.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/tests/language-behaviour/datatypes/055-pass-int.clean.sh =================================================================== --- trunk/tests/language-behaviour/datatypes/055-pass-int.clean.sh (rev 0) +++ trunk/tests/language-behaviour/datatypes/055-pass-int.clean.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r 055-pass-int-* 055-pass-int.*ml 055-pass-int.out || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/datatypes/055-pass-int.clean.sh ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/tests/language-behaviour/datatypes/055-pass-int.out.expected =================================================================== --- trunk/tests/language-behaviour/datatypes/055-pass-int.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/datatypes/055-pass-int.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -99 Modified: trunk/tests/language-behaviour/datatypes/055-pass-int.swift =================================================================== --- trunk/tests/language-behaviour/datatypes/055-pass-int.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/datatypes/055-pass-int.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,9 +1,7 @@ type messagefile {} -(messagefile t) greeting(string m, int i) { - app { +app (messagefile t) greeting(string m, int i) { echo i stdout=@filename(t); - } } messagefile outfile <"055-pass-int.out">; Added: trunk/tests/language-behaviour/datatypes/regress-r2292.clean.sh =================================================================== --- trunk/tests/language-behaviour/datatypes/regress-r2292.clean.sh (rev 0) +++ trunk/tests/language-behaviour/datatypes/regress-r2292.clean.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -r regress-r2292-* regress-r2292.*ml || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/datatypes/regress-r2292.clean.sh ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/tests/language-behaviour/delayedcat.sh =================================================================== --- trunk/tests/language-behaviour/delayedcat.sh 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/delayedcat.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,3 +0,0 @@ -#!/bin/bash -sleep 10s -cat $@ Copied: trunk/tests/language-behaviour/mappers/0025-compound.swift (from rev 4653, trunk/tests/language-behaviour/0025-compound.swift) =================================================================== --- trunk/tests/language-behaviour/mappers/0025-compound.swift (rev 0) +++ trunk/tests/language-behaviour/mappers/0025-compound.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -0,0 +1,14 @@ +type file; +(file t) echo(int m) { + app { + echo m stdout=@filename(t); + } +} + +(file t) nested_echo(int m) { + t = echo (m); +} + +file a[]; +a[0] = nested_echo(0); + Copied: trunk/tests/language-behaviour/mappers/07511-fixed-array-mapper-input.first.in (from rev 4698, trunk/tests/language-behaviour/07511-fixed-array-mapper-input.first.in) =================================================================== Copied: trunk/tests/language-behaviour/mappers/07511-fixed-array-mapper-input.second.in (from rev 4698, trunk/tests/language-behaviour/07511-fixed-array-mapper-input.second.in) =================================================================== Copied: trunk/tests/language-behaviour/mappers/07511-fixed-array-mapper-input.third.in (from rev 4698, trunk/tests/language-behaviour/07511-fixed-array-mapper-input.third.in) =================================================================== Copied: trunk/tests/language-behaviour/params/002-param.out.expected (from rev 4653, trunk/tests/language-behaviour/002-param.out.expected) =================================================================== --- trunk/tests/language-behaviour/params/002-param.out.expected (rev 0) +++ trunk/tests/language-behaviour/params/002-param.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -0,0 +1 @@ +hi Copied: trunk/tests/language-behaviour/params/002-param.swift (from rev 4653, trunk/tests/language-behaviour/002-param.swift) =================================================================== --- trunk/tests/language-behaviour/params/002-param.swift (rev 0) +++ trunk/tests/language-behaviour/params/002-param.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -0,0 +1,12 @@ +type messagefile {} + +(messagefile t) greeting(string m) { + app { + echo m stdout=@filename(t); + } +} + +messagefile outfile <"002-param.out">; + +outfile = greeting("hi"); + Copied: trunk/tests/language-behaviour/params/0022-default.out.expected (from rev 4653, trunk/tests/language-behaviour/0022-default.out.expected) =================================================================== --- trunk/tests/language-behaviour/params/0022-default.out.expected (rev 0) +++ trunk/tests/language-behaviour/params/0022-default.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -0,0 +1 @@ +hi there Copied: trunk/tests/language-behaviour/params/0022-default.swift (from rev 4653, trunk/tests/language-behaviour/0022-default.swift) =================================================================== --- trunk/tests/language-behaviour/params/0022-default.swift (rev 0) +++ trunk/tests/language-behaviour/params/0022-default.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -0,0 +1,10 @@ +type messagefile {} + +app (messagefile t) greeting(string left="hi", string right) { + echo left right stdout=@filename(t); +} + +messagefile outfile <"0022-default.out">; + +outfile = greeting(right="there"); + Copied: trunk/tests/language-behaviour/params/0023-default-override.out.expected (from rev 4653, trunk/tests/language-behaviour/0023-default-override.out.expected) =================================================================== --- trunk/tests/language-behaviour/params/0023-default-override.out.expected (rev 0) +++ trunk/tests/language-behaviour/params/0023-default-override.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -0,0 +1 @@ +foo there Copied: trunk/tests/language-behaviour/params/0023-default-override.swift (from rev 4653, trunk/tests/language-behaviour/0023-default-override.swift) =================================================================== --- trunk/tests/language-behaviour/params/0023-default-override.swift (rev 0) +++ trunk/tests/language-behaviour/params/0023-default-override.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -0,0 +1,12 @@ +type messagefile {} + +(messagefile t) greeting(string left="hi", string right) { + app { + echo left right stdout=@filename(t); + } +} + +messagefile outfile <"0023-default-override.out">; + +outfile = greeting(left="foo",right="there"); + Copied: trunk/tests/language-behaviour/procedures/065-delay.swift (from rev 4653, trunk/tests/language-behaviour/065-delay.swift) =================================================================== --- trunk/tests/language-behaviour/procedures/065-delay.swift (rev 0) +++ trunk/tests/language-behaviour/procedures/065-delay.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -0,0 +1,5 @@ +app delay() { + sleep "3"; +} + +delay(); Copied: trunk/tests/language-behaviour/procedures/0651-several-delay.swift (from rev 4653, trunk/tests/language-behaviour/0651-several-delay.swift) =================================================================== --- trunk/tests/language-behaviour/procedures/0651-several-delay.swift (rev 0) +++ trunk/tests/language-behaviour/procedures/0651-several-delay.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -0,0 +1,7 @@ +app delay(int i) { + sleep i; +} + +foreach i in [1:3] { + delay(i); +} Modified: trunk/tests/language-behaviour/procedures/080-declare-assign-proc.swift =================================================================== --- trunk/tests/language-behaviour/procedures/080-declare-assign-proc.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/procedures/080-declare-assign-proc.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,9 +1,7 @@ type messagefile {} -(messagefile t) greeting() { - app { +app (messagefile t) greeting() { echo "hello" stdout=@filename(t); - } } messagefile outfile = greeting(); Copied: trunk/tests/language-behaviour/procedures/delayedcat.sh (from rev 4653, trunk/tests/language-behaviour/delayedcat.sh) =================================================================== --- trunk/tests/language-behaviour/procedures/delayedcat.sh (rev 0) +++ trunk/tests/language-behaviour/procedures/delayedcat.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -0,0 +1,3 @@ +#!/bin/bash +sleep 10s +cat $@ Modified: trunk/tests/language-behaviour/procedures/proc-in-expr.swift =================================================================== --- trunk/tests/language-behaviour/procedures/proc-in-expr.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/procedures/proc-in-expr.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,4 +1,3 @@ - (int r) mynum(int p) { r = p; } Deleted: trunk/tests/language-behaviour/readData.circle.in =================================================================== --- trunk/tests/language-behaviour/readData.circle.in 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/readData.circle.in 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,2 +0,0 @@ -x y r name -10 10 20.0 TheInnerCircle \ No newline at end of file Deleted: trunk/tests/language-behaviour/readData.circle.out.expected =================================================================== --- trunk/tests/language-behaviour/readData.circle.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/readData.circle.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -10 10 20 TheInnerCircle Deleted: trunk/tests/language-behaviour/readData.circleArray.in =================================================================== --- trunk/tests/language-behaviour/readData.circleArray.in 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/readData.circleArray.in 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,4 +0,0 @@ -x y r name -1 1 5 CircleOne -2 2 7 CircleTwo - Deleted: trunk/tests/language-behaviour/readData.circleArray.out.expected =================================================================== --- trunk/tests/language-behaviour/readData.circleArray.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/readData.circleArray.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -1 2 5 CircleTwo Deleted: trunk/tests/language-behaviour/readData.float.out.expected =================================================================== --- trunk/tests/language-behaviour/readData.float.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/readData.float.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -3.1400001 Deleted: trunk/tests/language-behaviour/readData.int.in =================================================================== --- trunk/tests/language-behaviour/readData.int.in 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/readData.int.in 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -77777 Deleted: trunk/tests/language-behaviour/readData.int.out.expected =================================================================== --- trunk/tests/language-behaviour/readData.int.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/readData.int.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -77777 Deleted: trunk/tests/language-behaviour/readData.intArray.in =================================================================== --- trunk/tests/language-behaviour/readData.intArray.in 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/readData.intArray.in 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,4 +0,0 @@ -1 -5 -9 -0 \ No newline at end of file Deleted: trunk/tests/language-behaviour/readData.intArray.out.expected =================================================================== --- trunk/tests/language-behaviour/readData.intArray.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/readData.intArray.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -1 5 9 0 Deleted: trunk/tests/language-behaviour/readData.stringArray.in =================================================================== --- trunk/tests/language-behaviour/readData.stringArray.in 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/readData.stringArray.in 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,4 +0,0 @@ -red -green -blue -thermometer \ No newline at end of file Deleted: trunk/tests/language-behaviour/readData.stringArray.out.expected =================================================================== --- trunk/tests/language-behaviour/readData.stringArray.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/readData.stringArray.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -red green blue thermometer Deleted: trunk/tests/language-behaviour/readData.swift =================================================================== --- trunk/tests/language-behaviour/readData.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/readData.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,80 +0,0 @@ -type file; - -type circle { - int x; - int y; - float r; - string name; -} - -(file f) createInt() { - app{ - echo "77777" stdout=@filename(f); - } -} - -(file f) createFloat() { - app{ - echo "3.1400001" stdout=@filename(f); - } -} - - -(file f) write(string data) { - app{ - echo data stdout=@filename(f); - } -} - -int i; -float fl; - -int ia[]; - -string sa[]; - -circle ca[]; - -circle c; - -//will be generated -file f <"readData.int.in">; - -//input file. assumed on disk -file g <"readData.intArray.in">; - -// will be generated -file h <"readData.float.in">; - -f = createInt(); -h = createFloat(); - -i = readData(f); -fl = readData(h); - -file o1 <"readData.int.out">; -o1 = write(@strcat(i)); - -ia = readData(g); - -file o2 <"readData.intArray.out">; -o2 = write(@strcat(ia[0], " ", ia[1], " ", ia[2], " ", ia[3])); - -sa = readData("readData.stringArray.in"); - -file o3 <"readData.stringArray.out">; -o3 = write(@strcat(sa[0], " ", sa[1], " ", sa[2], " ", sa[3])); - -c = readData("readData.circle.in"); - -file o4 <"readData.circle.out">; -o4 = write(@strcat(c.x, " ", c.y, " ", c.r, " ", c.name)); - -ca = readData("readData.circleArray.in"); - -file o5 <"readData.circleArray.out">; -o5 = write(@strcat(ca[0].x, " ", ca[1].y, " ", ca[0].r, " ", ca[1].name)); - -file o6 <"readData.float.out">; -o6 = write(@strcat(fl)); - Deleted: trunk/tests/language-behaviour/readData2.in =================================================================== --- trunk/tests/language-behaviour/readData2.in 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/readData2.in 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,6 +0,0 @@ -rows[0].columns[0] = 0 -rows[0].columns[1] = 2 -rows[0].columns[2] = 4 -rows[1].columns[0] = 1 -rows[1].columns[1] = 3 -rows[1].columns[2] = 5 Deleted: trunk/tests/language-behaviour/readData2.out.expected =================================================================== --- trunk/tests/language-behaviour/readData2.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/readData2.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -15 Deleted: trunk/tests/language-behaviour/readData2.swift =================================================================== --- trunk/tests/language-behaviour/readData2.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/readData2.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,33 +0,0 @@ -type vector { - int columns[]; -} - -type matrix { - vector rows[]; -} - -type file; - -(file o) echo(int s) { - app { - echo s stdout=@o; - } -} - - -matrix m; - -m = readData2("readData2.in"); - -int s; - -s = m.rows[0].columns[0] + - m.rows[0].columns[1] + - m.rows[0].columns[2] + - m.rows[1].columns[0] + - m.rows[1].columns[1] + - m.rows[1].columns[2] ; - -file out <"readData2.out">; -out = echo(s); - Added: trunk/tests/language-behaviour/strings/761-dirname.clean.sh =================================================================== --- trunk/tests/language-behaviour/strings/761-dirname.clean.sh (rev 0) +++ trunk/tests/language-behaviour/strings/761-dirname.clean.sh 2011-06-28 17:53:57 UTC (rev 4699) @@ -0,0 +1,4 @@ +#!/bin/bash +set -x +rm -rv 761-dirname-* 761-dirname.*ml || exit 1 +exit 0 Property changes on: trunk/tests/language-behaviour/strings/761-dirname.clean.sh ___________________________________________________________________ Added: svn:executable + * Copied: trunk/tests/language-behaviour/strings/761-dirname.swift (from rev 4653, trunk/tests/language-behaviour/IO/761-dirname.swift) =================================================================== --- trunk/tests/language-behaviour/strings/761-dirname.swift (rev 0) +++ trunk/tests/language-behaviour/strings/761-dirname.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -0,0 +1,5 @@ +type file{} +file f<"/d/f.txt">; +string s = @dirname(f); +string t = @tostring(s); +tracef("dirname: %s\n", s); Copied: trunk/tests/language-behaviour/variables/088-sequential-assign.swift (from rev 4653, trunk/tests/language-behaviour/088-sequential-assign.swift) =================================================================== --- trunk/tests/language-behaviour/variables/088-sequential-assign.swift (rev 0) +++ trunk/tests/language-behaviour/variables/088-sequential-assign.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -0,0 +1,8 @@ +int a; +int b; +int c; +trace(c); +c=b; +b=a; +a=8645; + Deleted: trunk/tests/language-behaviour/writeDataPrimitive.out.expected =================================================================== --- trunk/tests/language-behaviour/writeDataPrimitive.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/writeDataPrimitive.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1 +0,0 @@ -foo \ No newline at end of file Deleted: trunk/tests/language-behaviour/writeDataPrimitive.swift =================================================================== --- trunk/tests/language-behaviour/writeDataPrimitive.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/writeDataPrimitive.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,8 +0,0 @@ -type file; - -string s = "foo"; - -file f <"writeDataPrimitive.out">; - -f=writeData(s); - Deleted: trunk/tests/language-behaviour/writeDataStringArray.swift =================================================================== --- trunk/tests/language-behaviour/writeDataStringArray.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/writeDataStringArray.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,8 +0,0 @@ -type file; - -string s[] = ["foo", "bar"]; - -file f <"writeDataStringArray.out">; - -f=writeData(s); - Deleted: trunk/tests/language-behaviour/writeDataStringArray2.out.expected =================================================================== --- trunk/tests/language-behaviour/writeDataStringArray2.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/writeDataStringArray2.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,5 +0,0 @@ -foo -bar -baz -qux -frrrr Deleted: trunk/tests/language-behaviour/writeDataStringArray2.swift =================================================================== --- trunk/tests/language-behaviour/writeDataStringArray2.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/writeDataStringArray2.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,14 +0,0 @@ -type file; - -string s[]; - -file f <"writeDataStringArray2.out">; - -f=writeData(s); - -s[2] = "baz"; -s[3] = "qux"; -s[0] = "foo"; -s[1] = "bar"; -s[4] = "frrrr"; - Deleted: trunk/tests/language-behaviour/writeDataStruct.out.expected =================================================================== --- trunk/tests/language-behaviour/writeDataStruct.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/writeDataStruct.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,2 +0,0 @@ -r c l -Baz BAZ baz Deleted: trunk/tests/language-behaviour/writeDataStruct.swift =================================================================== --- trunk/tests/language-behaviour/writeDataStruct.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/writeDataStruct.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,14 +0,0 @@ -type file; - -type S { string l; string c; string r; } - -S s; - -file f <"writeDataStruct.out">; - -f=writeData(s); - -s.l = "baz"; -s.c = "BAZ"; -s.r = "Baz"; - Deleted: trunk/tests/language-behaviour/writeDataStructArray2.out.expected =================================================================== --- trunk/tests/language-behaviour/writeDataStructArray2.out.expected 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/writeDataStructArray2.out.expected 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,6 +0,0 @@ -r c l -Foo FOO foo -Bar BAR bar -Baz BAZ baz -Qux QUX qux -Frrrr FRRRR frrrr Deleted: trunk/tests/language-behaviour/writeDataStructArray2.swift =================================================================== --- trunk/tests/language-behaviour/writeDataStructArray2.swift 2011-06-28 17:45:58 UTC (rev 4698) +++ trunk/tests/language-behaviour/writeDataStructArray2.swift 2011-06-28 17:53:57 UTC (rev 4699) @@ -1,26 +0,0 @@ -type file; - -type S { string l; string c; string r; } - -S s[]; - -file f <"writeDataStructArray2.out">; - -f=writeData(s); - -s[2].l = "baz"; -s[2].c = "BAZ"; -s[2].r = "Baz"; -s[3].l = "qux"; -s[3].c = "QUX"; -s[3].r = "Qux"; -s[0].l = "foo"; -s[0].c = "FOO"; -s[0].r = "Foo"; -s[1].l = "bar"; -s[1].c = "BAR"; -s[1].r = "Bar"; -s[4].l = "frrrr"; -s[4].c = "FRRRR"; -s[4].r = "Frrrr"; - From jonmon at ci.uchicago.edu Tue Jun 14 20:47:50 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Wed, 15 Jun 2011 01:47:50 -0000 Subject: [Swift-commit] r4617 - SwiftApps/Montage/docs Message-ID: <20110615014731.7C9699CFE1@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-14 20:47:31 -0500 (Tue, 14 Jun 2011) New Revision: 4617 Added: SwiftApps/Montage/docs/API.pdf Modified: SwiftApps/Montage/docs/API.html SwiftApps/Montage/docs/API.txt SwiftApps/Montage/docs/updateAPI.sh Log: added pdf version of the API. updates to the doc generation script and source. Modified: SwiftApps/Montage/docs/API.html =================================================================== --- SwiftApps/Montage/docs/API.html 2011-06-15 01:00:37 UTC (rev 4616) +++ SwiftApps/Montage/docs/API.html 2011-06-15 01:47:31 UTC (rev 4617) @@ -706,11 +706,11 @@ } } -asciidoc.install(2); +asciidoc.install(3); /*]]>*/ - +
    -
    +
    +

    1. Overview

    This is the API for the Swift Montage wrappers. Montage is a toolkit for generating science grade astronomical mosaics. The image file format for @@ -740,50 +741,61 @@

    -

    Swift Montage API

    +

    2. Swift Montage API

    -

    Types

    +

    2.1. Types

    These are all the Types that are declared for Swift. They are located in the file Swift_Montage_types.swift.

    +
    +

    2.1.1. Image

    -
    Image
    type Image;

    This is the Image type. It is used to declare the raw images, projected images, difference images, rectified images, and the mosaic.

    +
    +
    +

    2.1.2. Header

    -
    MosaicData
    -
    type MosaicData;
    +
    type Header;
    -

    This is the MosaicData type. It is used to declare and map to the FITS header +

    This is the Header type. It is used to declare and map to the FITS header file.

    +
    +
    +

    2.1.3. Table

    -
    Table
    type Table;

    This is the Table type. During the execution of the workflow several files of metadata is generated. These are tables that the Montage functions use to read for the next stage of the workflow.

    +
    +
    +

    2.1.4. JPEG

    -
    JPEG
    type JPEG

    This is the JPEG type. This is used to map to the jpeg version of the mosaic.

    +
    +
    +

    2.1.5. Status

    -
    Status
    type Status;

    This is the status type. During the difference stage of the workflow status file are generated that have the information about the coefficients that will be used to rectify the image.

    +
    +
    +

    2.1.6. BackgroundStruct

    -
    BackgroundStruct
    type BackgroundStruct
     {
    @@ -796,8 +808,10 @@
     

    This is a struct type. The entries are a string for the name of the image and three coefficients to rectify this portion of the mosaic of all floating point types.

    +
    +
    +

    2.1.7. DiffStruct

    -
    DiffStruct
    type DiffStruct
     {
    @@ -812,8 +826,9 @@
     entry unique, the two images that overlapped which are name plus and minus,
     and the name of the difference image that they produced.

    +
    -

    App Procedures

    +

    2.2. App Procedures

    These are all the app procedures for Swift Montage. They are located in the file Swift_Montage_Apps.swift

    @@ -825,10 +840,11 @@ user cannot choose which options to run.
    +
    +

    2.2.1. mAdd

    -
    mAdd
    -
    app ( Image mos ) mAdd( Image imgs[], Table img_tbl, MosaicData hdr )
    +
    app ( Image mos ) mAdd( Image imgs[], Table img_tbl, Header hdr )

    This app procedure will call the mAdd fucntion from the Montage toolkit. This procedure takes @@ -836,8 +852,10 @@ the FITS header file for the mosaic being created. The procedure then outputs a single FITS file that represents the mosaic. All the images that will be part of this mosaic must reside in the same directory.

    +
    +
    +

    2.2.2. mBackground

    -
    mBackground
    app ( Image bg_img ) mBackground( Image img, float a, float b, float c )
    @@ -845,8 +863,10 @@ toolkit. This procedure takes in a single image along with the three coefficients. The procedure then output the background rectified image after the coefficients have been applied.

    + +
    +

    2.2.3. mBgModel

    -
    mBgModel
    app ( Table rect_tbl ) mBgModel( Table img_tbl, Table fits_tbl )
    @@ -855,8 +875,10 @@ will be added into a mosaic and a table of the information that is required to fit them together. The procedure will then output a rectification table of the coefficients that must be applied to the images.

    + +
    +

    2.2.4. mConcatFit

    -
    mConcatFit
    app ( Table fits_tbl ) mConcatFit( Table status_tbl, Status stats[] )
    @@ -865,24 +887,30 @@ from either mFitplane or mDiffFit and a list of these status files as input. The procedure will then output a table of all the status files together. The status files must all reside in the same directory.

    + +
    +

    2.2.5. mDiff

    -
    mDiff
    -
    app ( Image diff_img ) mDiff( Image proj_img_1, Image proj_img_2, MosaicData hdr )
    +
    app ( Image diff_img ) mDiff( Image proj_img_1, Image proj_img_2, Header hdr )

    This app procedure will call the mDiff function from the Montage toolkit. This procedure takes in two images and the FITS header file for the mosaic. The procedure will then output a difference image representing the information of where the two images overlap.

    +
    +
    +

    2.2.6. mDiffFit

    -
    mDiffFit
    -
    app ( Image diff_img, Status stat ) mDiffFit( Image img_1, Image img_2, MosaicData hdr )
    +
    app ( Image diff_img, Status stat ) mDiffFit( Image img_1, Image img_2, Header hdr )

    This app procedure will call the mDiffFit function from the Montage toolkit. The mDiffFit function in Montage is the combination of the mDiff and mFitplane functions.

    +
    +
    +

    2.2.7. mFitplane

    -
    mFitplane
    app ( Status stat ) mFitplane( Image diff_img )
    @@ -890,8 +918,10 @@ toolkit. This procedure takes in as input the difference image that was the output from the mDiff procedure. The procedure will then output a status file that contains the information on how to fit these two images together.

    + +
    +

    2.2.8. mImgtbl

    -
    mImgtbl
    app ( Table img_tbl ) mImgtbl( Image imgs[] )
    @@ -899,25 +929,31 @@ toolkit. This procedure takes in as input a list of images to create a table from. The output is an image table that represents these images. All the images that will be part of this table must reside in the same directory.

    + +
    +

    2.2.9. mMakeHdr

    -
    mMakeHdr
    -
    app ( MosaicData hdr ) mMakeHdr( Table img_tbl )
    +
    app ( Header hdr ) mMakeHdr( Table img_tbl )

    This app procedure will call the mMakeHdr function from the Montage toolkit. This procedure will take in as input an image table representing the images that will be combined into a single mosaic. The procedure will then output the FITS header file for the mosaic.

    +
    +
    +

    2.2.10. mJPEG

    -
    mJPEG
    app ( JPEG mos_img_jpg ) mJPEG( Image mos_img )

    This app procedure will call the mJPEG function from the Montage toolkit. This procedure will take in as input as input a FITS image. The procedure will then ouput the same image in jpeg format.

    +
    +
    +

    2.2.11. mOverlaps

    -
    mOverlaps
    app ( Table diff_tbl ) mOverlaps( Table img_tbl )
    @@ -925,12 +961,14 @@ toolkit. This procedure takes in as input an image table of the images that will be combined into a single mosaic. The procedure will then output a table of all the images that overlap with each other in the mosaic.

    + +
    +

    2.2.12. mProject

    -
    mProjectPP
    -
    app ( Image proj_img ) mProjectPP( Image raw_img, MosaicData hdr )
    +
    app ( Image proj_img ) mProject( Image raw_img, Header hdr )
    -

    This app procedure will call the mProjectPP function from the Montage +

    This app procedure will call the mProject function from the Montage toolkit. This procedure takes in as input a FITS image file and the FITS header file that for the mosaic. The output is the projected image.

    @@ -938,18 +976,18 @@
    Note The mProjectPP app procedure is a "special case" version of mProject -and can be used only where the input and output images have tangent-plane -projections (e.g. TAN, SIN) or where they can be approximated with acceptable -error.The mProject app procedure is for general projection. There are some cases in +which the faster mProjectPP procedure should be used.
    +
    +
    +

    2.2.13. mProjectPP

    -
    mProject
    -
    app ( Image proj_img ) mProject( Image raw_img, MosaicData hdr )
    +
    app ( Image proj_img ) mProjectPP( Image raw_img, Header hdr )
    -

    This app procedure will call the mProject function from the Montage +

    This app procedure will call the mProjectPP function from the Montage toolkit. This procedure takes in as input a FITS image file and the FITS header file that for the mosaic. The output is the projected image.

    @@ -957,20 +995,26 @@ Note -The mProject app procedure is for general projection. There are some cases in -which the faster mProjectPP procedure should be used. +The mProjectPP app procedure is a "special case" version of mProject +and can be used only where the input and output images have tangent-plane +projections (e.g. TAN, SIN) or where they can be approximated with acceptable +error.
    +
    +
    +

    2.2.14. mShrink

    -
    mShrink
    app ( Image shrunk ) mShrink( Image original, int factor )

    This app procedure will call the mShrink function in the Montage toolkit. This procedure takes in as input a single image and an re-sizing factor represented as an integer. The procedure will then output the re-sized image.

    +
    +
    +

    2.2.15. Backgound_list

    -
    Backgound_list
    app ( Table back_tbl ) Background_list( Table imgs_tbl, Table rect_tbl )
    @@ -980,8 +1024,10 @@ coefficients to rectify the mosaic. The procedure will then output a file in a format that can be read in by the Swift readData2 function into the Background_struct declared type.

    +
    +
    +

    2.2.16. create_status_table

    -
    create_status_table
    app ( Table stat_tbl ) create_status_table( Table diff_tbl )
    @@ -991,15 +1037,18 @@ the mOverlaps procedure. The procedure will the output a table that can be used as input to the mConcatFit app procedure.

    +
    -

    Batch Wrappers

    +

    2.3. Batch Wrappers

    These are the Batch scripts. These scripts do most of the file mapping and is where the parallelization is taking place. They are located in the file Swift_Montage_Batch.swift

    +
    +

    2.3.1. mBackgroundBatch

    -
    mBackgroundBatch
    -
    ( Image rect_imgs[] ) mBackgroundBatch( string dest_dir, Image proj_imgs[], Table img_tbl, Table rect_tbl )
    +
    ( Image rect_imgs[] ) mBackgroundBatch( string dest, Image imgs[], Table img_tbl,
    +                                        Table rect_tbl )

    This batch swift script takes in as input a destination directory for the rectified images, a list of images that will be combined into a @@ -1015,10 +1064,13 @@ mBackgroundBatch calls the mBackground app procedure.

    +
    +
    +

    2.3.2. mDiffBatch

    -
    mDiffBatch
    -
    ( Image diff_imgs[] ) mDiffBatch( string src_dir, string dest_dir, string files[], Table diff_tbl, MosaicData hdr )
    +
    ( Image diff_imgs[] ) mDiffBatch( string src, string dest, string filenames[],
    +                                  Table diff_tbl, Header hdr )

    This batch script takes in as input a source directory of where the images to calculate overlaps are located, a destination directory of where to store these @@ -1043,11 +1095,14 @@ mDiffBatch calls the mDiff app procedure.

    +
    +
    +

    2.3.3. mDiffFitBatch

    -
    mDiffFitBatch
    -
    ( Image diff_imgs[], Table fits_tbl ) mDiffFitBatch( string src_dir, string dest_dir, string stat_dir,
    -                                                     string files[], Table diff_tbl, MosaicData hdr )
    +
    ( Image diff_imgs[], Table fits_tbl ) mDiffFitBatch( string src, string dest, string stat,
    +                                                     string filenames[],
    +                                                     Table diff_tbl, Header hdr )

    This batch script takes in as input a source directory of where the images to calculate overlaps are located, a destination directory of where to store @@ -1074,10 +1129,12 @@ mDiffFitBatch calls the mDiffFit app procedure.

    +
    +
    +

    2.3.4. mFitBatch

    -
    mFitBatch
    -
    ( Table fits_tbl ) mFitBatch( string stat_dir, Image diff_imgs[], Table diff_tbl )
    +
    ( Table fits_tbl ) mFitBatch( string stat, Image diff_imgs[], Table diff_tbl )

    This batch script takes in as input a directory for which the status files will be put in, the list of difference images that has @@ -1092,10 +1149,12 @@ mFitBatch calls the mFitplane app procedure.

    +
    +
    +

    2.3.5. mProjectBatch

    -
    mProjectBatch
    -
    ( Image proj_imgs[] ) mProjectBatch( string dest_dir, Image raw_imgs[], MosaicData hdr )
    +
    ( Image proj_imgs[] ) mProjectBatch( string dest, Image raw_imgs[], Header hdr )

    This batch script takes in as input the destination directory for the projected images, a list of raw image files and the FITS header file @@ -1105,20 +1164,21 @@

    - +
    -Note +Warning mProjectBatch calls the faster mProjectPP app procedure if the image allows -it. If mProjectPP cannot be used then the app procedure mProject is called.mProjectBatch currently only calls the general mProject app +procedure. It does not check to see if the faster projection mProjectPP can be used.
    +

    Added: SwiftApps/Montage/docs/API.pdf =================================================================== --- SwiftApps/Montage/docs/API.pdf (rev 0) +++ SwiftApps/Montage/docs/API.pdf 2011-06-15 01:47:31 UTC (rev 4617) @@ -0,0 +1,2578 @@ +%PDF-1.4 +%???? +1 0 obj +<< /S /GoTo /D (section.1) >> +endobj +4 0 obj +(Overview) +endobj +5 0 obj +<< /S /GoTo /D (section.2) >> +endobj +8 0 obj +(Swift Montage API) +endobj +9 0 obj +<< /S /GoTo /D (subsection.2.1) >> +endobj +12 0 obj +(Types) +endobj +13 0 obj +<< /S /GoTo /D (subsubsection.2.1.1) >> +endobj +16 0 obj +(Image) +endobj +17 0 obj +<< /S /GoTo /D (subsubsection.2.1.2) >> +endobj +20 0 obj +(Header) +endobj +21 0 obj +<< /S /GoTo /D (subsubsection.2.1.3) >> +endobj +24 0 obj +(Table) +endobj +25 0 obj +<< /S /GoTo /D (subsubsection.2.1.4) >> +endobj +28 0 obj +(JPEG) +endobj +29 0 obj +<< /S /GoTo /D (subsubsection.2.1.5) >> +endobj +32 0 obj +(Status) +endobj +33 0 obj +<< /S /GoTo /D (subsubsection.2.1.6) >> +endobj +36 0 obj +(BackgroundStruct) +endobj +37 0 obj +<< /S /GoTo /D (subsubsection.2.1.7) >> +endobj +40 0 obj +(DiffStruct) +endobj +41 0 obj +<< /S /GoTo /D (subsection.2.2) >> +endobj +44 0 obj +(App Procedures) +endobj +45 0 obj +<< /S /GoTo /D (subsubsection.2.2.1) >> +endobj +48 0 obj +(mAdd) +endobj +49 0 obj +<< /S /GoTo /D (subsubsection.2.2.2) >> +endobj +52 0 obj +(mBackground) +endobj +53 0 obj +<< /S /GoTo /D (subsubsection.2.2.3) >> +endobj +56 0 obj +(mBgModel) +endobj +57 0 obj +<< /S /GoTo /D (subsubsection.2.2.4) >> +endobj +60 0 obj +(mConcatFit) +endobj +61 0 obj +<< /S /GoTo /D (subsubsection.2.2.5) >> +endobj +64 0 obj +(mDiff) +endobj +65 0 obj +<< /S /GoTo /D (subsubsection.2.2.6) >> +endobj +68 0 obj +(mDiffFit) +endobj +69 0 obj +<< /S /GoTo /D (subsubsection.2.2.7) >> +endobj +72 0 obj +(mFitplane) +endobj +73 0 obj +<< /S /GoTo /D (subsubsection.2.2.8) >> +endobj +76 0 obj +(mImgtbl) +endobj +77 0 obj +<< /S /GoTo /D (subsubsection.2.2.9) >> +endobj +80 0 obj +(mMakeHdr) +endobj +81 0 obj +<< /S /GoTo /D (subsubsection.2.2.10) >> +endobj +84 0 obj +(mJPEG) +endobj +85 0 obj +<< /S /GoTo /D (subsubsection.2.2.11) >> +endobj +88 0 obj +(mOverlaps) +endobj +89 0 obj +<< /S /GoTo /D (subsubsection.2.2.12) >> +endobj +92 0 obj +(mProject) +endobj +93 0 obj +<< /S /GoTo /D (subsubsection.2.2.13) >> +endobj +96 0 obj +(mProjectPP) +endobj +97 0 obj +<< /S /GoTo /D (subsubsection.2.2.14) >> +endobj +100 0 obj +(mShrink) +endobj +101 0 obj +<< /S /GoTo /D (subsubsection.2.2.15) >> +endobj +104 0 obj +(Backgound\137list) +endobj +105 0 obj +<< /S /GoTo /D (subsubsection.2.2.16) >> +endobj +108 0 obj +(create\137status\137table) +endobj +109 0 obj +<< /S /GoTo /D (subsection.2.3) >> +endobj +112 0 obj +(Batch Wrappers) +endobj +113 0 obj +<< /S /GoTo /D (subsubsection.2.3.1) >> +endobj +116 0 obj +(mBackgroundBatch) +endobj +117 0 obj +<< /S /GoTo /D (subsubsection.2.3.2) >> +endobj +120 0 obj +(mDiffBatch) +endobj +121 0 obj +<< /S /GoTo /D (subsubsection.2.3.3) >> +endobj +124 0 obj +(mDiffFitBatch) +endobj +125 0 obj +<< /S /GoTo /D (subsubsection.2.3.4) >> +endobj +128 0 obj +(mFitBatch) +endobj +129 0 obj +<< /S /GoTo /D (subsubsection.2.3.5) >> +endobj +132 0 obj +(mProjectBatch) +endobj +133 0 obj +<< /S /GoTo /D [134 0 R /FitH ] >> +endobj +136 0 obj << +/Length 216 +/Filter /FlateDecode +>> +stream +x???MK1????q???L>&?QA?Ain??b??`-?B?~??E/^2Ifx?y#??????????*?jI#Gr??l??????6p?r?> endobj +137 0 obj << +/D [134 0 R /XYZ -16.307 900.716 null] +>> endobj +140 0 obj << +/D [134 0 R /XYZ 56.693 759.068 null] +>> endobj +135 0 obj << +/Font << /F50 138 0 R /F51 139 0 R /F52 141 0 R >> +/ProcSet [ /PDF /Text ] +>> endobj +178 0 obj << +/Length 903 +/Filter /FlateDecode +>> +stream +x???Ko?@????=?????=&i?RT???CE?`???.?????c?PU???????????,??????r?PP "?d??y?* +&?????,u\??}?Z??<,?.???U&? 4???8??b ???(???N'?o g??? (2??P ??us?@??wdJ????p? ?"??c???^XO&Pa?s??P& ??T~?.?MaB?;?k#~??"????KD??'c??!?????&??S>ka?!?#Iv??:?[p?]?A???D????~??Z?))??xPQM???35G"??:??Tv?J*l?d??O?aJ????????ro??Gra????v??d;M? +?G +??F?i`_??C?=????^m at w??]?????B????????H?~???)i> endobj +143 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [55.697 706.356 113.38 715.332] +/A << /S /GoTo /D (section.1) >> +>> endobj +144 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [55.697 676.558 154.535 687.437] +/A << /S /GoTo /D (section.2) >> +>> endobj +145 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [70.641 658.49 119.099 669.394] +/A << /S /GoTo /D (subsection.2.1) >> +>> endobj +146 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 640.558 152.324 651.461] +/A << /S /GoTo /D (subsubsection.2.1.1) >> +>> endobj +147 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 624.682 156.19 633.529] +/A << /S /GoTo /D (subsubsection.2.1.2) >> +>> endobj +148 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 606.749 149.315 615.596] +/A << /S /GoTo /D (subsubsection.2.1.3) >> +>> endobj +149 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 588.817 150.122 597.663] +/A << /S /GoTo /D (subsubsection.2.1.4) >> +>> endobj +150 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 570.884 151.786 579.73] +/A << /S /GoTo /D (subsubsection.2.1.5) >> +>> endobj +151 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 550.894 199.925 561.798] +/A << /S /GoTo /D (subsubsection.2.1.6) >> +>> endobj +152 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 535.018 167.576 543.865] +/A << /S /GoTo /D (subsubsection.2.1.7) >> +>> endobj +153 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [70.641 515.028 159.457 525.932] +/A << /S /GoTo /D (subsection.2.2) >> +>> endobj +154 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 499.153 152.334 507.999] +/A << /S /GoTo /D (subsubsection.2.2.1) >> +>> endobj +155 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 479.163 183.876 490.067] +/A << /S /GoTo /D (subsubsection.2.2.2) >> +>> endobj +156 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 461.23 172.817 472.134] +/A << /S /GoTo /D (subsubsection.2.2.3) >> +>> endobj +157 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 445.355 174.481 454.201] +/A << /S /GoTo /D (subsubsection.2.2.4) >> +>> endobj +158 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 427.422 151.527 436.268] +/A << /S /GoTo /D (subsubsection.2.2.5) >> +>> endobj +159 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 409.489 162.605 418.336] +/A << /S /GoTo /D (subsubsection.2.2.6) >> +>> endobj +160 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 389.499 167.836 400.403] +/A << /S /GoTo /D (subsubsection.2.2.7) >> +>> endobj +161 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 371.566 161.748 382.47] +/A << /S /GoTo /D (subsubsection.2.2.8) >> +>> endobj +162 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 355.571 173.255 364.537] +/A << /S /GoTo /D (subsubsection.2.2.9) >> +>> endobj +163 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 337.758 157.873 346.605] +/A << /S /GoTo /D (subsubsection.2.2.10) >> +>> endobj +164 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 317.768 170.994 328.672] +/A << /S /GoTo /D (subsubsection.2.2.11) >> +>> endobj +165 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 299.835 163.402 310.739] +/A << /S /GoTo /D (subsubsection.2.2.12) >> +>> endobj +166 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 281.903 174.481 292.806] +/A << /S /GoTo /D (subsubsection.2.2.13) >> +>> endobj +167 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 266.027 161.749 274.874] +/A << /S /GoTo /D (subsubsection.2.2.14) >> +>> endobj +168 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 246.037 189.972 256.941] +/A << /S /GoTo /D (subsubsection.2.2.15) >> +>> endobj +169 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 229.081 203.232 239.008] +/A << /S /GoTo /D (subsubsection.2.2.16) >> +>> endobj +170 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [70.641 210.172 160.005 221.075] +/A << /S /GoTo /D (subsection.2.3) >> +>> endobj +171 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 192.239 207.118 203.143] +/A << /S /GoTo /D (subsubsection.2.3.1) >> +>> endobj +172 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 176.363 174.769 185.21] +/A << /S /GoTo /D (subsubsection.2.3.2) >> +>> endobj +173 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 158.431 185.848 167.277] +/A << /S /GoTo /D (subsubsection.2.3.3) >> +>> endobj +174 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 140.498 169.499 149.344] +/A << /S /GoTo /D (subsubsection.2.3.4) >> +>> endobj +175 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 120.508 186.645 131.412] +/A << /S /GoTo /D (subsubsection.2.3.5) >> +>> endobj +179 0 obj << +/D [177 0 R /XYZ -11.232 900.716 null] +>> endobj +176 0 obj << +/Font << /F50 138 0 R /F51 139 0 R /F52 141 0 R /F57 180 0 R >> +/ProcSet [ /PDF /Text ] +>> endobj +183 0 obj << +/Length 1788 +/Filter /FlateDecode +>> +stream +x??YKs?6??W?H??|NO?4I???i?[???$3?H???????X?")?????A`??owqo?q????b??M??????????$?b/?1S??+??s????? ??KU??F????????; ?D +  PH?J??!??#N??D?m?z1?k&? +? /?X???`??r;???{+????,H????z??L???w3?}??(| ???d?!??? E?8B?&???????}?????\?E??[????LX??]??Ti?S???? ?????z????????:??t???U??????mU_?vt?F????????f??ri)l?le?????j?/??>n?&????p +???};????r. ????Y??'|?0??????????>?\?U??Y????R?yhZ???#??zq?:?b?(1tTn?mF?*k3`XUs?F5s????B4j?u??z?a???=0?H] c????^D????e??Hr0y5<-?G8?? ??????.???e????%?j??u??V?,?f`-??x?~?j!?@?U?(??ow?????$??[?#???^???*iz[???pSE-H8~'??7 ?5????G??AM?????\?pe??L????^?f@??E}?????d??vw??a +01;?v ??.??0s|?T@??X????1r??WU{??II %,x@?;??? #S???\???x????n?(A???c"?|????[`????????pM^???@??s???w?3????r-[cd?N???f????????`=???F?(N!?m?F??ri?F???i:?x?g?i?????a??O/a,????r2?8???????|?i???n#?Y?.?(?'????4??G??????0)??tc?oV?:v_&2'???w???????Q03r ?`?????????k???i??d????a +p???@g? ;?=?5?D}??%?u? +?Q??y?Q?xd\ ???`RxG?z????e at mz???0fZ{??R???#???:??>???2???????p)'?=?"V???0??cB`???zch??S? Q??'??>@?xJ?x?*?'?km??t???L????p9$??]d2??Z???U???7??@?b??e?(?@??y?????-9??#H???????\?8???$ppO???5????fVI??'??H?d??? ??3{:?U???sA?????V?`????jB2????Q???@4I??z??[X??j??m?-??m?.?????zGR?=y??bj?????N??????(S?]?O???x9??n???Z?t.?e??'???A???X????????Z??@?:ma??? +???5&>|(???%?4?l??.?8U8?~5j|?Q??\?fHj?? 4?????2|??W????@?:Q??w?M? ?o?]?w?????1*??S?jl?jD????rB7Q?????0???????#' ???>"?O?'?>#??E???=#?p??????s??$#S6)V??rD????H?F?q??^??O??wz????????????:???7'"NH,??'D???pq?????q3{:????[????u?O??L ??@_ +?6O??#S???????1}?$6???%??n??=??? +???'??iOwf??}*????t??yu?w???<:,/???. +??????E?~Y???^??s?"x??B?r?~Es??????x?~??~??f?& +endstream +endobj +182 0 obj << +/Type /Page +/Contents 183 0 R +/Resources 181 0 R +/MediaBox [0 0 595.276 841.89] +/Parent 142 0 R +>> endobj +184 0 obj << +/D [182 0 R /XYZ -16.307 900.716 null] +>> endobj +2 0 obj << +/D [182 0 R /XYZ 56.693 759.068 null] +>> endobj +185 0 obj << +/D [182 0 R /XYZ 56.693 731.272 null] +>> endobj +6 0 obj << +/D [182 0 R /XYZ 56.693 596.031 null] +>> endobj +186 0 obj << +/D [182 0 R /XYZ 56.693 556.98 null] +>> endobj +10 0 obj << +/D [182 0 R /XYZ 56.693 556.98 null] +>> endobj +187 0 obj << +/D [182 0 R /XYZ 56.693 529.727 null] +>> endobj +14 0 obj << +/D [182 0 R /XYZ 56.693 500.03 null] +>> endobj +188 0 obj << +/D [182 0 R /XYZ 56.693 474.337 null] +>> endobj +189 0 obj << +/D [182 0 R /XYZ 56.693 468.461 null] +>> endobj +190 0 obj << +/D [182 0 R /XYZ 56.693 471.351 null] +>> endobj +18 0 obj << +/D [182 0 R /XYZ 56.693 417.347 null] +>> endobj +192 0 obj << +/D [182 0 R /XYZ 56.693 391.654 null] +>> endobj +193 0 obj << +/D [182 0 R /XYZ 56.693 385.778 null] +>> endobj +194 0 obj << +/D [182 0 R /XYZ 56.693 388.667 null] +>> endobj +22 0 obj << +/D [182 0 R /XYZ 56.693 334.664 null] +>> endobj +195 0 obj << +/D [182 0 R /XYZ 56.693 308.97 null] +>> endobj +196 0 obj << +/D [182 0 R /XYZ 56.693 303.095 null] +>> endobj +197 0 obj << +/D [182 0 R /XYZ 56.693 305.984 null] +>> endobj +26 0 obj << +/D [182 0 R /XYZ 56.693 240.025 null] +>> endobj +198 0 obj << +/D [182 0 R /XYZ 56.693 214.332 null] +>> endobj +199 0 obj << +/D [182 0 R /XYZ 56.693 208.456 null] +>> endobj +200 0 obj << +/D [182 0 R /XYZ 56.693 211.345 null] +>> endobj +30 0 obj << +/D [182 0 R /XYZ 56.693 157.342 null] +>> endobj +201 0 obj << +/D [182 0 R /XYZ 56.693 131.648 null] +>> endobj +202 0 obj << +/D [182 0 R /XYZ 56.693 125.773 null] +>> endobj +203 0 obj << +/D [182 0 R /XYZ 56.693 128.662 null] +>> endobj +181 0 obj << +/Font << /F50 138 0 R /F51 139 0 R /F52 141 0 R /F90 191 0 R >> +/ProcSet [ /PDF /Text ] +>> endobj +206 0 obj << +/Length 2021 +/Filter /FlateDecode +>> +stream +x??Z[??6~???G{&Q%? L??{:?N???4???m&6??{?L????? +?N? +y??.????] l??????7?q?(T??@P$da??8 ?????S?n?/)?????M6?yx???????@?D?X ^?b? +?2Z|c?????????? ?@??? ?i?????Am??8 +?t?}? F4P?o?x?v*?7%???a?,?Bi5????K?1^|??K?7????e????ik:??T???`!??2?H5U??@????8??:?]?{`?k/?)A?S'????Z????=FBK???_ at Y +XoS???cC/??K9?al?m?y??K ?[???!?W??J7?F??????{????m??pdl???7E?1?B6???~??Wv?J?l4?8D?c????r3n-??d?6???c??"I>}|O:??O???Y? ??*i???????(&b>&???Lx+;??? +????n&?$????>?'??N`B???Of"?? ?Q Q?lL??=??U???TEi?.e????A??!?x?n?????b????p ?B???p-x?7{???f?+;>???!?? ????? ??8f?|D??=??U????4??rNL??]??v???8??J??~6.L????*p!?wB2????[? \??I|?n.?DX?w<2????[? \P?B????q?(2?cs7X B?;o?{r???.p???????l??#??;n??????x6X!???ld??MFdB?????{???????E?????S?5?K??)?????&?B'??x?.???K?mv u??R??mm??$xQ????>???/??l?%??M^[??6?"??G5??l?6J???5{%?????C1?s%??b?U??Z????T??Q?Q?Cb?@????`??x????K?nxb?????h??H??)(?\???0?,??[>6'??"?oM?)D? +u/SA?-?b????r?????@&???w%Db??|w%|?_???x_K$?????mW??w??p?????w'?D??[??j>????!!??*7?? ????u?????c?z??B?u?PgOXo???e?f???#??\???y?IG?? +????????y??IW?#5?]e>oz????v}wY????N?O?O ???9?^u +???G?????)G?n?z0???P?M?1'8?#:E??]1<??U4???????Z?? +endstream +endobj +205 0 obj << +/Type /Page +/Contents 206 0 R +/Resources 204 0 R +/MediaBox [0 0 595.276 841.89] +/Parent 142 0 R +>> endobj +207 0 obj << +/D [205 0 R /XYZ -11.232 900.716 null] +>> endobj +34 0 obj << +/D [205 0 R /XYZ 56.693 759.068 null] +>> endobj +208 0 obj << +/D [205 0 R /XYZ 56.693 739.087 null] +>> endobj +209 0 obj << +/D [205 0 R /XYZ 56.693 733.109 null] +>> endobj +210 0 obj << +/D [205 0 R /XYZ 56.693 735.998 null] +>> endobj +211 0 obj << +/D [205 0 R /XYZ 56.693 725.039 null] +>> endobj +212 0 obj << +/D [205 0 R /XYZ 56.693 714.08 null] +>> endobj +213 0 obj << +/D [205 0 R /XYZ 56.693 703.121 null] +>> endobj +214 0 obj << +/D [205 0 R /XYZ 56.693 692.163 null] +>> endobj +215 0 obj << +/D [205 0 R /XYZ 56.693 681.204 null] +>> endobj +216 0 obj << +/D [205 0 R /XYZ 56.693 670.245 null] +>> endobj +38 0 obj << +/D [205 0 R /XYZ 56.693 604.038 null] +>> endobj +217 0 obj << +/D [205 0 R /XYZ 56.693 578.243 null] +>> endobj +218 0 obj << +/D [205 0 R /XYZ 56.693 572.266 null] +>> endobj +219 0 obj << +/D [205 0 R /XYZ 56.693 575.155 null] +>> endobj +220 0 obj << +/D [205 0 R /XYZ 56.693 564.196 null] +>> endobj +221 0 obj << +/D [205 0 R /XYZ 56.693 553.237 null] +>> endobj +222 0 obj << +/D [205 0 R /XYZ 56.693 542.278 null] +>> endobj +223 0 obj << +/D [205 0 R /XYZ 56.693 531.319 null] +>> endobj +224 0 obj << +/D [205 0 R /XYZ 56.693 520.36 null] +>> endobj +225 0 obj << +/D [205 0 R /XYZ 56.693 509.402 null] +>> endobj +226 0 obj << +/D [205 0 R /XYZ 56.693 498.443 null] +>> endobj +42 0 obj << +/D [205 0 R /XYZ 56.693 432.236 null] +>> endobj +227 0 obj << +/D [205 0 R /XYZ 56.693 403.851 null] +>> endobj +46 0 obj << +/D [205 0 R /XYZ 56.693 322.8 null] +>> endobj +228 0 obj << +/D [205 0 R /XYZ 56.693 294.848 null] +>> endobj +229 0 obj << +/D [205 0 R /XYZ 56.693 288.87 null] +>> endobj +230 0 obj << +/D [205 0 R /XYZ 56.693 291.759 null] +>> endobj +50 0 obj << +/D [205 0 R /XYZ 56.693 213.598 null] +>> endobj +231 0 obj << +/D [205 0 R /XYZ 56.693 187.803 null] +>> endobj +232 0 obj << +/D [205 0 R /XYZ 56.693 181.825 null] +>> endobj +233 0 obj << +/D [205 0 R /XYZ 56.693 184.714 null] +>> endobj +204 0 obj << +/Font << /F50 138 0 R /F51 139 0 R /F52 141 0 R /F90 191 0 R >> +/ProcSet [ /PDF /Text ] +>> endobj +236 0 obj << +/Length 2171 +/Filter /FlateDecode +>> +stream +x??ZKs?6??W?(U?}?????P??"y2-I?(?BBy?|?????Ph4$x?t??0*?C?p"??_???QJ?v?M??a????q?? 9M?\R?{???gL???U????m?b?mZ????r?b?[?????w?{??P?$??7p?(?v?-?????]?4\OS?s?????x5%,??4?(????n_E]?m?U??K???{C???????????p??73?????s??[? ?@????L??a$s??2?R?C?????ia6?)???-?K[R?~???[??6~)Mm?????m???[?????F????uO?0e??G?????KFz[???????,Z,{?0!6?b?????:VM??7???\.?????vk%F?oV?Vj'E???g??T+???E??cY?m?l6?3?VK??????????s;P?K]??c?9???????+;Xa??*?u?,[?hV?^@ ?^Wq?P???-????#b`i?t4?????X????.[???m?]??x??q5L?5?X??>?K???n??4??"??8?>????l??t???60?wu?+,'???????,?????????|??$M???iA?Y??? A??/???+????x???X????s?O??0Y\?2???!??????t?F??{??`?nv???Ho?4I???? ++zS?x??y???????]????T?NL?S??/???n??_? ?[;C ??? ?W??:` ????????@!=?@??????????????? ?*??^F? 0?P{+`?V/v??[???7???????M?????\J???????M?,???w7?B??_?c?????y?7????/v)%? |?????p??]?8?+?o?T?`???????v&??????OU???p???M7?Q??P?55U9)??%W?(yL??g??%?,7??G [ +?$w??u????Z?G?s??$?.?H)?I???i?"?w?tDJ9%E??????g?????1????KYJ$?@:?$?Ys??q?4fn???????;?gcn??=??=fC??=?!{???/??<"???????u{????v??t????J/@oCd?? ?!T?Gg_????????a?(H?/HX?I./GXF????|gO?!??s ???w??.?OcT/oi?????,21?{z5dj?n???b?v??6w?W >?J/??g??r?a?"?w?tD?HB?T???Lp*&?????y?-2*\y??5?S????X2<?8tI??C-?qG3l???a? [?X-?)?~|c>L?H?W??????Zd?0E!?? ?? z?q?Ue?N?6_?R +8??Q??????}@?%?z?? 1?\ ?4??AQW???1?????>z??N???m+wh???ztu?:8G?LcbF.???@M????k????/?8Ldq?????Y???}?6?? ?;{:0`"i!gb??^>< ?????k?? 6?5p?Q??J#f@?c":???? h??"? +" ?D???&?a4????ze????"?B?O????sN)?R??3????I +endstream +endobj +235 0 obj << +/Type /Page +/Contents 236 0 R +/Resources 234 0 R +/MediaBox [0 0 595.276 841.89] +/Parent 142 0 R +>> endobj +237 0 obj << +/D [235 0 R /XYZ -16.307 900.716 null] +>> endobj +54 0 obj << +/D [235 0 R /XYZ 56.693 759.068 null] +>> endobj +238 0 obj << +/D [235 0 R /XYZ 56.693 739.087 null] +>> endobj +239 0 obj << +/D [235 0 R /XYZ 56.693 734.297 null] +>> endobj +240 0 obj << +/D [235 0 R /XYZ 56.693 737.186 null] +>> endobj +58 0 obj << +/D [235 0 R /XYZ 56.693 661.911 null] +>> endobj +241 0 obj << +/D [235 0 R /XYZ 56.693 637.304 null] +>> endobj +242 0 obj << +/D [235 0 R /XYZ 56.693 632.514 null] +>> endobj +243 0 obj << +/D [235 0 R /XYZ 56.693 635.403 null] +>> endobj +62 0 obj << +/D [235 0 R /XYZ 56.693 560.129 null] +>> endobj +244 0 obj << +/D [235 0 R /XYZ 56.693 535.521 null] +>> endobj +245 0 obj << +/D [235 0 R /XYZ 56.693 530.731 null] +>> endobj +246 0 obj << +/D [235 0 R /XYZ 56.693 533.621 null] +>> endobj +66 0 obj << +/D [235 0 R /XYZ 56.693 458.346 null] +>> endobj +247 0 obj << +/D [235 0 R /XYZ 56.693 433.739 null] +>> endobj +248 0 obj << +/D [235 0 R /XYZ 56.693 428.949 null] +>> endobj +249 0 obj << +/D [235 0 R /XYZ 56.693 431.838 null] +>> endobj +70 0 obj << +/D [235 0 R /XYZ 56.693 368.518 null] +>> endobj +250 0 obj << +/D [235 0 R /XYZ 56.693 343.911 null] +>> endobj +251 0 obj << +/D [235 0 R /XYZ 56.693 339.121 null] +>> endobj +252 0 obj << +/D [235 0 R /XYZ 56.693 342.01 null] +>> endobj +74 0 obj << +/D [235 0 R /XYZ 56.693 266.736 null] +>> endobj +253 0 obj << +/D [235 0 R /XYZ 56.693 242.128 null] +>> endobj +254 0 obj << +/D [235 0 R /XYZ 56.693 237.339 null] +>> endobj +255 0 obj << +/D [235 0 R /XYZ 56.693 240.228 null] +>> endobj +78 0 obj << +/D [235 0 R /XYZ 56.693 164.953 null] +>> endobj +256 0 obj << +/D [235 0 R /XYZ 56.693 140.346 null] +>> endobj +257 0 obj << +/D [235 0 R /XYZ 56.693 135.556 null] +>> endobj +258 0 obj << +/D [235 0 R /XYZ 56.693 138.445 null] +>> endobj +234 0 obj << +/Font << /F50 138 0 R /F51 139 0 R /F52 141 0 R /F90 191 0 R >> +/ProcSet [ /PDF /Text ] +>> endobj +261 0 obj << +/Length 2220 +/Filter /FlateDecode +>> +stream +x??ZK???????d?\>$J:?"?? ?N???b@???iYr$y;?_?"??)?z??X?????H???H????n~Y???[D?????`?$'2??`? +>???u7??????:???????????? (?B+????-c$?"T??8??????????? +7h??H ???Iy??n>?N??}( ?$x4=wA?(?B?\?7???v*t0%?y?t?)aT?C?p(?????-???v?~}?-0????F? +?0?|e???????0?$M???????@?t?s?????*f?????? ???=???K?????Y???(???fJq7C7?$4??????VJ????m?X??q??=?=wu???m>?o^0??nj??8????w??v??_w???f)I?%=???1?m!e?2 2?m?jXI?fa??Y?:4n??cQ???)'u?\]#?U?u???M???@ j??|(:2?"??Oz???SsFg??????+?v|V???????? +XDI???k? ?_l-???#T??B?>X ?M??Z????jE;??>??h????nv +V???????%z?i???yS?}{b??P!??T +NB????#??!??????RD??@jY?O?b???-?o??a\??g???U_?i???? +0TBpH??X??c???????G?c(?!d@,?F?????R?`??s?R]{?????L???.??4???cb?????E[B???a:8&?+M????B??LK???! +>?ycG?????????`$L??B????'?3????e?(??????n???>? +C?P?????>??OPaN??!??l?j?-?!??vdU>??h3;??? _??.?Y]?=rOD?Vi?D_??;UA&???KU??u?MD???8s?J6&5 g?9=??;???h??0?Iz?c????O???^??????u????J????n??|????Q?1yC???C????$????t? +2?_!??????)??1?C?_?!?sI~? ????????== +??F????6g'!~L])??bST?<3)??4?k?u??)??$B?E +???A???  #???? ?? xC???S???c2???????}???bd??> ???ms/?????W??j???k?????'???? +?p??e> endobj +262 0 obj << +/D [260 0 R /XYZ -11.232 900.716 null] +>> endobj +82 0 obj << +/D [260 0 R /XYZ 56.693 759.068 null] +>> endobj +263 0 obj << +/D [260 0 R /XYZ 56.693 739.087 null] +>> endobj +264 0 obj << +/D [260 0 R /XYZ 56.693 734.166 null] +>> endobj +265 0 obj << +/D [260 0 R /XYZ 56.693 737.055 null] +>> endobj +86 0 obj << +/D [260 0 R /XYZ 56.693 673.418 null] +>> endobj +266 0 obj << +/D [260 0 R /XYZ 56.693 648.68 null] +>> endobj +267 0 obj << +/D [260 0 R /XYZ 56.693 643.76 null] +>> endobj +268 0 obj << +/D [260 0 R /XYZ 56.693 646.649 null] +>> endobj +90 0 obj << +/D [260 0 R /XYZ 56.693 573.114 null] +>> endobj +269 0 obj << +/D [260 0 R /XYZ 56.693 546.319 null] +>> endobj +270 0 obj << +/D [260 0 R /XYZ 56.693 541.398 null] +>> endobj +271 0 obj << +/D [260 0 R /XYZ 56.693 544.287 null] +>> endobj +94 0 obj << +/D [260 0 R /XYZ 56.693 422.55 null] +>> endobj +272 0 obj << +/D [260 0 R /XYZ 56.693 395.655 null] +>> endobj +273 0 obj << +/D [260 0 R /XYZ 56.693 390.734 null] +>> endobj +274 0 obj << +/D [260 0 R /XYZ 56.693 393.624 null] +>> endobj +98 0 obj << +/D [260 0 R /XYZ 56.693 269.994 null] +>> endobj +275 0 obj << +/D [260 0 R /XYZ 56.693 243.099 null] +>> endobj +276 0 obj << +/D [260 0 R /XYZ 56.693 238.179 null] +>> endobj +277 0 obj << +/D [260 0 R /XYZ 56.693 241.068 null] +>> endobj +102 0 obj << +/D [260 0 R /XYZ 56.693 177.431 null] +>> endobj +278 0 obj << +/D [260 0 R /XYZ 56.693 152.693 null] +>> endobj +279 0 obj << +/D [260 0 R /XYZ 56.693 147.772 null] +>> endobj +280 0 obj << +/D [260 0 R /XYZ 56.693 150.662 null] +>> endobj +259 0 obj << +/Font << /F50 138 0 R /F51 139 0 R /F52 141 0 R /F90 191 0 R >> +/ProcSet [ /PDF /Text ] +>> endobj +284 0 obj << +/Length 2180 +/Filter /FlateDecode +>> +stream +x??ZKs?8??W?hW%l>D?:n?l??T??]5????"??vl?#????? ?,?v???>L?I4? ???9??Ow?gw?>H?$Mx?Q?I?"M??f?????K?h?\??_???? +????>N??~,?? VA?A????H*%??0C??;?$v???gw??10?F,? I`=?2?P????_h4??%q??'??$???????????? +???Yt?)a4A?8???ab???QJ'ym??<6m?n??6{?2:Y??-Yq??i?A?#%8Q?n??%Kgq?I???6??o?????C??%yX3+=V???}????Y??+!)O?`?SX?G8??woJ??q??\*Rto?? }??k??z?P???eO??'M??6@???????:???????Z;/???}=??& +????>z_?O?wh?*?c??-??>???dSW??ok???b?BF??HN??g;mTb/??vY?(??u?i???E??vQ?????=?????????mUE???????YZxV?p&{/?K +6uC?p????????f???????o???l[/??S $?,3?)?N?;????e??d???lJS???=??@?????291?*? +??rt?}?B??n? ?m?6c???y?:????????gm?:;????7?,???*???P??\??????erY7%S??/!?ND?8?h?y?????s?/?o{x?????JyLD"??0? '0??X??C?K??????+??1p??B??jZ?T ??N`?J)_y?k??(????s????????`?&??n?U???-???&@?6?mVYnv????????F???1??WvV??]?G????]?g? ??%#Zu?$??3???|??????~?m9????VJIC?A?8&???!???qb??'???!?0?^^O????~=??w??X?7??????Lt`?b(???rh????M?a?????v?O??j??6a??7x?%D????????a??gj????K??g3??q??jJA?T??????$?qj +?'O?@c?? ?%?Q??r??F?eIH?W?(}???L?|?f???b??M`kY?S6??????\????K?????=?.*?=???Z?%???W?q?B??,6??????I?n%vHL????F?bZ????Mhp??x???5???_??????2???? X? ? ??m?GO~??Ua?a?&?7??8???????.?]? t??0?J?wx???Y?????????J/ZS#????=??2??Q7J"Zwzp??p ??<@???o/v?Ttv??l?u? +??Ui??Y@?d???w?IH??????p??!?k??&~???a;(?d????V??H/k????????r?eg?C?????U???;?8r? ?rFv??_m? ???????????b??? +? ??v(V$??4?Y????G{??$??n?b]?h$? +?sc????????????be?lmNc??/??????W??&?5??*?Q??e?/??'Z??9?/&?C?>k???????\????O?{}X?8???}DlY.? D???C!l?????? +??=S?<a]+I???U??$???????*k?leS?^?YR{ +?eda??h +????&????+?3???@?$??H???a?????9K? ??!U??qt?,`???????? v'D;L;?J=?z?qTe?D?k????j??c??C?????1,W?YQ6HY.???? ????l?zQ4? ?XOc:?GP????? ??????xA?;?4???sp??$??~?i???5??????????`??f????df??=t}R?oT???5 7W?0?8? > endobj +281 0 obj << +/Type /XObject +/Subtype /Form +/FormType 1 +/PTEX.FileName (/usr/local/share/dblatex/latex/contrib/db2latex/graphics/warning.pdf) +/PTEX.PageNumber 1 +/PTEX.InfoDict 304 0 R +/BBox [0 0 29 29] +/Resources << +/ProcSet [ /PDF ] +/ExtGState << +/R8 305 0 R +/R7 306 0 R +>>>> +/Length 566 +/Filter /FlateDecode +>> +stream +x?]TI?T1 ??Y?0?9b?$@?{?Xp}????[?(??~???O???6?t +???>??j?????4'?W5??3??/?%H?K*???J,?.?H????&>?=o??&)?d?$+?]K????7??]?:(mm???? ?'??<(_?OU'?K 2?????X????~?op/????_???H ???]&?????2??%??d?w^?%bT??XE!x??8j?$?4????3?x??7?"?89?? ?2?m???F6?,? ?a;?,???w??8?]50&??}?)???0Hc?3p ha?> +endobj +305 0 obj +<< +/Type /ExtGState +/op true +>> +endobj +306 0 obj +<< +/Type /ExtGState +/OPM 1 +/SA true +>> +endobj +285 0 obj << +/D [283 0 R /XYZ -16.307 900.716 null] +>> endobj +106 0 obj << +/D [283 0 R /XYZ 56.693 759.068 null] +>> endobj +286 0 obj << +/D [283 0 R /XYZ 56.693 739.087 null] +>> endobj +287 0 obj << +/D [283 0 R /XYZ 56.693 733.109 null] +>> endobj +288 0 obj << +/D [283 0 R /XYZ 56.693 735.998 null] +>> endobj +110 0 obj << +/D [283 0 R /XYZ 56.693 657.837 null] +>> endobj +289 0 obj << +/D [283 0 R /XYZ 56.693 629.451 null] +>> endobj +114 0 obj << +/D [283 0 R /XYZ 56.693 587.653 null] +>> endobj +290 0 obj << +/D [283 0 R /XYZ 56.693 561.858 null] +>> endobj +291 0 obj << +/D [283 0 R /XYZ 56.693 555.881 null] +>> endobj +292 0 obj << +/D [283 0 R /XYZ 56.693 558.77 null] +>> endobj +293 0 obj << +/D [283 0 R /XYZ 56.693 547.811 null] +>> endobj +118 0 obj << +/D [283 0 R /XYZ 56.693 406.486 null] +>> endobj +294 0 obj << +/D [283 0 R /XYZ 56.693 378.534 null] +>> endobj +295 0 obj << +/D [283 0 R /XYZ 56.693 372.556 null] +>> endobj +296 0 obj << +/D [283 0 R /XYZ 56.693 375.445 null] +>> endobj +297 0 obj << +/D [283 0 R /XYZ 56.693 364.487 null] +>> endobj +122 0 obj << +/D [283 0 R /XYZ 56.693 150.064 null] +>> endobj +298 0 obj << +/D [283 0 R /XYZ 56.693 122.112 null] +>> endobj +299 0 obj << +/D [283 0 R /XYZ 56.693 116.134 null] +>> endobj +300 0 obj << +/D [283 0 R /XYZ 56.693 119.023 null] +>> endobj +301 0 obj << +/D [283 0 R /XYZ 56.693 108.064 null] +>> endobj +302 0 obj << +/D [283 0 R /XYZ 56.693 97.105 null] +>> endobj +282 0 obj << +/Font << /F50 138 0 R /F51 139 0 R /F52 141 0 R /F90 191 0 R >> +/XObject << /Im1 281 0 R >> +/ProcSet [ /PDF /Text ] +>> endobj +309 0 obj << +/Length 1809 +/Filter /FlateDecode +>> +stream +x??Y???6 ?_?????e???????p[??Z??\?:vf; ???)?v.??G?NE??????9??m?f9{?N 'vc?kg?v?????D??X:????8?nq?+1?????.??/7???????s"P?%*"??????R?B??0???F???????3???(?j??????????g?d0??nG??Hn? ?????0?k&x)????? v=?????h???WI?n?l????J??w???'?9K?I???Y2????Is??????n?S?^S{??M??7,Zl!?????M?2??I????S??_???????5?u +??+?)?F?????*???????@???J_[?D_?ma?em????X/|5_?x?2?Vn???A??n??9}P?{??SM?????;??!"O0??'cG????v{??m?$U??XQ?i6q?LX??(K??X.?????3??]$+R?m?&E:tW??.Y???^??????????? +d=?64lw?????GY]Y??%MR?y???yz???k??@???Gjz]??u +W?A?^?S +p)?:F +?????2? ?i?x}????5?;j?b?W??????????+?qj?.bSa?N_???@y?g???">?H?????bF?Bm/C? +b??x[|p?-?Y??????h???z??N^QT^:?{LZ??>? ?n=F?i?Y?A?\?Yw?1?m?????{??5NM?N"l?8?]?4??????B? +/|J?N???C>???U??t???rn?`C?????;`C0 +???>%?P???vlJp???????b????0?#m?sO +x??\Y??C???????[`w???.??~?|gM +cA) ?)? ?o?OB ? ?5wt[9?\jH??\????????/???n C?????yO????k???????^=????Li??m?????S??_?X????????/???]???wP?U???????M?|??>Q???e6??????1??>?@???wc???;???K???Ww?^? 0+ _/2r}?(?pT?]?T???B?M??? ++'A|? +?~?p?,|H???b ????4? V???i?a??y?????? R???K1?#L?8?`..7M?y~2x?2??Mrxv??J?d?3q?Tp????p???+?`\???g8?q?q?3???gx?q???&uE=.u?\??~??A???tj?s(L?R +?????~p?C*?????????3<}?U? ?ITH[w?1????RA?(M?%????]&9?z_?/?q? d?<-2?)??v??l?n??J70?> endobj +310 0 obj << +/D [308 0 R /XYZ -11.232 900.716 null] +>> endobj +126 0 obj << +/D [308 0 R /XYZ 56.693 560.885 null] +>> endobj +311 0 obj << +/D [308 0 R /XYZ 56.693 532.933 null] +>> endobj +312 0 obj << +/D [308 0 R /XYZ 56.693 526.955 null] +>> endobj +313 0 obj << +/D [308 0 R /XYZ 56.693 529.844 null] +>> endobj +130 0 obj << +/D [308 0 R /XYZ 56.693 400.582 null] +>> endobj +314 0 obj << +/D [308 0 R /XYZ 56.693 372.63 null] +>> endobj +315 0 obj << +/D [308 0 R /XYZ 56.693 366.652 null] +>> endobj +316 0 obj << +/D [308 0 R /XYZ 56.693 369.541 null] +>> endobj +307 0 obj << +/Font << /F50 138 0 R /F51 139 0 R /F52 141 0 R /F90 191 0 R >> +/XObject << /Im1 281 0 R >> +/ProcSet [ /PDF /Text ] +>> endobj +318 0 obj +[600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600] +endobj +319 0 obj +[500 500 500 500 500 500 500 500 500 333 333 570 570 570 500 930 722 667 722 722 667 611 778 778 389 500 778 667 944 722 778 611 778 722 556 667 722 722 1000 722 722 667 333 278 333 581 500 333 500 556 444 556 444 333 500 556 278 333 556 278 833 556 500 556 556 444 389 333 556 500 722] +endobj +320 0 obj +[278 278 556 556 556 556 556 556 556 556 556 556 333 333 584 584 584 611 975 722 722 722 722 667 611 778 722 278 556 722 611 833 722 778 667 778 722 667 611 722 667 944 667 667 611 333 278 333 584 556 278 556 611 556 611 556 333 611 611 278 278 556 278 889 611 611 611 611 389 556 333 611 556 778 556 556] +endobj +321 0 obj +[355 556 556 889 667 222 333 333 389 584 278 333 278 278 556 556 556 556 556 556 556 556 556 556 278 278 584 584 584 556 1015 667 667 722 722 667 611 778 722 278 500 667 556 833 722 778 667 778 722 667 611 722 667 944 667 667 611 278 278 278 469 556 222 556 556 500 556 556 278 556 556 222 222 500 222 833 556 556 556 556 333 500 278 556 500 722 500 500] +endobj +322 0 obj +[556 556 167 333 611 278 333 333 0 333 564 0 611 444 333 278 0 0 0 0 0 0 0 0 0 0 0 0 333 180 250 333 408 500 500 833 778 333 333 333 500 564 250 333 250 278 500 500 500 500 500 500 500 500 500 500 278 278 564 564 564 444 921 722 667 667 722 611 556 722 722 333 389 722 611 889 722 722 556 722 667 556 611 722 722 944 722 722 611 333 278 333 469 500 333 444 500 444 500 444 333 500 500 278 278 500 278 778 500 500 500 500 333 389 278 500 500 722 500 500 444] +endobj +323 0 obj << +/Length1 1612 +/Length2 12917 +/Length3 0 +/Length 13735 +/Filter /FlateDecode +>> +stream +x??yeT??-??N??$???n?id7????????????]?? 3l? +??$+L?7??a*???y?>  ???y"fC?^??U???$??????&??FKc2??x^?)??lc?1a????LKQ6?[??T?N?T??G*???]-:???????P?{^???eL?s5 +?c?????x(???X???1q????1??X??~?c???a?????????O ??????#?e???????V?~96?j at n??T???}?n:?g6}????d????~?????VD +{u??Qdr"??Y??*??~?jc2D?=?6??jb?N?~5 ?&???3??L??a +X?*lY????*???????]??o??x?8x????8????B[?2?v????l??A,?? ???A???D???ci?n5?]?@7?K?'???.??$/???b?????:l??I??WpYW??M???? l\eo?'M?3?sE???????3??6zI?:?b6?,??cI???{?'n???????T ????,??=q??u%#c&ik +????V?%T?M?@:??$??w??'r?=? ?4??/???)???7U?HT?`E? ??e?????`????.-?;??? ~6?5L*?s?O? +O?~l8t_^f?.~??h? *F ??????(???8=???::q???s?t?Zr?[?+ 8??u???8????i(fQfc??n2k?wq?=*?p??9?N??L??[)L?_?$es????2w?w1!?o/??p? +???G????$?}??}?p?oJ?({??????qU??u??i?A?j?{R??I'?=??oy*?k??R;-?~???,r????5gMs?)_'5??`]?9?O?1(????1?d????]D?T?Z??k?3?V?|??"?uZ???4VOt?e??C6lj?D]??#$?????#D?/?P?s?^W?F??;?2l???'?????4??W)!????ZGW?S???l??t&??? +?fB7?59m-??/x"1{HR^b??((?? +t??? +???!???_?Gnb%??????L!zu??+?n?a??d?^'?V??,D??Z??JQ7B73???s(?{???cGX!?r??????t?0?3??4Y???lQ US?R??."?!??q?C?? +??@?f?????? +}E[. yPhM??l?^?+Ls??B/?{???"?eb?d??V??u???????????-?&?Lb???H?[dt???G?j?????s!? ?z5??u_ ??"?X?`D????D?Y?????V~?????O??u??????5f???E?!???%???cT???^#Vt??Y +??f??k??[?8a?v??>??|!w???l????????7!????&?7Xj?J?jPOa{ pp???j?r????f&?]??S?zmH???.G?????c(??v?|!?2???F?S?_??o? +C??f?X??B?(? w??;?-??????!??????uKY??l?? ?M?????????P%n???G??St?????=?&??????Z?Z&r??l5??z!??????9?q??????}??e??\?P??!$?7 +??@#?7iq??F?g???.?y?N???X1zori?Ou?Y,A(?D?6E ??}c???Q:O?R?"??lp?????>??Cn u??A?v?]??????5?l??6&??r?~;?J???{R?Q?* +?w?!/d%d???k9??a?4?l??r???????p2F?????H5?7?-??|???6???T??[?????j|?o??& ( iGw,ew=?]??Y?sc?y>A???`$?? +!R?i?????ng??Qi??????slK3?l?m??y??g0I?`??_???+??P?7?b??#??b?pU????Jr?? +AS!??i3?????Iz=Ut?SL'????,?k??}?vJ?????jW??b?????k?A??)$.???X?T#??39?????g??J?G?Em{????o?????\??Vm?????:? +??? L/?_G????CS+????)?I:?J>??I9-??$?Y?m??d?W???#?D???3?3?:i?!???R??@@D?????v??x!Qd??Y~???6$t ?????-0?????;????E???HE??o[Q?????????f????????????T??J????y?K`qB?X?K(?????+???#`?z?/?? h???????J?S???3?K??!?????????(}G?=????m^ou????P?? ???/?|?>lO???l?????y?6%??G?UG?@?z?$??z?`PP|10pw@???,???????????K???? \$ ?:??[?m??]???-?<{'x???? ??GL???8??F??z??y?F(? +k)???????C ???$?p|?i??h + at -?dq?C??d`????/)S0?SEg??9F? s=??1???y?g?=???wOm +?r? ?v???)6*?YF?k?\E???????b>???????}??)??/?/??L"??h,,???Z??$????x9?? +?\k???W8??L?????0m???"b???P???A1?R?? ~?td?He3y?R?????????f??????????eY?cm?b? +=?x6?o??z42/????d$?Na?cd?N ?q??_?????PR??????~0??8?FN?=0D?-g]z?????????*?H?"w?\??5e8rw??j????al?o%?c?2)7?wZ8h$-??L?Bh?k????Mu?V??????0?2?v?5??u???q???t??~??hZ??S?O??_?zj?? +! ???k8U#Wg? +?i?5?F27R??,#??? &>??? +??Z/?A?x???G8?30?S:????6Q@?*L??Fc???yh?N?????!?aUK?q??E-???icC??_?}?????F??I})f???6 +??#??F????? ?N?g:???j{?4 ??Z??N?g???'????BA??"????~a<??@?_! +?O?'???L?tu^x9???v??????{?c%???~??1!?^5}?.??W???;????????u??`r???k??U??jZ????e???? +??????A????MW??????T`?_7???????E8?f-1???WU?0 ?E??67a??m?p)'?n???:????p??*?L??5A?q#b|Jf?w?? M???wm7????????f????s?????Q/?d??????S??Q????Y?|?9?"8/?7??8/?sD? K?bQ?51?Q C????5`Qa?K??0??. ?)J??bI??0 ??N?4B?\]??D???t??? +i?h ceC#?6??>?>J?3? ???B?0??GT?*:???R6O????? ?r=???????d??!Uk ????)?s???AV*9V?(y?? ??S???|??U?????????s????W???$?@????????Y??}?? +1R?K4K?I"P????k?#nDM?~-}?3????b??T?FPo?arV??*???????Y?t?%['?}?T0?[D???L?W?P??y???? +??W?d?;%:?????>??K?T???iW?@"3?_?(???*S8C?_?svR??????????-o??????6?=X?????(?O???3Ll?????6???rT?????k??D?k?nP#T??*$?v???Z??]????y???Yj?e?`?b?>??';ph?:??_??1B??'???8n?"?????l?t??g*2???x7?E5????T??X?U????Z??Wl????2?????hG??e?~q?$????#?}??~?K???h?????????s>??? +?ik?wwm~%?)%?;Q???o'?;??Q?????? ":???\ +?<??h$^GE?l?s?,??M???F???)~T??????U?R???)?????9???kk???&?/9&J?M%c??xE??W0????~ ????-TO?R?tz??????????e)(?-4N'????a????????p?:?-?`?K!??P ????+??????G?L`?\?????d???h8n"????y??? ?n????l????*??1??=K_?????T??Y??????=???K???)???gw ??A????8 b?K????H????t?+O?Gm?f)uu????????mA??????;?^????K"?5.?t?o ?????G?v=GpF?)?_??D???>m)??6?/a??.?????>??`Wh9V????N??y9t??!??E9?{???F????????n?X8?????????zg?]+?g?$?i???D??@?T?Kjj?*????"M3K???????%?->??4'??t?!?w?(??? +?0H?m?????????lj??????? ???mn???}ZF?????Hc?U"#??<>??x2~?@?f????o???j??D?Y??@??i????TS?!??? 7?LQ??`7????QJ+???qJ?:):?tsj???B?^?"21E?????rs??Y#{%?E???d?,C/ $???4 +???zq?@?'??M??i????$P#???+;??3????.??E`?[6?!u???'3N????(?r[??Q?k?|???????z?|[????FS ???(???C??????????w????_????????>:???%/??????l??(?{??'?R>M?!????O,S??2|???????$Kf????Bg??1?=?-b.????!m?Y?G?VK4?Y???????1x"?A?Hf ????? Y7?????!U[???0??<?a??????????;?7? :??? +?E ?I???>?????pV???K??! +???gY?=#T?e?f?@?[????;?? Z??v>???x?Z? ?O???O??  +$?'n?c???????s?s?R?~5?C??F{??HN???h&Y???????"I?-NE?4?Zyer??q???n?tZ2?;]?????? ?z#?x?pl?L???_???P???????_ ????????{@? ?D??O?????}?d?S????>O;?S? ??-2??)?pOM??K??;????3????"??T?u?X1??????? +;??U?BP)?6g&?vI??=}?>iK?b^!`?????????????|??V?B????lY7?CWW????+_-??p?????????? +?%????=????! ?{?a?L ?????_?N??z??????6?}:??4?P?'[u???C?R?m?U?^y?????????6?A??|*?=????Sj????5)V?Au??4?y +???$???L?K??FH??????_c??Q???p???????A??#?q??????? +?'qME2?~%?? &|;Q1X?C]???a?#[L?/l}~#????M?i??U?? "r?V?S???p?CFw?.???(^[/???5 +?jk? +??-NJ?5~Yg?8????9 7??=????#F?????I=6g?EO5?G???N?/??gF??"?YX?`?e??]?k??1??:????Vz??~???4?????|J??V???9RdU~??&????M9??0???$? M_??1 ????D?i???)i??KE??J?g.E;-k??XTP???????????6%Nv??l?e?Nl^dc:3? ??G??Y?Z|:?%??4#pC?0~??V?7?'?QD??}1?u?2???r?"3?7?3?????l?#n????{Q?U???2????????????h? +? ?????w#?Z4%????ZG????u?a???????d?2?R??j?:.???BcE??/??????D&?F???????x?%C??Z` k????6 4??F?e?50?????W??w????G???????`??8???????x??+?????4??LT?????????\?V?[??r2??6J?????Foke???@?????, ?7?????l{_?K7?|??????#F??'+??v??7??Sn n???T^?O???b`1?o????A???J???\???????jA???R??B1?wO?:? ?^???r?m????C?c?w??(??]+?+ ??pk??^u??S#???35???g]{Ue??:ix?+k???B?&V???? +?VF[??IR???%???T?Of?'?i??? ?X ???)???LG???A??6?F"g6????3???C???w??&?"Xm*?s?;?wp\????^"e??,^?W??xh???/8_??t???????e?UP???b?f???????>??g??4E%n???9?mTNcB?????-c I??#][B???k?????????????g?????y;1????0???B????^v?"?R&?i???z??}????D*?7????{???8??!?????|?G?q???U?-?b.d?(? ???/??u?#??p&???? ??-K?[?@Z?x??U????tI???y??e?&??'U? +#???????9.?8?X?sh?Le???L??#?Q???&q[U?}e3?'P??????.??K ?hv????????|?Z"?y&??D?w?G??_??}e]?y'???z????^cQ? f?fP+?)ji??do????<`N*"? ?????.??b?4??+r????1? i[?v???G?_[?:?Z5f?$???M?L??????%,?cW???%??8????b?i?????^?9{?b?]v???@??.??11???W?$?M??2nM?YR?}U???o]?\?9??? !?h?????I? o?? B??????\?O{S?yWd? ?n????q??/??,?W??U????Ep??Oz2?F?????!??A?T???? ??????????8???????l?]b?/?`?!???T??s??N????????f???????f???~5???Z???`?@>z??]???b? +p??D3???|?Vt?t?f??? ?'?3?????????dH}?Ow?L ?? ?? ??L?w?@L?OiD???*4?k? a??sr????Y?x-?n???n???bG??9???x??c???d@??S??~J??r?:???f??%M?IH?Aqy??~l??tE?\$H?N_??e??f?@?????.??.?f#??a??,?z?{k?~?l????(?????B??=?g\????nWX???u?? ???3??????M??i? +?K m5dfB1/:?y??d}U^m??????~~??8U????6?'?6??????44L?d??0i?????M?y?%????????9C???a???lm?U$??hw?6??]zL?Fexv?Id??S(?????mx???cAw??????Mu?p???"?w?N?{1???N??-m]b-m?D??nl ~??=?%??k;??Mm???*6.R?*z???+????+??i?Fg2-?5D?????????-zN_??: +J??_y?-??EC?E7???T???????????d?q????hW~?'>>X?_??Q???{2????@{`?=???0b ????(+??????J??????,??,??? +?9gQ?Z?:eIGt???>??[s????0i?3?????|???????#??6 ?/?c.?K??8? +?v8????W??7QpuQ??8??_?P?e??????>???Vu7w?(m?cO??9?8??:?4 ?@?????[%?u??6`i +]?#e?O??d???:yP??BC?_?bi??T??S?XL?????N????&???'?H?????@??????"??C??????l??5????|???PcE??e???????????h?i??wM??????OO=??SN??5?[[?J??q?-?? ????B????z??2?X???????4?3?I?&? ? ?k?P0??????u?I????y?m???.vS???^?W,l?b5Rp???|?c??5?1?h?????8???ha?? +C?q?p???? +??i?/7????X?Tu?Y????????V|?????}????G=??#?J?Ly{R=????6?W??V???? +mn?n??0;8;??;?ts????Cn???M?]v +??e?i?ut?'??'I??w?TT?Dh?d?Il?k????W%- +endstream +endobj +324 0 obj << +/Type /FontDescriptor +/FontName /TZLUSU+NimbusMonL-Regu +/Flags 4 +/FontBBox [-12 -237 650 811] +/Ascent 625 +/CapHeight 557 +/Descent -147 +/ItalicAngle 0 +/StemV 41 +/XHeight 426 +/CharSet (/A/B/C/D/E/F/G/H/I/J/M/O/P/S/T/a/b/braceleft/braceright/bracketleft/bracketright/c/comma/d/e/f/g/h/i/j/k/l/m/n/o/one/p/parenleft/parenright/r/s/semicolon/t/two/u/underscore/v/w/y) +/FontFile 323 0 R +>> endobj +325 0 obj << +/Length1 1608 +/Length2 10163 +/Length3 0 +/Length 10992 +/Filter /FlateDecode +>> +stream +x??veT???5?wk??C??\?C????;?? ??;$???????????u??5s?Z????kW?????RE?E? b????X8X?J [gGuc??8?? ?f?A???p;? `Ic'?@ h??89???(4 ?????? @????????O?_!?????tY??o.@??-???????,?s? + ???#?$??Q???@c???? +??2?? s????)l??4G?7,1G?1??h +z?t5???b?lA??o??#??????'6?q6??????7!;?[???? +L???h??s?eU???O'Kc??r;?????[???????????y??A`G?????\&@???????-????o?? ???0??f6 at G?7?7?????:??zc;;??oC???/ 'G??9+ +?[NS??? 0 +?_?"6?8??a7s??O? ?????53 o$?? `7???M ???@??S???'??A????y?o???F?m?????????66J??o?????8?1?_??-??????@-???O rN?om[?I????#?Q? +4S9?Z??m?z??]lt???oZ??F ???4,A????????? 6?W?o????MBM???4????G??????f?F???P?????/ qq?+????? ??????l?\~n~??!??@?<+;9?\zoE?s?]???y2?)?)???9Qw2?????r?:;8?)??????????t??,?BL?R??:Ud?K?u?s????h???????I Y?/??T?Z;*???6s`??%?????oC?; x?M?E?????L??????fX??z??q:?? +????y{}XU??? ?l?????????%???????iru4^+f-ve??!m??? +]?@_o??s??-??hdAc???'?/W5??_Y~ +d??P?v?#??WP??S?m????Y??s?????????%???%?2p???l`?l??U'*??~,2ak???L?M??0??VKC?? ?-y+jf?2k????:?M???m????E???J??l???S????C?????E1??b?5.???!?a lbvm?6?23????z-?l]??6?'??>?wj )???Vi-"??Q???D`L0?????V-#K}???vq?$?\??1i???[?9?}0????k?}:pr??hD??P?A??#?r[?v???,? ?M?Q?;EoJH???I??R^pr?H?^????&? +oso?L???\???c; +4?V???o ]?A??|???? +?9?j?[??^(???U? ??[???lYo?q????>? ???6?????K?,???,?? +?B???c??{??????? +?=?hV??????#R????%?@*?&M,?9*?0G? m????s_??IA??????G[??k?x?M??_????U??i=?@'????AGB?o?G?f`??f???J??d??9?wlAR_H&?9???x>?????!??g;?8??IU?O?m????n?e???/WE?yG ????=<.??[????r???)?s??qls,)E??FBR?KE#Xy???"N?(??m??X_??????A24??m.iR?????#?????[?4<^??$Q????x;?fg?_ha[(??k????1???????*?3v?UT?U?U?t??7i? ?8r????}IJU???1$X +P?[?? +Z??4E?j? ?Y? +E????A!_-D???/rC??H?B?]????g[6?y?M?*?S`?,;???! ?&????Z????l??h??1"?sj?uI??^?X? +<$&?&|x???????| Z?f?2??b?x?!?8??????_2???????????H??? ???'??Hm???+??cy??M?F6??????p|??????T?a????;?Q?z???????B???37?J?K?????>??O??\??EFU#?i????????????w???_?6N???u +spP???(??T?*?&??_%???/??J??????}6???????(?UC???dX*'Q?,??s???n? ?J?????>???????????u*?a??B???_?e,. ??a?P`??N??B??HS?e??K?PE?{?????????[y?i0m.?????b&?#??????]Y? +?j????? j?????????n{x?D???y5?F????Z+?;??&??\}Y?{52?*??6'?$??y?}????}?????2?+?F+?4??&8????|?p-? ?(?r????????????C??;?4??y??????????A{uN;???2????k???????].?wy??`???2?c!??s?5Vb? +? ??1???????xW?sh????w?)?E??K?wtZ?????) +y)????x??0_????/?*??z]iE?c????B?????Es?.??T??A?]=3ACw??6=?EX???i?XW??|h???va%?,????sL?????n? +???&,6????b??? +c?&3????J??A? FR?b?1z?? ???`?U?^td=?i?[??g?#r8?@-??, ??~?g?v_?/"??!????R8?? ?Q$?9?=~??\Y2?VW??????w2? 1?+??:?,??y??#\???8???????????????yS?Q?eEF"?m???NE?.?V3b??eJB +???I??????.l?^=?H???????J5?E??y? ????? ~^I?Gw?? ??? ?V(,??v.b]?????????g??%@????:?]??~???J???y??o`??C?"?|??SS]???zM??????;g[?x?f???&??8??????g????`K???L??;??$QY?qM??L ?/(e???H???|TH???P?r????K?[???%q?Au8???cj??V` ?eg?#?0??+e????"&X??DT^????(T +e?g?????v??*e??4J[??-??TL ??80f?|.???Z +|?*Qw?1c?? ?~?7~?z}??????? ??Ps?%?N??d?i??WE??AE(g??W>2a???w??=O?[?l?}kU????L??S3;??? +{??MRX?2?????}w6?????^?j?m1?'?4?????LWS#???d????:F`?qi????\?Y?#?Qd?43???T????l?????gp?????!]~?Y`?_??&eA????4???.???6????k? ?X????:???wby???Q?;???5z$C??i???????L?P??J?h?:0?V?3???W?{h? ?c??????????O??????I???'?3?E_j/?n?L:?jul?`?v?f????????D???D&????v??R??a?y0????-?o +? 34Q?Rg}l2?M?g~?9??????o???qf????/??Sv?{???h?w??P??|??????y!{??X^(???Sj?k????w?4???e?T???N??+?????i>?5???Z(} ??)En?[ ?>J??*m'?aJ@????N??!m??mMS?=}6?T?~?Q"?????J???#/nC? +???zh???qwZ?.???????AvF??J?.?|DP`n????q???}???\$?k7?b4B?*?YSY?????"???,?z +#??9??wh?P?w?????:9???l??w2Z?c ???*7?F##??6?D?~??e$????c^v?d??P<]?+??iu? +?.?q  ??.??[?\?{F?3g????J+??J?????g?k?3?sh????????? ?????/??????Hlu???P8????x,?@Q?z???L???`[~ 9R?j[J?"?e???e6/ ???uv??q??~DiJ??V??.?h4??????$??y +?5?r??9C???^?U?g?lu?.,?*???~??Q???c????R?F???J??\?L??Lx??t??cYb?>?J?`:?????"?:?V_[f3?? ???G????d??k0??[????t|???X?V??\MG?z)? ?($l??Q,?_??/??3??C ??e?;?$?f?nN???*?/???zq-9 '?DO?B$?T?x?/1?????{0?#?p????????$N!m??s?0*$???W????,?0wYg??MS??)?<4?&??wHH?=k?nx?f?5U??NUp?A??r??y?2??????t???-I'O??3?V +?????????n??S.????BG%???z?_?@?i??x'f?^ ?:?i??k?p??????P?)nO????x?H?? ZT?`v?>#?=????f? ~P%?e????[x??A +)?Oq??f????;z??lJ????j???f'[9?S?????Hx??=??wBA???~S=?!?'???%?A??w?l??f?~? +??T??a???0?pO8????+<??m???\?.???d68??-???A5Q?[~H=?=^??l?-??$?1+?????H?hq????????N_` B??`?5s?? ?5!?????"m2????K?N~Ys??#Z?BM?w~[S0R?????U&V?3???z$?l????7~?kD?+y???????0Q?(F???`y?????4???Ogx?@??V???s??8?f??D?eUy???k? l??g?[gZ???r?'?PD??????_*?u?PEN:y??????V???e????Z?(nXI??f +??g~??d[P4??+??qmQ?^.n?uK?Z?fa?}??j???6m?????????????F????S]??&o?t???hg?l*?=????k?=??8??S?~d ?qt?)?c???????(Nj???,0H2I??}+wX??????H?k<1??_?+?Z???>o<$*???????? f??#?????@/?:?~?|tC? ??5????}V??+??i??G??c???C?Z?|???^?u???r?6?'N ?Q?h?%???C? ???}BU{7?r,?W;???k??iy(?g?a??"'L?9?? ;bO??H?V7?H??]??5?j? (}??????"?3?K?b????>D???? +I ?????S??8Q[F5#?K6???j?????????-z?6???1?f"??:c??}m~??? C?:~"???;??? +X?l?c?r?Xx???.6?K???p?dck3???,??^?Z{2?V???4???[q?$?\1+8? +???Z?l\cU?Y??d%k?*y?`?9^bp$X???x 0~P????'K??.v??(?G?? +??????m?j??\'???%)??O???????(w0??????VF?E?????u.W?P?Y?JV???????$r???T_?f?vIQ$*???? ????? +???r???Gv???!6=R6??? ??*?Nu????R??h. +u?"????C??r????J?kLP? ???S??FN??]0?FB? +e??$????=/???d +?+?? ???FG???UV L??D??>V?????[?W+lK>F +?V??h?9=@01C???j?PG-?L???q??7?x????>?_??????kG?x?6?u??H????????Y??K/q? ??*?-:????Z?=M??O ? 3#??4r???s??Fb???(??Y T?????/?????? +?\?0?]u???>??R??-??M?o?H +??v???N??!????F?7o?????U???????? +?\[[i?u???L?}q?=7d?m???l??u=??6??5>??W??8Z?????u'???????F??X?????A? ? ? ??n''???B?,;?/|?;KL?? ???D??0?????p??4W$? +vN?2?s???l)?-]?R ?2)??? %%H??"f???S?Z??4cK~[$aU??B-?V??|h-G????a?????^??1????"?l???+???`???Fk?F??0?5m?Q????4?DQ?r???@GR??? +????????!??%????????)???u????o?l????:U??(???c?eI|nA?"?????g?oO??Hb??x?K57????[7k???E'? ?????V?e?Oe<^[??r??(????Alv?T3?k??Im??=?C???*???$S???m?[???N????w'?5D??a??? *??R.?`?"?Z D???"? 9.?N +?s?????v?7+\??d}?y/r????G;?????_h??t?????E??%????;???=FM,??Dd?7?"????Q%?2h??P +?? u?C?jM???}?r? ???????O??Z?{?>??U1=1???!?M??5(??rx?L4???+??C???p?ix^??u:????4&?`?????v??`6FA?Hq???K~???????????cH?\?1Q???c?1nX?vt??1t??????????4????p????Ih;?u_??a?$G?+????????Ua??g?>?????p??h6{???}$?SZ?A??V?N??~??:?d",y???????????`xR??y?>(???k???Z6?%>Q??Q|Y?0? W{d??!9h?@???M?i??E'?w???????y?C?]???o1??Y ??d?r*?UA????????[\?????????S?\?sk9?????z?<^ ?????L????B???j_?uHWJXS?_?M?&??!??q?!?A???|???o?t?X???v????????????????+?~?"|,?MV?i*?H?@?Ze?O?Dgm??W?{?v??_b;?r#g1??Ac(?,?:y??,?J??? /n???4?x>???Lh?8??+?=4_3 +???Czo?u??;?"?V???????-?n????!?TMe3?P?98?tH?O+??0? r???$?&k?????y?+M????A???W?8 ?a???p%?|??.?7a?Yc??? "?W????? +?,[m]???G?W)?'???????pX"????+???h??jB????`Kj?S??0] ??????-????H?(~??@ l?L??K?g???I???? +W????6|?m|??\?y?]/9?????7U7)???/????~#3vhT??@?l(U*?w;??X??Ki??S?9iG}?q^???S?Vj?W" +[?S?j at 3Vy?>?M?1?T7??uU?????I?/?4??9??v???~?C3Z_?????(OE??|?|????=fA%???K}n????Wj?Q???^???4R?????(???-9e,????0??? +????B????SR??z +?6?n???s????y??Y???(?Y?t?h> endobj +327 0 obj << +/Length1 1166 +/Length2 6977 +/Length3 0 +/Length 7752 +/Filter /FlateDecode +>> +stream +x?uWe\U???AZJ? +Hw?tJI7(?????aS???%??t?H?4R?F?)?zx?;??{?}??a?9??c?1?,Z +mi+?P +q???????-\???!?Z@?#(`????r??~$da at sg"g????????a^n?(?????????@(L??C=@g ??0=??]?g? ?????????X?,?@??c?;?# ??s?f? ?ssrs????Z?>?v?;\???2R??V?b????????>????p? + <:?1????3?K??t??0?o???| ??D??Q??Fr??? `???,???uY?[??[???5?/??j??????YC? ?C??????_`??F#M??Z??%%?P?????????ig???????aQ?F??Q??CO???????p?4?;4?: ?>?1? +?J???s????4a:??*?????>?PmB??I? ?L p?6?y??~???.???o'"????? +!???".+?f/?j{L??????]????s?|??\P???????AIqF?+S??w?p??ER?[ g??lk_? +3???waB??)??t1?<0???0??* +b?b???\???~h????S3?[?G?#/?()?N?E^??k/????N/??r????s???+I???+$?|???I ?a=X?~????_%?3?U?\ ???(??(?HWVG?c?N????R{a/????????*d?9???D??-K2???????@[K N'???????8n???~? +\?tw#3??Pir?????ow^U??????0???%~m??H?t????U?????~?M6?M?3???m?5?Z?y]??H?_?v?|??>:!?|J????=??A=y????;?k.??c?2??:~?m????~?Q5k??)???!xMy??Ee?G'?#??E??H??F??g?????|3?U??E??x???6kx?jS4?$6?W[<2? ?_??*?sm? ?H2?? +?Imv????W?X6Mh??)?<(?????bG??h???"r??.?Xz?I??T$vT~??ef?/?z???C???nE6-??4~?0????"zN?\_x0i?z?f?$??]?'4?Cy?w??R?,p.?????k??M??'???Bm?OK?T?4E?Qk?E?????=?-?S?j? ????!?i??q?S%A5?>?i??{?+??7?TN?%??? ?3SR??m2 +???? ??6??~ W~?????4?(sS??>??K??bA?e???=|O%??HK>?==AMyh?!?z?c??? ???g?????x?2??'4???J??[>QIw??d? )??? /???O????!{)M?#?? +?%??????9?'??1??????k????J??<6??j?l|o?u2??Z????>? +?6?2su? +yX???????"??n????v?G(??@?? ?BU????!??!.?X?????[ ?C?u??2:>WS??U??9jzAs?O?Zu??9????N?? +Kh???T?? +??u??? +j??K???&??>n!U?gE?2???? +TK?w6?.?P? `,??? 90?????????O????U?wz??=?:?vd??8??k?"??m?2?m??/? +r???'???e????L???w?O,a?C/???_??}Dlfy?d??4??*?_::,m?Y?]?^a?????0 G?]??E???v:??-6;xI?/zv?vG?O0f?7?\?????dhS-8???^??wY??P????)t????.?L? K?o? +?x????%<$#q??D?( ???????>???@??zy%?f?????Z{?%?2T????Ve??%??9 +(????sT??B0?m??k?wE?????m-? +Q??"z[????2R?j??V????o?????`??1?&??mBK?????7?np??N ?0?"?????w??j???H +? ?????g?Z?y?T?Hm?M??? ???.???????q????I??6???l????V??)?A ?N%02?{c?????`?k52?????V?|W???Y????~???W? +???B????/????2fd?P; +??M???????+??S??Fu??E ? +??.???V#?q=/?????3????4 ??s]T?????n?)/ ???#?|{?e?[pk5??|FC?}T)'??eV?->4??G?2???t? Q?6O;(??rwhR?!??[?2???????< ?N]*???g?lud??d`=??w[_aX????r? ??L|?kD?M?\?nu?z?.? ???a??s?{ayBi?? 3?????<;H?s??Vi???cojco_??6v'???x???9?[V??4?f^?(??MLSq???2???r??h? T??*????I<.?,??9? ?????d? v?u??U)?'?9?Q?b?y?I}???X?????#????Eb??Qr?V,???????`M?tq?&e5???]?T9???)? ?:??????Y???;6?2?L?k&{3??r?/??/1??B7E?A +??k7?@??VA3N% +$????#%/?L??7???to??R~?My`i???a?5????,??????a???-@??O,????? ???V?x???^??CRGX?+??D)1??????d??Q???Y{:r ?V2?T OT??j??????#)8????{7?? +?????"#????Z?A??>J?$???"?Qe????????W????,wJ?9????H?p%?k>?2??????M? ?:6?lS?1?W?f?? +y?|B"??R;3????????aT?F??Y[??m???Q?C-?5?pK???????y??T?X??+??Zb_a??U?\??.}!?o]/:?.?5??&1t?oq`?0??v???8???6$?@?`?S? R??:lXf?;?o???u???.p-?|?????mqtSk4+Y????:/B???????=??????4?\=h#?h?@0??G?????/??~?=??\R?[?.??Hw??xU??2?U0??JhI??L???????VMm.?-:v??{??????+????N???l?.?S??????O?1??????ex? +??w"i???O?T??>???NF??rR?!?>??|!!??}?"?,S?U=n1~?JV????????Y???s?5?t????k??PQ?????S>qo1?Y???c???C?O]C?VV ?k??;???7?9xz???(P*g???`??j????`.????}?#$?yg????0?l?~b at VsePY?.?Q 6f???u???3}?h +? ??3o?$p*??S?)????g#a?)H??a?^?YG7vP]?h>?m??????;??*?un?2IFG?e!&?HU??????\?G\?E`??y?D?'O?.?????c??N?e???^???i?1??t?z?#'!?3{q??????)?9?2B????i?+?????b??G2?a????F32hra?iOy?<)a???Leh??Z?E?7?E??&??O?]1u:?eL?M?H??Z-?:?~?"N???????]qf}???XjY ??P?d???AV?b]???x?E?@?C????4?.???*eKaTaRhw?????n? +?3??S????]EJuxF??A??T????r?O}?x?????a(Aiy?????y???b??)T??^?T?1?"y??????_???i$?w??~4A??z???S???~????MB?o?1 +??!?z; ++? +?}n????? ???~??G\?C? ?????o?J  ?\????&J?????`on??7???~9?'?x???b?q?Md?Wd~?6.??8~O?7<=1???R??????M?]6????(EQ18?;??LG????!???3???DTF=??c???5???e??>?U??T???[ ??O????? kL??13 +M???m? +?]ZYm??l??????t{?\t????^Dsj4 ?\???ei?????iA?&?X?H???Z?)??n +???I??~?w3?lbK???1?????A???$f?Q7p^??d???G6u(?R??]? +O? ???,??DQ3?2eb???,?~?????L`;??,????? 2??>v?Q??^? +??.z??30?]??????h???\?K?G????${???q'??O???VjU?b????a?1??????tt??1?A???`lB?_???e2,?*tn??E&??8?????>1x?q???wv-???L?s??U????F???V??Tk7?X?Gm?q?">i? >??[?|b?l=??,rqq??h8??g?7y?? R???4Y???H???RU:6??R??>???w|>?Ja??????F?????+?%?^8???b??Z?Twx???pJOnQ?^???Z??]A????/??O??#??w??????:o?'???????cY`5????{r???gy?l??)?=?z??<&?G???)G???T?u??.1?vN?5h??C? N??)~l?\???nx?CpL?5z???Mj?VD??,???C? +????k?&J?? +?;~???%? +endstream +endobj +328 0 obj << +/Type /FontDescriptor +/FontName /ZMBSGR+NimbusSanL-Regu +/Flags 4 +/FontBBox [-174 -285 1001 953] +/Ascent 712 +/CapHeight 712 +/Descent -213 +/ItalicAngle 0 +/StemV 85 +/XHeight 523 +/CharSet (/A/B/C/D/F/H/I/M/N/P/S/T/a/b/c/comma/d/e/f/five/four/g/h/hyphen/i/j/k/l/m/n/o/one/p/parenleft/parenright/period/quotedbl/r/s/six/slash/t/three/two/u/v/w/x/y) +/FontFile 327 0 R +>> endobj +329 0 obj << +/Length1 1626 +/Length2 7736 +/Length3 0 +/Length 8565 +/Filter /FlateDecode +>> +stream +x??TeX????ST:?tw?tw??????????.i)??n? )Q?;?;A???3?73f?????g?????? ??,?C??????o??r????(??2?j??,????'P?q ?:?Gn???*???o))?;????_?????x? ?s??%?q???jw????????~?:?? +F????6?psG???????m????(????????vrYb?MC,E?mS?S?5???2F??\?!??z???J??????s?D?@?()??"M??????N(M?NQ ???Q?????v_G???~????????AU???if ????E`{?R?????S??/?sA@??/???+????????]Da??B?(?i??'C?,?? +?D1N_F?6?????1???d ???{2?,Y ? ???I\???3}2xW?j!L}??^?? +A???????~???hf????%?cd?Y??????H /L???u7??\??Q? +?2????3,D???df??????d??m??3????????uwKile?TI?y???????oL??M??d?oc????I???iF?????C??2????6t|??? +???s?o;?z?a???wLP?????oi???$TwR]7-?:?"Io??W\Oe?@??E??^=l#?f?[??{Z>?w?IO???}s5y????v?9? +^?[??l?b/D????N?"e????oB??x?#??g>??~?c??Er/6Z?=?_??yN? +???N????????5p[3???97?]?yM`??4??:?s? +??[???I??h|???T vg<Ug?g@?????=?[?B??!'s?I????@>3??? X? +*??X?~c?VB????E????D?,us???Rl??L;v?rz? ~+??J??q?{UZ?{_|_??????f???n?b????]?8?????i????Rv??n??5??????U.+b??I?????!?H?}?????u?????s?TN????Z???,?7B??v????I?$?B?H?UP??5j?C??j/????r?S?5Gb +?W~?Ua??B?j?\????H:j-\ah?&????mZE??C???FmR?H?Xe?d?????mM?'? ?l?G??&,??/?????>?j?4???E(V?|l.??(x\???'#?qY???[/;J???D?8:?[????f???oh*????????Q?]}?? +|0?n???????l ?Kx??YpBX??Z7??V?x=?W.;???#?? ?=?Ayy????;??+?????6???0?w???wzD?????>OU,?3????????G?r??EU%w?q??&n?n??I ??I +Ao(?b,???[????&????_??&?-?@?5?????%?*??tf???-?P0??s|!kl?F:??+?n?0+??_?cn?T?W2w+??????O??>NT8???K???'??1?;??fui???e??N????u????FHW?*??\A`??&Rhk??P?)~2?2Z??Q|E[???-??????=[]#:???0# +?"{??dSq????H???????G?*?? ??z+??x.??'6?3%????]?????Z????[???????"??}%{?J~fV??r???/1?b?q???2!"??MwS???*>K??h0??F???3e???f?? 7?y&??i#??? ??7??;?H??Qk +?????t??????6< d?m??m?#8????N?????E??idw?9?0cpxv???a???B????????4????3)?"?%4{ +?E?2?;?|????@q6???@???r at A)0 +???H?k?[?UV T??f??_?;l??Z?u????M??Kxns<5G??Q??l?77?g?Z+x\?B??I?^?}r??o? +?$??6>??b6?.??D>Sp??a? +r?[??T +?!]??q??4??{??zlk?CWo??>?:%??W????`?????A-??0.????t?????z '?uu???U?)?I?$??j ?JW ?????nk??s???+?|(n?n??k??????N????7?L?It)Q?j???+)?? ?(??* ?}4???? ????? ??pk??Y?#??Es?'?????o?>?k??????B@??-????0E"ZO?G&???z?.[??W#??+????Y????V????I9B??2??Fm??,2C???? ?eqh????ZE?F1?????.?~?3:;?*? ??<1-2X[???u???1?)???G.?H????M?R????n&? ???'#?? ?????>????B??.??oM???(0??,???yM???<,??E?f?^???Z4??21w@??s????@??o??R????p80*(T?|?+0 $?6+fb~??&??e?XBv?D?s?Q1Jd?xL???K???B??????jm???8?????e?\?R??a|????xbC%t? ???bN??L???U?KJ&? ?_ +8?1???????rQ?j2????j????a|ES!??R?6Ti?HD???*?[??Y??:^kF?????Lc????|?????=?i-?Q??Z?)b??2?????V'u%??????L, +?'=?Kf[???v??OuDV?q????????(??O??g???A??/??S\L?|*?n?cg????????;X?2-? ??&???~?D?o?9?:???|?????@?md?.????#?R72??4u?A?!? ????eBI?"[??????XO?N???N?Np?P[M?TJE?k???g/??e?Bz??O? ?9C?????????a)??b`??q??e??F????y???&&\????>2]?}xt?<#?Cd?Z??}?z?? ?^T???I??`$m??%^????zG?X?T?)?????-??}^?V?1Q???NS?y?>? ???1???.O?Ex?Ws? +?a[L!?;"?t???@?c7?Z??A?.???9h?7??? +??????&??v??g?|??n?? C???R\Y ??j:?H???kxDa? +w?0?9G?ah??zL,???6f}U/???J??S?k&L?C?W?zi???`????#/??Qr??M???????I??????,???Y??h ?X??Q?*???"i??? +!????z9?=?ZI???x????&??a??O??2???|J????????N???P??$?`57?A.??A?$ z??*???1|?????}?]?{N???#?5?Yx?El??3????!????qI??kI: *;?f5H?0?P:????n??0??????/?$??S??8???#?!W?D??5?f??????G?]???]???#?.?o +,V?&O?#D???q??>'I?R??5;e?rd;C?}y???G??9i?:[?{??7 ???KB???L??e?????????/ +??DU??IR?)B? +~????it?7?HN?-?C?9j_Q???<=jx??x??!I? +??0]???+f????6??-????{??3??D7?F????Y???? ????1wU???$}??c?o6[c?H?{Y??k?~2?X?.????z???/i???%?LX? K??1)?Z?miq?????H@?",???R?}b?X?v-?zs?Z???}??X?WJ?:?fmA?Lp~?? <?^GXjy??[!?$????UY&dzND +?PO???qm?><?????%\45?To??y?k???{?????O??qo??u52???'Ns?a?{????N?)?9??u?c??8??$??g??_?? +?^h/!f??s??????^X%?A?+??P?j????XS????#?AH???b??b??p??W??7[Z?nZ?'?d? ++???????`O,?3O?F|???~U??En?b +???%????6!Y?????D????>????????=??O?q5?WK??>'??d??g?>?ed0I?[/????oV????E???y??@/?{9eZY.u?vG??zd8?@???????????Y?% +??5?J? +q?J???????? + ???????3??????v?-??<:?? )?????>?ec_St?? ??'?Mx????#?u[C???g????[2? yH?@?y?r?N4??????FY?9X???e?????G??#?i?e6?M???>?^???NN6?[O$"???0pn?????@??G????|(,xv???8P???lv +|?? +?'?0F:??????IO??????Z??????Q?@??:?G5v+??$}?,??4y?BqmR??? ?FL????`???{??*????T~U???4????3s??9~??????|~?9????????ats??.Bu??@??#p??L??Wv??an ??2???????J?!6?Tl???q???? ? ??O?;?????i??????~?s???_?S?????}??W?/????T?]???UW^Wt~?=???$??fIz~??5Q?ki,G????Ep]????#??c??^B?????M?{P???M??'???-??2>,\?????????+?xr?'??C???S?&?$?????UX??|: +V???u???.??6?? +?aj?!!8??????Q1?u??.,????O?DF?c?7_??D?_??~ +?*8??"g?>',s???o +?hw|???d`?L=3??vY?i?Dd{I?~? ??4?T+D??&??t1?k?L???;%N?t??????d F2V?Q??iw|r[d q?,?_????T?-???=?Z????U?>?K??k3?(IO)S??E6????)?$b63E? ????)?G??^???u???l?N??5???C???????{??a???X??]{?`?V."??v?)??om?'?l?????} +?T???u?;5??!? +l???N??*???z#??Q?;?r?X1N:??E19 ???????+eg^f?M?/Q +r??/?,???c??? ????U Wt?j[> endobj +331 0 obj << +/Length1 1630 +/Length2 15107 +/Length3 0 +/Length 15952 +/Filter /FlateDecode +>> +stream +x???ctf]?&???m?N?N*?c??$?b??+?m'????o?>=???????c?5qM\s????U??M???v???? L<y #'e;y;n9ze?? ?K?GN.?4t???3t?4?&1?1?????? +G???p?03wP?)kP?????????h?????b???wCgG w??W?L????t ?s?c?? ?????\?-??? ????)R6aY1;? -????Z?&{?G????*?a?@?)?M~?}????????"??8'h0u?? [??Q??%?uR" +-???????i??z???N'?Xw?/?M$9?;?c7?? ?p???K?*???? +???k^`d5l\E?? ??:!???(?W?????j?? ??4f?#?????????4!-????+???d?A? )???^??????d??|???* ?h???DC?>/?x?$A? g?5Q????U?3??_??h?>?W???|??`?eu??u??d?????Y3????8S*0Da????????????u"?S???@?0?f?4{9D{^??Zi.?'EOF??????/??? 3????&???????t_???;k?l???y@???cO????? +?????0?RplE?t??C?ho?b_?{.?*L????bI?"??m +???ROG??8l?I? +??? ;????J5fN?????w???7??????x=N??k??>uri?`#?,???qp?#X?k?i??R|W 9S?{?&???w???????SP #C\I???#??}d???????[???e???(r}Cl!8Yzn?)|? +;?????g?7?C????9??;J???????*?Y?IB?nShI???e?q +?,jw?p?+}y????????i???8????????'U??8????O????B??[?zJ +????V)~(???????fG;??W?U F??????%??"pI??OC?-V??m??3F6??wI?R ???5f???HMD??r'???1?9?l??Z&I??JW??u??t??M??Et~???=A??)m?????,?$????F?$?(?????(^????G??b?L?^X??J??wJ? ?/???cu?474??????{8y???H????????J?l?@1_a\?YMH?????rT????y??=??Q?????????.szQ??|?_?'??(x?????q???+??????NK?D????A?t]??0m?7?]??????\?_ .??o???+???U??nbI,I??l^?F????? ? z{r??!X{??H??|?3?'????c|??k???U+K}ub?7?W&??.????D??f?F?+?*n??a?? `|????)??????H?p/??c_y??????a'8??????.??????wQs`???????V???e?h[??L??i??e?????M???iahy}uO^?????^?U\I+????@?2%?Q?O+:???2??c??x +k-?:z|rZ?2z "?P??*o?P?tIG? ?y??????%??p??5???D???o?|]2????HaT?'S?N?w2?h?????)?^i?{8 +7?A???u??FL??2??*?vLk?w?? ????6?y??????Z?D??k???e+?G?????z?WD[V?*lJI???t???a[???54$E}tS??'??D??.??MhM??N?.o.?"??_?D??Gb????f?.M??-? ??h2???)???????@?m??72?? ?[????#??l >e???Z?g??U??G????m????????k?E?[|?;V?}&??( ?=???g?^w???e??`a?????+>?]?????C?c?{?.T???,?"???TY +???h?U???O????t????"n?FA?S;?S??E@???????7Z?????^?P??????%(?7Ha?6!?r-D?? ?b?_*???N?(???,???"`G +??m????#??F8Z?n??\?Vkv?.??Y??Q?[]u?T?Rz4?)y??'???v?m?fj?D"?o?y????+?uo|??m?]??V??N????\?~aCuW?????"?"?9;??????? 7??`??z???P?????Uv?c??fU??s~???m???85??14? y??????x3/7????c???l?%<$ {?H?-rw/>e????RfO"*?0???]??#;E?w??&;??qG?IGCI?"nr????m?(F&o???-??z#,??D}/^.?f?%??Y???Q=???? =[Q??H??????????Q?? +?:Y?H??%q%?e?"???????!eZ??)Y'???^WEY3?A2?`?G????W-?$?%]W?;?[??????e???!,????gxv*??A?aZ???b?-)./??s?V????"P?@?6S??G???8?v,rG?:?D$?Y{;?=? + ????&lCd?q???|??i???????Xo??R??? ?u?m??]T?????????tf:??????=9!?ZeE?O?w +N??? ?????2j?8i?5.?1&XKMV?>bv%?_Y? +U?????y?Ey???9??k LU?Nwl??#0 +c?WB?X?|/[/? +,v??Y??9?S?z,_=Z?[A ???}@\??{N???\?3????L??!Bc\?%rI ?Z.n??????j?E??r?VJ? >BY?|???Zg|???!~????????c[\?Y_?;h???RPb\Sx???U??7?X???????[9?P1?|?Z'??????????\?j????p??g?A?$?|?J?????_?"?(P$u???E#?q????L?Q??|k??D?WI?2?? =??+^a? +??m?????p?$?? ~?????n1Zg??????7\???z???T???g???_d?!A:X??e?x?9???JAk-??????.A??d;xW?i5???+[?g??3??U??? +?J??Q? ?? +???)t??#?]?S|?Z?P??l +?????????@s???b??WwdEj??t5q??TP? {@???a?3?]?cN&U?Y\S?? ?? ???{???az?#?B?M? l???h=g?"?x???????mp??Q????t?????????ZKR,b?/w$?`? +??U??1^???!?%??L?fE?????e???\o???(Z???0?8fP?P??}q)?^7?4PZoY$??????g +??)??'???t???n????a?n^2Uv??$???%?!?q3?f%z??=?1 ?.OM??????N??T:3"+RL_;?Se?#?#;??y8??p??&]????Kca&Z?+3?? ?????????????kO3?h? ?`?X}90ivp???T?S????H??9 V?8?x?f?1??w ?xkV?????[V??F???B?Cs??l???n R $f?V;??'T?Z>?????l??~?{?e?????????? +???m[??????U6??g????????"??bs=l? K???????~?Xm_+P? +X?U?G}?P}?7??z?????????? +????l??Cb?? I?4????iP??0D???? ?d|d???I??~?~m???4kBH3&+?{???;????9??4?DU?|?Z???Q?h6?pW???[;?I?xa?;F*P?? +{?(??x?????Z-?g@????v?%G???uW??????q <????NK?j?2J,???B?%G{?`P'?V?K?]Tw`E????(??&?1?=???\?c?X5E??????K$6??H??:?3f r???5k???????9?'?Ek??'??bnb????????v?#?_C%'?D? ?q??W???a?????????M?p?T??n +????)????R`??f??ut????D{?? Wl??S????r !?????}|???????>"?l??,??>L(??????I?%??)????????????? +??????!?N2?,?z??B8%??:???;b{J????k?) x??+?5?e:o?a?w5a??Y???~???o?. s?0Q?&??J0^?J??Tr?|_?)M^?d?y?????7??$?J$?j??6?????{?Y????%??8j?? ??@AA] ??3 ?5?2????????V??^7???U????? ?v????M +s3-b#?C?CQa#?"???l?&,? ??1:O-5_o"?2 H???~?G??m?aO??"x>???.????????Er?t?w]!U???o???6?][???'?%nOx?X?t???V???"???b??BHK[????H8mr???/,?????Tq?M{I?Y?4N??y ?F?? ~?F?????a"?^?[H? U?H??????b$x?#???r???B?=?E_?a??|???\6>J + ?NL?????l???????? *v??/<;3???????pzq?;???DiN?WL????oc ????.G{Oh???}?V??v +?@???nMC??????T( ?N?T?cR?L???D?we??q?k??'??????`??lmF?????,F??yY????????A ???/ ?D??>????=2(?k?6???[?? +?????4?v|???6?1???k?B???u0enS?kY??,??\?????B???;H?n???|????X\?Q???l???WN?]?bgE?)?#?=?T?[8l?rA_D-??q+l:?tO?bkX"???x ?4U?? +y???] ??d?4??Y??0? ?k8??Q??"\?5w?])??p?o??%{?qA[????{Pt??S???WNs?G?????\???????_>?I??D ????N??? 0??E)??? +????1??6?]~????mfr??????a??N3lr???iY?OIN????FV-??K??:k?S???@?j?n?9?C??????d??Y??6???CE?j|?+9?a??t??Bu~???2?v?r\1??S53?0 ????D-?????^?d???Z2p??????=?G+F?,?6???y???$!??9??*DQGw??X?_????w?M???????B????5 ?V&?B???s?h{?g7G ??=??`??"(y~K?9t?|0N????\???)?q??c???H?3f??y?????? zN2??? +M??????xaYd?V??y0j ?x;p?!?????X?.+?y????????u???wm?U????'?:P??C(????5/k8.?q?!?.???$"*?E??V5??D??D-h?R???U?;?????Z+CV????A%?$???n[L? ap??o^C?@:?d-5?j?H?"}?G?=?,f?-Ua? ??}????R3???kE??\?f??">h?'??9*X(;????? ?ts?42l7f??7??Yb9?????????"YX??g@?2j?????l?[F??????F7?f??S[?4H??\??????;$4=a?}J???;??R????" +^?rp???\??G???B??????b?d??q?/?`??????| ??Y?F??q??ZG?Sq?q??9??{???)??C?? ?r!("?0??r?zfU???c?V?b1?d????z?G5kN? ???n???W???\?L? r??-EY^?i>y"?K[????6)ue?C?i?:????6??????-.?.???^e!G?????0??4mDr%:*YGz???Gj?????bm;M?s +x??*?,?V??XX?*??`S ???AJ"C9B?2?p%??A?E?4hA???F?h???? ??2???fU? +o????0?u?Dub??????}?I?B??^? +?5???\?:t?94?Q?M[?^?Q??;????]vI??s5??ajg/?H???K??W+??V??hf?????.?O+??????5v+?\???Os?W?s?u??F\?bax?l?P`????7???????./I??*wi5??-??mA?|?a??0???8?Q-/s?4:)?O????&-????D??w?4%=??+????R?Q?k??o??t?t???$?o2?B??PjH;p?/?GP??}????W at e}m????/?????[?o???a|guc7??????????L??????[??ZmdG' +\k????(~???LR?W+?v;/??F{g?Mi4 s?xar?r??X??&???^????E?0?mzf?;~??D?.L?R???W???W???wL??ql??e??N???(?>}RS?y??K???M??????%?J?\GN????K???????eB,?p?g????n?? ???g?????i?i?6?????+?????J???-???R5???6??????Gw8q??p/?r +V?\???'?????<7???????c>?e?L???w???9K?u6???OR???.??j????&n????[c?"????r??? +:??c?6#8 [+ IqtISA'?6k??O|??l"? ?+n>?a?B??h]Wk{??? }?~??B??8t??u???V????r6??????z??mfH???c??w"????,?J???V??'?? ??&??BF???r?r4?Y?V? +??????'??\$P??F??Q6*??^?gs?f!|??/???0?|????C????H?^?-o?D? ???S*??6???;D{W?CQfh??S7u????e??? +??rF?}Q????5W??? +5???YJ;RD?%?V???{?p??]???'??????G??????0N-?F?Q??|?mk$Z?HI???W|s>9?????;R56J?|?M???BZ?H???_!TUc?pG??mb@^?%??p"????w?(Gr ?Q???eGO???3?`?@?`Z??????N??+C8?? ???mW?&??+?dl?C? ?DX8?????^?? +:5??,?}(???S?????J"??f?X??3??Ky???0??'1???G????U?36?MJn0?+ ???McB,???>w9??3??^ ?????#????? ]6OM?45?????pWI*?*?(@1??X??[????T>??/8???4?NV?E???????=?g?g ??M?Z-Z?`%?"??????#??Z????????5??:??L9?ig?????]?F? +?'M?M??B?!/r??x??????Yb?????E???????l??)!v?m+[y??m?????7??A?D?L??????'??~? ??|bY?I{?1%\?TB??T5??O? +F?y?(c???:?y???Bb +???% b?j? b??L?H?????h????.?!??F??????7????B?_?gb?z?'A|?????YBAl1?q? t,|?\?? e?4??44???=\i??Z?p*{?n?5?w?? ???e?cP? ?d? +???ON?t?:? %?a`CZ?|???`(?D??<$???:.?D??P???s?1?;???c?Gz?!]??8??VL?_]y??2?Hg??X?2|9r??o????&???cfj????S??????????IO-???TK,h%Pk????{?L??Z?\$???xAO">?~??>???K4 g???U)?!L??&4?7????)??l0?w?J??t???;??3{?fB????ge???? +?sn> ?Yb?d +??5;Z.?+?V?w,?1??*r??-?!K[+???m?I?[?m?G?d????????|?2????k?I???????b?]3} ?1??$?!?E?????j?B?A?????d??M???1?R1??????6s/? ?;m{P +1??yz??2?k??????'?w???qZ???__?n???QZY@????OTD?hKo???w} ??:-?T?Qi6Mm???#?????"wa{M$?0ir?D?r???e??I~v:1t??)?\* ?"?>?? ???u?]g??o??????????G?r????_;?E$Q?;}?????7?#?$?.??c[f?#?*?! ?"?a?\xqJ>?7??Bp????8Jb???????&#?w`!??dS??????b????c??L?!?_???????w?^?/?? ??dJ??R6????>???v???t|??????????w06?(?x^??7?X]9???2???-???p???????M?"8??]D??U??Fa=e?T? +???M????Y?<"?!?????h???3?P+?w????c??i,v?.tk9k???U??Ap????J?=??@zzQ4?2ab??yx`T?/e?G?Q{c?>??s?3V??5?l???_?k?oA???C?d?&$????????!?b?\??? ?1? +X? &l8??*??+?Os??(????kFDC!W???f{???-a!???V?0??3? S ?Y??-???Q?3@??{?h,e|PM??T8???????K?~y?!?p:{l?B6???(> endobj +317 0 obj << +/Type /Encoding +/Differences [2/fi/fl 34/quotedbl 40/parenleft/parenright 44/comma/hyphen/period/slash/zero/one/two/three/four/five/six/seven/eight/nine 59/semicolon 65/A/B/C/D/E/F/G/H/I/J 77/M/N/O/P 83/S/T 87/W 91/bracketleft 93/bracketright 95/underscore 97/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/braceleft 125/braceright] +>> endobj +191 0 obj << +/Type /Font +/Subtype /Type1 +/BaseFont /TZLUSU+NimbusMonL-Regu +/FontDescriptor 324 0 R +/FirstChar 40 +/LastChar 125 +/Widths 318 0 R +/Encoding 317 0 R +>> endobj +141 0 obj << +/Type /Font +/Subtype /Type1 +/BaseFont /CRAVFF+NimbusSanL-Bold +/FontDescriptor 326 0 R +/FirstChar 46 +/LastChar 121 +/Widths 320 0 R +/Encoding 317 0 R +>> endobj +139 0 obj << +/Type /Font +/Subtype /Type1 +/BaseFont /ZMBSGR+NimbusSanL-Regu +/FontDescriptor 328 0 R +/FirstChar 34 +/LastChar 121 +/Widths 321 0 R +/Encoding 317 0 R +>> endobj +180 0 obj << +/Type /Font +/Subtype /Type1 +/BaseFont /DIXNGO+NimbusRomNo9L-Medi +/FontDescriptor 330 0 R +/FirstChar 49 +/LastChar 119 +/Widths 319 0 R +/Encoding 317 0 R +>> endobj +138 0 obj << +/Type /Font +/Subtype /Type1 +/BaseFont /PARFSI+NimbusRomNo9L-Regu +/FontDescriptor 332 0 R +/FirstChar 2 +/LastChar 122 +/Widths 322 0 R +/Encoding 317 0 R +>> endobj +142 0 obj << +/Type /Pages +/Count 6 +/Parent 333 0 R +/Kids [134 0 R 177 0 R 182 0 R 205 0 R 235 0 R 260 0 R] +>> endobj +303 0 obj << +/Type /Pages +/Count 2 +/Parent 333 0 R +/Kids [283 0 R 308 0 R] +>> endobj +333 0 obj << +/Type /Pages +/Count 8 +/Kids [142 0 R 303 0 R] +>> endobj +334 0 obj << +/Type /Outlines +/First 3 0 R +/Last 7 0 R +/Count 2 +>> endobj +131 0 obj << +/Title 132 0 R +/A 129 0 R +/Parent 111 0 R +/Prev 127 0 R +>> endobj +127 0 obj << +/Title 128 0 R +/A 125 0 R +/Parent 111 0 R +/Prev 123 0 R +/Next 131 0 R +>> endobj +123 0 obj << +/Title 124 0 R +/A 121 0 R +/Parent 111 0 R +/Prev 119 0 R +/Next 127 0 R +>> endobj +119 0 obj << +/Title 120 0 R +/A 117 0 R +/Parent 111 0 R +/Prev 115 0 R +/Next 123 0 R +>> endobj +115 0 obj << +/Title 116 0 R +/A 113 0 R +/Parent 111 0 R +/Next 119 0 R +>> endobj +111 0 obj << +/Title 112 0 R +/A 109 0 R +/Parent 7 0 R +/Prev 43 0 R +/First 115 0 R +/Last 131 0 R +/Count -5 +>> endobj +107 0 obj << +/Title 108 0 R +/A 105 0 R +/Parent 43 0 R +/Prev 103 0 R +>> endobj +103 0 obj << +/Title 104 0 R +/A 101 0 R +/Parent 43 0 R +/Prev 99 0 R +/Next 107 0 R +>> endobj +99 0 obj << +/Title 100 0 R +/A 97 0 R +/Parent 43 0 R +/Prev 95 0 R +/Next 103 0 R +>> endobj +95 0 obj << +/Title 96 0 R +/A 93 0 R +/Parent 43 0 R +/Prev 91 0 R +/Next 99 0 R +>> endobj +91 0 obj << +/Title 92 0 R +/A 89 0 R +/Parent 43 0 R +/Prev 87 0 R +/Next 95 0 R +>> endobj +87 0 obj << +/Title 88 0 R +/A 85 0 R +/Parent 43 0 R +/Prev 83 0 R +/Next 91 0 R +>> endobj +83 0 obj << +/Title 84 0 R +/A 81 0 R +/Parent 43 0 R +/Prev 79 0 R +/Next 87 0 R +>> endobj +79 0 obj << +/Title 80 0 R +/A 77 0 R +/Parent 43 0 R +/Prev 75 0 R +/Next 83 0 R +>> endobj +75 0 obj << +/Title 76 0 R +/A 73 0 R +/Parent 43 0 R +/Prev 71 0 R +/Next 79 0 R +>> endobj +71 0 obj << +/Title 72 0 R +/A 69 0 R +/Parent 43 0 R +/Prev 67 0 R +/Next 75 0 R +>> endobj +67 0 obj << +/Title 68 0 R +/A 65 0 R +/Parent 43 0 R +/Prev 63 0 R +/Next 71 0 R +>> endobj +63 0 obj << +/Title 64 0 R +/A 61 0 R +/Parent 43 0 R +/Prev 59 0 R +/Next 67 0 R +>> endobj +59 0 obj << +/Title 60 0 R +/A 57 0 R +/Parent 43 0 R +/Prev 55 0 R +/Next 63 0 R +>> endobj +55 0 obj << +/Title 56 0 R +/A 53 0 R +/Parent 43 0 R +/Prev 51 0 R +/Next 59 0 R +>> endobj +51 0 obj << +/Title 52 0 R +/A 49 0 R +/Parent 43 0 R +/Prev 47 0 R +/Next 55 0 R +>> endobj +47 0 obj << +/Title 48 0 R +/A 45 0 R +/Parent 43 0 R +/Next 51 0 R +>> endobj +43 0 obj << +/Title 44 0 R +/A 41 0 R +/Parent 7 0 R +/Prev 11 0 R +/Next 111 0 R +/First 47 0 R +/Last 107 0 R +/Count -16 +>> endobj +39 0 obj << +/Title 40 0 R +/A 37 0 R +/Parent 11 0 R +/Prev 35 0 R +>> endobj +35 0 obj << +/Title 36 0 R +/A 33 0 R +/Parent 11 0 R +/Prev 31 0 R +/Next 39 0 R +>> endobj +31 0 obj << +/Title 32 0 R +/A 29 0 R +/Parent 11 0 R +/Prev 27 0 R +/Next 35 0 R +>> endobj +27 0 obj << +/Title 28 0 R +/A 25 0 R +/Parent 11 0 R +/Prev 23 0 R +/Next 31 0 R +>> endobj +23 0 obj << +/Title 24 0 R +/A 21 0 R +/Parent 11 0 R +/Prev 19 0 R +/Next 27 0 R +>> endobj +19 0 obj << +/Title 20 0 R +/A 17 0 R +/Parent 11 0 R +/Prev 15 0 R +/Next 23 0 R +>> endobj +15 0 obj << +/Title 16 0 R +/A 13 0 R +/Parent 11 0 R +/Next 19 0 R +>> endobj +11 0 obj << +/Title 12 0 R +/A 9 0 R +/Parent 7 0 R +/Next 43 0 R +/First 15 0 R +/Last 39 0 R +/Count -7 +>> endobj +7 0 obj << +/Title 8 0 R +/A 5 0 R +/Parent 334 0 R +/Prev 3 0 R +/First 11 0 R +/Last 111 0 R +/Count -3 +>> endobj +3 0 obj << +/Title 4 0 R +/A 1 0 R +/Parent 334 0 R +/Next 7 0 R +>> endobj +335 0 obj << +/Names [(Doc-Start) 140 0 R (_app_procedures) 227 0 R (_backgound_list) 278 0 R (_backgroundstruct) 208 0 R (_batch_wrappers) 289 0 R (_create_status_table) 286 0 R] +/Limits [(Doc-Start) (_create_status_table)] +>> endobj +336 0 obj << +/Names [(_diffstruct) 217 0 R (_header) 192 0 R (_image) 188 0 R (_jpeg) 198 0 R (_madd) 228 0 R (_mbackground) 231 0 R] +/Limits [(_diffstruct) (_mbackground)] +>> endobj +337 0 obj << +/Names [(_mbackgroundbatch) 290 0 R (_mbgmodel) 238 0 R (_mconcatfit) 241 0 R (_mdiff) 244 0 R (_mdiffbatch) 294 0 R (_mdifffit) 247 0 R] +/Limits [(_mbackgroundbatch) (_mdifffit)] +>> endobj +338 0 obj << +/Names [(_mdifffitbatch) 298 0 R (_mfitbatch) 311 0 R (_mfitplane) 250 0 R (_mimgtbl) 253 0 R (_mjpeg) 263 0 R (_mmakehdr) 256 0 R] +/Limits [(_mdifffitbatch) (_mmakehdr)] +>> endobj +339 0 obj << +/Names [(_moverlaps) 266 0 R (_mproject) 269 0 R (_mprojectbatch) 314 0 R (_mprojectpp) 272 0 R (_mshrink) 275 0 R (_overview) 185 0 R] +/Limits [(_moverlaps) (_overview)] +>> endobj +340 0 obj << +/Names [(_status) 201 0 R (_swift_montage_api) 186 0 R (_table) 195 0 R (_types) 187 0 R (lstlisting.-1) 189 0 R (lstlisting.-10) 239 0 R] +/Limits [(_status) (lstlisting.-10)] +>> endobj +341 0 obj << +/Names [(lstlisting.-11) 242 0 R (lstlisting.-12) 245 0 R (lstlisting.-13) 248 0 R (lstlisting.-14) 251 0 R (lstlisting.-15) 254 0 R (lstlisting.-16) 257 0 R] +/Limits [(lstlisting.-11) (lstlisting.-16)] +>> endobj +342 0 obj << +/Names [(lstlisting.-17) 264 0 R (lstlisting.-18) 267 0 R (lstlisting.-19) 270 0 R (lstlisting.-2) 193 0 R (lstlisting.-20) 273 0 R (lstlisting.-21) 276 0 R] +/Limits [(lstlisting.-17) (lstlisting.-21)] +>> endobj +343 0 obj << +/Names [(lstlisting.-22) 279 0 R (lstlisting.-23) 287 0 R (lstlisting.-24) 291 0 R (lstlisting.-25) 295 0 R (lstlisting.-26) 299 0 R (lstlisting.-27) 312 0 R] +/Limits [(lstlisting.-22) (lstlisting.-27)] +>> endobj +344 0 obj << +/Names [(lstlisting.-28) 315 0 R (lstlisting.-3) 196 0 R (lstlisting.-4) 199 0 R (lstlisting.-5) 202 0 R (lstlisting.-6) 209 0 R (lstlisting.-7) 218 0 R] +/Limits [(lstlisting.-28) (lstlisting.-7)] +>> endobj +345 0 obj << +/Names [(lstlisting.-8) 229 0 R (lstlisting.-9) 232 0 R (lstnumber.-1.1) 190 0 R (lstnumber.-10.1) 240 0 R (lstnumber.-11.1) 243 0 R (lstnumber.-12.1) 246 0 R] +/Limits [(lstlisting.-8) (lstnumber.-12.1)] +>> endobj +346 0 obj << +/Names [(lstnumber.-13.1) 249 0 R (lstnumber.-14.1) 252 0 R (lstnumber.-15.1) 255 0 R (lstnumber.-16.1) 258 0 R (lstnumber.-17.1) 265 0 R (lstnumber.-18.1) 268 0 R] +/Limits [(lstnumber.-13.1) (lstnumber.-18.1)] +>> endobj +347 0 obj << +/Names [(lstnumber.-19.1) 271 0 R (lstnumber.-2.1) 194 0 R (lstnumber.-20.1) 274 0 R (lstnumber.-21.1) 277 0 R (lstnumber.-22.1) 280 0 R (lstnumber.-23.1) 288 0 R] +/Limits [(lstnumber.-19.1) (lstnumber.-23.1)] +>> endobj +348 0 obj << +/Names [(lstnumber.-24.1) 292 0 R (lstnumber.-24.2) 293 0 R (lstnumber.-25.1) 296 0 R (lstnumber.-25.2) 297 0 R (lstnumber.-26.1) 300 0 R (lstnumber.-26.2) 301 0 R] +/Limits [(lstnumber.-24.1) (lstnumber.-26.2)] +>> endobj +349 0 obj << +/Names [(lstnumber.-26.3) 302 0 R (lstnumber.-27.1) 313 0 R (lstnumber.-28.1) 316 0 R (lstnumber.-3.1) 197 0 R (lstnumber.-4.1) 200 0 R (lstnumber.-5.1) 203 0 R] +/Limits [(lstnumber.-26.3) (lstnumber.-5.1)] +>> endobj +350 0 obj << +/Names [(lstnumber.-6.1) 210 0 R (lstnumber.-6.2) 211 0 R (lstnumber.-6.3) 212 0 R (lstnumber.-6.4) 213 0 R (lstnumber.-6.5) 214 0 R (lstnumber.-6.6) 215 0 R] +/Limits [(lstnumber.-6.1) (lstnumber.-6.6)] +>> endobj +351 0 obj << +/Names [(lstnumber.-6.7) 216 0 R (lstnumber.-7.1) 219 0 R (lstnumber.-7.2) 220 0 R (lstnumber.-7.3) 221 0 R (lstnumber.-7.4) 222 0 R (lstnumber.-7.5) 223 0 R] +/Limits [(lstnumber.-6.7) (lstnumber.-7.5)] +>> endobj +352 0 obj << +/Names [(lstnumber.-7.6) 224 0 R (lstnumber.-7.7) 225 0 R (lstnumber.-7.8) 226 0 R (lstnumber.-8.1) 230 0 R (lstnumber.-9.1) 233 0 R (page.1) 184 0 R] +/Limits [(lstnumber.-7.6) (page.1)] +>> endobj +353 0 obj << +/Names [(page.2) 207 0 R (page.3) 237 0 R (page.4) 262 0 R (page.5) 285 0 R (page.6) 310 0 R (page.i) 137 0 R] +/Limits [(page.2) (page.i)] +>> endobj +354 0 obj << +/Names [(page.ii) 179 0 R (section.1) 2 0 R (section.2) 6 0 R (subsection.2.1) 10 0 R (subsection.2.2) 42 0 R (subsection.2.3) 110 0 R] +/Limits [(page.ii) (subsection.2.3)] +>> endobj +355 0 obj << +/Names [(subsubsection.2.1.1) 14 0 R (subsubsection.2.1.2) 18 0 R (subsubsection.2.1.3) 22 0 R (subsubsection.2.1.4) 26 0 R (subsubsection.2.1.5) 30 0 R (subsubsection.2.1.6) 34 0 R] +/Limits [(subsubsection.2.1.1) (subsubsection.2.1.6)] +>> endobj +356 0 obj << +/Names [(subsubsection.2.1.7) 38 0 R (subsubsection.2.2.1) 46 0 R (subsubsection.2.2.10) 82 0 R (subsubsection.2.2.11) 86 0 R (subsubsection.2.2.12) 90 0 R (subsubsection.2.2.13) 94 0 R] +/Limits [(subsubsection.2.1.7) (subsubsection.2.2.13)] +>> endobj +357 0 obj << +/Names [(subsubsection.2.2.14) 98 0 R (subsubsection.2.2.15) 102 0 R (subsubsection.2.2.16) 106 0 R (subsubsection.2.2.2) 50 0 R (subsubsection.2.2.3) 54 0 R (subsubsection.2.2.4) 58 0 R] +/Limits [(subsubsection.2.2.14) (subsubsection.2.2.4)] +>> endobj +358 0 obj << +/Names [(subsubsection.2.2.5) 62 0 R (subsubsection.2.2.6) 66 0 R (subsubsection.2.2.7) 70 0 R (subsubsection.2.2.8) 74 0 R (subsubsection.2.2.9) 78 0 R (subsubsection.2.3.1) 114 0 R] +/Limits [(subsubsection.2.2.5) (subsubsection.2.3.1)] +>> endobj +359 0 obj << +/Names [(subsubsection.2.3.2) 118 0 R (subsubsection.2.3.3) 122 0 R (subsubsection.2.3.4) 126 0 R (subsubsection.2.3.5) 130 0 R] +/Limits [(subsubsection.2.3.2) (subsubsection.2.3.5)] +>> endobj +360 0 obj << +/Kids [335 0 R 336 0 R 337 0 R 338 0 R 339 0 R 340 0 R] +/Limits [(Doc-Start) (lstlisting.-10)] +>> endobj +361 0 obj << +/Kids [341 0 R 342 0 R 343 0 R 344 0 R 345 0 R 346 0 R] +/Limits [(lstlisting.-11) (lstnumber.-18.1)] +>> endobj +362 0 obj << +/Kids [347 0 R 348 0 R 349 0 R 350 0 R 351 0 R 352 0 R] +/Limits [(lstnumber.-19.1) (page.1)] +>> endobj +363 0 obj << +/Kids [353 0 R 354 0 R 355 0 R 356 0 R 357 0 R 358 0 R] +/Limits [(page.2) (subsubsection.2.3.1)] +>> endobj +364 0 obj << +/Kids [359 0 R] +/Limits [(subsubsection.2.3.2) (subsubsection.2.3.5)] +>> endobj +365 0 obj << +/Kids [360 0 R 361 0 R 362 0 R 363 0 R 364 0 R] +/Limits [(Doc-Start) (subsubsection.2.3.5)] +>> endobj +366 0 obj << +/Dests 365 0 R +>> endobj +367 0 obj << +/Type /Catalog +/Pages 333 0 R +/Outlines 334 0 R +/Names 366 0 R +/PageMode/UseOutlines/PageLabels<>2<>]>> +/OpenAction 133 0 R +>> endobj +368 0 obj << +/Author()/Title(Swift Montage API)/Subject()/Creator(DBLaTeX-0.3)/Producer(pdfTeX-1.40.10)/Keywords() +/CreationDate (D:20110614204133-05'00') +/ModDate (D:20110614204133-05'00') +/Trapped /False +/PTEX.Fullbanner (This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0) +>> endobj +xref +0 369 +0000000000 65535 f +0000000015 00000 n +0000012366 00000 n +0000100075 00000 n +0000000060 00000 n +0000000086 00000 n +0000012486 00000 n +0000099966 00000 n +0000000131 00000 n +0000000166 00000 n +0000012605 00000 n +0000099857 00000 n +0000000216 00000 n +0000000240 00000 n +0000012725 00000 n +0000099783 00000 n +0000000296 00000 n +0000000320 00000 n +0000012967 00000 n +0000099696 00000 n +0000000376 00000 n +0000000401 00000 n +0000013210 00000 n +0000099609 00000 n +0000000457 00000 n +0000000481 00000 n +0000013452 00000 n +0000099522 00000 n +0000000537 00000 n +0000000560 00000 n +0000013695 00000 n +0000099435 00000 n +0000000616 00000 n +0000000641 00000 n +0000016332 00000 n +0000099348 00000 n +0000000697 00000 n +0000000732 00000 n +0000016940 00000 n +0000099274 00000 n +0000000788 00000 n +0000000817 00000 n +0000017609 00000 n +0000099148 00000 n +0000000868 00000 n +0000000901 00000 n +0000017730 00000 n +0000099074 00000 n +0000000957 00000 n +0000000980 00000 n +0000017970 00000 n +0000098987 00000 n +0000001036 00000 n +0000001066 00000 n +0000020757 00000 n +0000098900 00000 n +0000001122 00000 n +0000001149 00000 n +0000021000 00000 n +0000098813 00000 n +0000001205 00000 n +0000001234 00000 n +0000021243 00000 n +0000098726 00000 n +0000001290 00000 n +0000001314 00000 n +0000021486 00000 n +0000098639 00000 n +0000001370 00000 n +0000001397 00000 n +0000021729 00000 n +0000098552 00000 n +0000001453 00000 n +0000001481 00000 n +0000021971 00000 n +0000098465 00000 n +0000001537 00000 n +0000001563 00000 n +0000022214 00000 n +0000098378 00000 n +0000001619 00000 n +0000001646 00000 n +0000025050 00000 n +0000098291 00000 n +0000001703 00000 n +0000001727 00000 n +0000025293 00000 n +0000098204 00000 n +0000001784 00000 n +0000001812 00000 n +0000025534 00000 n +0000098117 00000 n +0000001869 00000 n +0000001896 00000 n +0000025777 00000 n +0000098030 00000 n +0000001953 00000 n +0000001982 00000 n +0000026019 00000 n +0000097941 00000 n +0000002039 00000 n +0000002066 00000 n +0000026262 00000 n +0000097850 00000 n +0000002124 00000 n +0000002161 00000 n +0000030202 00000 n +0000097772 00000 n +0000002219 00000 n +0000002264 00000 n +0000030446 00000 n +0000097657 00000 n +0000002316 00000 n +0000002350 00000 n +0000030568 00000 n +0000097578 00000 n +0000002407 00000 n +0000002443 00000 n +0000030872 00000 n +0000097485 00000 n +0000002500 00000 n +0000002530 00000 n +0000031177 00000 n +0000097392 00000 n +0000002587 00000 n +0000002620 00000 n +0000033752 00000 n +0000097299 00000 n +0000002677 00000 n +0000002706 00000 n +0000033996 00000 n +0000097220 00000 n +0000002763 00000 n +0000002796 00000 n +0000003146 00000 n +0000003388 00000 n +0000002849 00000 n +0000003265 00000 n +0000096703 00000 n +0000096358 00000 n +0000003327 00000 n +0000096187 00000 n +0000096876 00000 n +0000004865 00000 n +0000005015 00000 n +0000005166 00000 n +0000005321 00000 n +0000005482 00000 n +0000005642 00000 n +0000005803 00000 n +0000005964 00000 n +0000006124 00000 n +0000006285 00000 n +0000006446 00000 n +0000006602 00000 n +0000006763 00000 n +0000006924 00000 n +0000007084 00000 n +0000007245 00000 n +0000007406 00000 n +0000007567 00000 n +0000007728 00000 n +0000007888 00000 n +0000008049 00000 n +0000008211 00000 n +0000008373 00000 n +0000008535 00000 n +0000008697 00000 n +0000008859 00000 n +0000009021 00000 n +0000009183 00000 n +0000009339 00000 n +0000009500 00000 n +0000009660 00000 n +0000009821 00000 n +0000009982 00000 n +0000010205 00000 n +0000004470 00000 n +0000003486 00000 n +0000010143 00000 n +0000096529 00000 n +0000013938 00000 n +0000012185 00000 n +0000010316 00000 n +0000012304 00000 n +0000012425 00000 n +0000012545 00000 n +0000012664 00000 n +0000012784 00000 n +0000012845 00000 n +0000012906 00000 n +0000096016 00000 n +0000013027 00000 n +0000013088 00000 n +0000013149 00000 n +0000013270 00000 n +0000013330 00000 n +0000013391 00000 n +0000013512 00000 n +0000013573 00000 n +0000013634 00000 n +0000013755 00000 n +0000013816 00000 n +0000013877 00000 n +0000018213 00000 n +0000016151 00000 n +0000014049 00000 n +0000016270 00000 n +0000016392 00000 n +0000016453 00000 n +0000016514 00000 n +0000016575 00000 n +0000016636 00000 n +0000016696 00000 n +0000016757 00000 n +0000016818 00000 n +0000016879 00000 n +0000017000 00000 n +0000017061 00000 n +0000017122 00000 n +0000017183 00000 n +0000017244 00000 n +0000017305 00000 n +0000017366 00000 n +0000017427 00000 n +0000017487 00000 n +0000017548 00000 n +0000017669 00000 n +0000017788 00000 n +0000017849 00000 n +0000017909 00000 n +0000018030 00000 n +0000018091 00000 n +0000018152 00000 n +0000022457 00000 n +0000020576 00000 n +0000018324 00000 n +0000020695 00000 n +0000020817 00000 n +0000020878 00000 n +0000020939 00000 n +0000021060 00000 n +0000021121 00000 n +0000021182 00000 n +0000021303 00000 n +0000021364 00000 n +0000021425 00000 n +0000021546 00000 n +0000021607 00000 n +0000021668 00000 n +0000021789 00000 n +0000021850 00000 n +0000021911 00000 n +0000022031 00000 n +0000022092 00000 n +0000022153 00000 n +0000022274 00000 n +0000022335 00000 n +0000022396 00000 n +0000026506 00000 n +0000024869 00000 n +0000022568 00000 n +0000024988 00000 n +0000025110 00000 n +0000025171 00000 n +0000025232 00000 n +0000025353 00000 n +0000025413 00000 n +0000025473 00000 n +0000025594 00000 n +0000025655 00000 n +0000025716 00000 n +0000025836 00000 n +0000025897 00000 n +0000025958 00000 n +0000026079 00000 n +0000026140 00000 n +0000026201 00000 n +0000026323 00000 n +0000026384 00000 n +0000026445 00000 n +0000028997 00000 n +0000031542 00000 n +0000028878 00000 n +0000026617 00000 n +0000030140 00000 n +0000030263 00000 n +0000030324 00000 n +0000030385 00000 n +0000030507 00000 n +0000030629 00000 n +0000030690 00000 n +0000030751 00000 n +0000030811 00000 n +0000030933 00000 n +0000030994 00000 n +0000031055 00000 n +0000031116 00000 n +0000031238 00000 n +0000031299 00000 n +0000031360 00000 n +0000031421 00000 n +0000031482 00000 n +0000096993 00000 n +0000029900 00000 n +0000030035 00000 n +0000030084 00000 n +0000034239 00000 n +0000033571 00000 n +0000031681 00000 n +0000033690 00000 n +0000033813 00000 n +0000033874 00000 n +0000033935 00000 n +0000034057 00000 n +0000034117 00000 n +0000034178 00000 n +0000095655 00000 n +0000034378 00000 n +0000034741 00000 n +0000035045 00000 n +0000035368 00000 n +0000035740 00000 n +0000036215 00000 n +0000050071 00000 n +0000050475 00000 n +0000061588 00000 n +0000061965 00000 n +0000069837 00000 n +0000070221 00000 n +0000078906 00000 n +0000079180 00000 n +0000095253 00000 n +0000097078 00000 n +0000097147 00000 n +0000100146 00000 n +0000100380 00000 n +0000100563 00000 n +0000100766 00000 n +0000100960 00000 n +0000101154 00000 n +0000101353 00000 n +0000101579 00000 n +0000101804 00000 n +0000102030 00000 n +0000102250 00000 n +0000102477 00000 n +0000102711 00000 n +0000102944 00000 n +0000103178 00000 n +0000103408 00000 n +0000103634 00000 n +0000103860 00000 n +0000104070 00000 n +0000104232 00000 n +0000104428 00000 n +0000104688 00000 n +0000104953 00000 n +0000105219 00000 n +0000105480 00000 n +0000105686 00000 n +0000105804 00000 n +0000105928 00000 n +0000106044 00000 n +0000106164 00000 n +0000106257 00000 n +0000106372 00000 n +0000106410 00000 n +0000106578 00000 n +trailer +<< /Size 369 +/Root 367 0 R +/Info 368 0 R +/ID [<57EE3A74C467C6A64C657804FD027B5E> <57EE3A74C467C6A64C657804FD027B5E>] >> +startxref +106898 +%%EOF Modified: SwiftApps/Montage/docs/API.txt =================================================================== --- SwiftApps/Montage/docs/API.txt 2011-06-15 01:00:37 UTC (rev 4616) +++ SwiftApps/Montage/docs/API.txt 2011-06-15 01:47:31 UTC (rev 4617) @@ -1,6 +1,12 @@ Swift Montage API ================= +:toc: +:icons: +:numbered: +Overview +-------- + This is the API for the Swift Montage wrappers. Montage is a toolkit for generating science grade astronomical mosaics. The image file format for Montage is Flexible Image Transport System or FITS. @@ -13,7 +19,6 @@ NOTE: Both the Montage binaries as well as the Swift binaries must be included in your PATH environment variable for the wrappers to function properly. -[[X1]] Swift Montage API ----------------- @@ -23,21 +28,24 @@ These are all the Types that are declared for Swift. They are located in the file Swift_Montage_types.swift. -.Image +Image +^^^^^ ---- type Image; ---- This is the Image type. It is used to declare the raw images, projected images, difference images, rectified images, and the mosaic. -.MosaicData +Header +^^^^^^ ---- -type MosaicData; +type Header; ---- -This is the MosaicData type. It is used to declare and map to the FITS header +This is the Header type. It is used to declare and map to the FITS header file. -.Table +Table +^^^^^ ---- type Table; ---- @@ -45,13 +53,15 @@ metadata is generated. These are tables that the Montage functions use to read for the next stage of the workflow. -.JPEG +JPEG +^^^^ ---- type JPEG ---- This is the JPEG type. This is used to map to the jpeg version of the mosaic. -.Status +Status +^^^^^^ ---- type Status; ---- @@ -59,7 +69,8 @@ file are generated that have the information about the coefficients that will be used to rectify the image. -.BackgroundStruct +BackgroundStruct +^^^^^^^^^^^^^^^^ ---- type BackgroundStruct { @@ -73,7 +84,8 @@ three coefficients to rectify this portion of the mosaic of all floating point types. -.DiffStruct +DiffStruct +^^^^^^^^^^ ---- type DiffStruct { @@ -96,9 +108,10 @@ NOTE: Currently the options to the Montage functions are hard coded and the user cannot choose which options to run. -.mAdd +mAdd +^^^^ ---- -app ( Image mos ) mAdd( Image imgs[], Table img_tbl, MosaicData hdr ) +app ( Image mos ) mAdd( Image imgs[], Table img_tbl, Header hdr ) ---- This app procedure will call the mAdd fucntion from the Montage toolkit. This procedure takes @@ -107,7 +120,8 @@ a single FITS file that represents the mosaic. All the images that will be part of this mosaic must reside in the same directory. -.mBackground +mBackground +^^^^^^^^^^^ ---- app ( Image bg_img ) mBackground( Image img, float a, float b, float c ) ---- @@ -116,7 +130,8 @@ three coefficients. The procedure then output the background rectified image after the coefficients have been applied. -.mBgModel +mBgModel +^^^^^^^^ ---- app ( Table rect_tbl ) mBgModel( Table img_tbl, Table fits_tbl ) ---- @@ -126,7 +141,8 @@ fit them together. The procedure will then output a rectification table of the coefficients that must be applied to the images. -.mConcatFit +mConcatFit +^^^^^^^^^^ ---- app ( Table fits_tbl ) mConcatFit( Table status_tbl, Status stats[] ) ---- @@ -136,23 +152,26 @@ input. The procedure will then output a table of all the status files together. The status files must all reside in the same directory. -.mDiff +mDiff +^^^^^ ---- -app ( Image diff_img ) mDiff( Image proj_img_1, Image proj_img_2, MosaicData hdr ) +app ( Image diff_img ) mDiff( Image proj_img_1, Image proj_img_2, Header hdr ) ---- This app procedure will call the mDiff function from the Montage toolkit. This procedure takes in two images and the FITS header file for the mosaic. The procedure will then output a difference image representing the information of where the two images overlap. -.mDiffFit +mDiffFit +^^^^^^^^ ---- -app ( Image diff_img, Status stat ) mDiffFit( Image img_1, Image img_2, MosaicData hdr ) +app ( Image diff_img, Status stat ) mDiffFit( Image img_1, Image img_2, Header hdr ) ---- This app procedure will call the mDiffFit function from the Montage toolkit. The mDiffFit function in Montage is the combination of the mDiff and mFitplane functions. -.mFitplane +mFitplane +^^^^^^^^^ ---- app ( Status stat ) mFitplane( Image diff_img ) ---- @@ -161,7 +180,8 @@ the mDiff procedure. The procedure will then output a status file that contains the information on how to fit these two images together. -.mImgtbl +mImgtbl +^^^^^^^ ---- app ( Table img_tbl ) mImgtbl( Image imgs[] ) ---- @@ -170,16 +190,18 @@ from. The output is an image table that represents these images. All the images that will be part of this table must reside in the same directory. -.mMakeHdr +mMakeHdr +^^^^^^^^ ---- -app ( MosaicData hdr ) mMakeHdr( Table img_tbl ) +app ( Header hdr ) mMakeHdr( Table img_tbl ) ---- This app procedure will call the mMakeHdr function from the Montage toolkit. This procedure will take in as input an image table representing the images that will be combined into a single mosaic. The procedure will then output the FITS header file for the mosaic. -.mJPEG +mJPEG +^^^^^ ---- app ( JPEG mos_img_jpg ) mJPEG( Image mos_img ) ---- @@ -187,7 +209,8 @@ procedure will take in as input as input a FITS image. The procedure will then ouput the same image in jpeg format. -.mOverlaps +mOverlaps +^^^^^^^^^ ---- app ( Table diff_tbl ) mOverlaps( Table img_tbl ) ---- @@ -196,10 +219,23 @@ will be combined into a single mosaic. The procedure will then output a table of all the images that overlap with each other in the mosaic. -.mProjectPP +mProject +^^^^^^^^ ---- -app ( Image proj_img ) mProjectPP( Image raw_img, MosaicData hdr ) +app ( Image proj_img ) mProject( Image raw_img, Header hdr ) ---- +This app procedure will call the mProject function from the Montage +toolkit. This procedure takes in as input a FITS image file and the FITS header file +that for the mosaic. The output is the projected image. + +NOTE: The mProject app procedure is for general projection. There are some cases in +which the faster mProjectPP procedure should be used. + +mProjectPP +^^^^^^^^^^ +---- +app ( Image proj_img ) mProjectPP( Image raw_img, Header hdr ) +---- This app procedure will call the mProjectPP function from the Montage toolkit. This procedure takes in as input a FITS image file and the FITS header file that for the mosaic. The output is the projected image. @@ -209,18 +245,9 @@ projections (e.g. TAN, SIN) or where they can be approximated with acceptable error. -.mProject ----- -app ( Image proj_img ) mProject( Image raw_img, MosaicData hdr ) ----- -This app procedure will call the mProject function from the Montage -toolkit. This procedure takes in as input a FITS image file and the FITS header file -that for the mosaic. The output is the projected image. -NOTE: The mProject app procedure is for general projection. There are some cases in -which the faster mProjectPP procedure should be used. - -.mShrink +mShrink +^^^^^^^ ---- app ( Image shrunk ) mShrink( Image original, int factor ) ---- @@ -228,7 +255,8 @@ procedure takes in as input a single image and an re-sizing factor represented as an integer. The procedure will then output the re-sized image. -.Backgound_list +Backgound_list +^^^^^^^^^^^^^^ ---- app ( Table back_tbl ) Background_list( Table imgs_tbl, Table rect_tbl ) ---- @@ -239,7 +267,8 @@ format that can be read in by the Swift readData2 function into the Background_struct declared type. -.create_status_table +create_status_table +^^^^^^^^^^^^^^^^^^^ ---- app ( Table stat_tbl ) create_status_table( Table diff_tbl ) ---- @@ -255,9 +284,11 @@ and is where the parallelization is taking place. They are located in the file Swift_Montage_Batch.swift -.mBackgroundBatch +mBackgroundBatch +^^^^^^^^^^^^^^^^ ---- -( Image rect_imgs[] ) mBackgroundBatch( string dest_dir, Image proj_imgs[], Table img_tbl, Table rect_tbl ) +( Image rect_imgs[] ) mBackgroundBatch( string dest, Image imgs[], Table img_tbl, + Table rect_tbl ) ---- This batch swift script takes in as input a destination directory for the rectified images, a list of images that will be combined into a @@ -268,9 +299,11 @@ NOTE: mBackgroundBatch calls the mBackground app procedure. -.mDiffBatch +mDiffBatch +^^^^^^^^^^ ---- -( Image diff_imgs[] ) mDiffBatch( string src_dir, string dest_dir, string files[], Table diff_tbl, MosaicData hdr ) +( Image diff_imgs[] ) mDiffBatch( string src, string dest, string filenames[], + Table diff_tbl, Header hdr ) ---- This batch script takes in as input a source directory of where the images to calculate overlaps are located, a destination directory of where to store these @@ -284,10 +317,12 @@ NOTE: mDiffBatch calls the mDiff app procedure. -.mDiffFitBatch +mDiffFitBatch +^^^^^^^^^^^^^ ---- -( Image diff_imgs[], Table fits_tbl ) mDiffFitBatch( string src_dir, string dest_dir, string stat_dir, - string files[], Table diff_tbl, MosaicData hdr ) +( Image diff_imgs[], Table fits_tbl ) mDiffFitBatch( string src, string dest, string stat, + string filenames[], + Table diff_tbl, Header hdr ) ---- This batch script takes in as input a source directory of where the images to calculate overlaps are located, a destination directory of where to store @@ -303,9 +338,10 @@ NOTE: mDiffFitBatch calls the mDiffFit app procedure. -.mFitBatch +mFitBatch +^^^^^^^^^ ---- -( Table fits_tbl ) mFitBatch( string stat_dir, Image diff_imgs[], Table diff_tbl ) +( Table fits_tbl ) mFitBatch( string stat, Image diff_imgs[], Table diff_tbl ) ---- This batch script takes in as input a directory for which the status files will be put in, the list of difference images that has @@ -315,9 +351,10 @@ NOTE: mFitBatch calls the mFitplane app procedure. -.mProjectBatch +mProjectBatch +^^^^^^^^^^^^^ ---- -( Image proj_imgs[] ) mProjectBatch( string dest_dir, Image raw_imgs[], MosaicData hdr ) +( Image proj_imgs[] ) mProjectBatch( string dest, Image raw_imgs[], Header hdr ) ---- This batch script takes in as input the destination directory for the projected images, a list of raw image files and the FITS header file @@ -325,5 +362,5 @@ if it is possible to use the fast image projetion algorithm or to just use standard projection. -NOTE: mProjectBatch calls the faster mProjectPP app procedure if the image allows -it. If mProjectPP cannot be used then the app procedure mProject is called. +WARNING: mProjectBatch currently only calls the general mProject app +procedure. It does not check to see if the faster projection mProjectPP can be used. Modified: SwiftApps/Montage/docs/updateAPI.sh =================================================================== --- SwiftApps/Montage/docs/updateAPI.sh 2011-06-15 01:00:37 UTC (rev 4616) +++ SwiftApps/Montage/docs/updateAPI.sh 2011-06-15 01:47:31 UTC (rev 4617) @@ -1,2 +1,5 @@ #!/bin/bash -asciidoc -a toc -a max-width=1100px -a icons API.txt +echo "Generating Swift_Montage API html file" +asciidoc -a toc -a toclevels=3 -a numbered -a max-width=750px -a icons API.txt +echo "Generating Swift_Montage API pdf file" +a2x --format=pdf --icons --no-xmllint --dblatex-opts "-P doc.publisher.show=0 -P latex.output.revhistory=0" API.txt From jonmon at ci.uchicago.edu Mon Jun 20 09:56:51 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Mon, 20 Jun 2011 14:56:51 -0000 Subject: [Swift-commit] r4634 - SwiftApps/Montage/docs Message-ID: <20110620145613.C5C879CFF1@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-20 09:56:13 -0500 (Mon, 20 Jun 2011) New Revision: 4634 Added: SwiftApps/Montage/docs/SwiftMontageAPI.html SwiftApps/Montage/docs/SwiftMontageAPI.pdf SwiftApps/Montage/docs/SwiftMontageAPI.txt Removed: SwiftApps/Montage/docs/API.html SwiftApps/Montage/docs/API.pdf SwiftApps/Montage/docs/API.txt Modified: SwiftApps/Montage/docs/updateAPI.sh Log: o renamed API.* to SwiftMontageAPI.* o Minor edits Deleted: SwiftApps/Montage/docs/API.html =================================================================== --- SwiftApps/Montage/docs/API.html 2011-06-20 14:44:45 UTC (rev 4633) +++ SwiftApps/Montage/docs/API.html 2011-06-20 14:56:13 UTC (rev 4634) @@ -1,1185 +0,0 @@ - - - - - -Swift Montage API - - - - - -
    -
    -

    1. Overview

    -
    -

    This is the API for the Swift Montage wrappers. Montage is a toolkit for -generating science grade astronomical mosaics. The image file format for -Montage is Flexible Image Transport System or FITS.

    -

    Swift is a dataflow parallel scripting language. The language allows the user -to parallelize a workflow that has been represented as a swiftscript. Swift -implements the site execution model to allow for efficient use of available -resources for the user’s application.

    -
    - - - -
    -Note -Both the Montage binaries as well as the Swift binaries must be included -in your PATH environment variable for the wrappers to function properly.
    -
    -
    -
    -
    -

    2. Swift Montage API

    -
    -
    -

    2.1. Types

    -

    These are all the Types that are declared for Swift. They are located in the -file Swift_Montage_types.swift.

    -
    -

    2.1.1. Image

    -
    -
    -
    type Image;
    -
    -

    This is the Image type. It is used to declare the raw images, projected -images, difference images, rectified images, and the mosaic.

    -
    -
    -

    2.1.2. Header

    -
    -
    -
    type Header;
    -
    -

    This is the Header type. It is used to declare and map to the FITS header -file.

    -
    -
    -

    2.1.3. Table

    -
    -
    -
    type Table;
    -
    -

    This is the Table type. During the execution of the workflow several files of -metadata is generated. These are tables that the Montage functions use to read -for the next stage of the workflow.

    -
    -
    -

    2.1.4. JPEG

    -
    -
    -
    type JPEG
    -
    -

    This is the JPEG type. This is used to map to the jpeg version of the mosaic.

    -
    -
    -

    2.1.5. Status

    -
    -
    -
    type Status;
    -
    -

    This is the status type. During the difference stage of the workflow status -file are generated that have the information about the coefficients that will -be used to rectify the image.

    -
    -
    -

    2.1.6. BackgroundStruct

    -
    -
    -
    type BackgroundStruct
    -{
    -    string fname;
    -    float a;
    -    float b;
    -    float c;
    -};
    -
    -

    This is a struct type. The entries are a string for the name of the image and -three coefficients to rectify this portion of the mosaic of all floating point -types.

    -
    -
    -

    2.1.7. DiffStruct

    -
    -
    -
    type DiffStruct
    -{
    -    int cntr1;
    -    int cntr2;
    -    Image plus;
    -    Image minus;
    -    Image diff;
    -};
    -
    -

    This is a struct type. The entries are two control integers that make this -entry unique, the two images that overlapped which are name plus and minus, -and the name of the difference image that they produced.

    -
    -
    -
    -

    2.2. App Procedures

    -

    These are all the app procedures for Swift Montage. They are located in the -file Swift_Montage_Apps.swift

    -
    - - - -
    -Note -Currently the options to the Montage functions are hard coded and the -user cannot choose which options to run.
    -
    -
    -

    2.2.1. mAdd

    -
    -
    -
    app ( Image mos ) mAdd( Image imgs[], Table img_tbl, Header hdr )
    -
    -

    This app procedure will call the mAdd fucntion from the Montage toolkit. This -procedure takes -in a list of images to be added together, the img_tbl for these images, and -the FITS header file for the mosaic being created. The procedure then outputs -a single FITS file that represents the mosaic. All the images that will be -part of this mosaic must reside in the same directory.

    -
    -
    -

    2.2.2. mBackground

    -
    -
    -
    app ( Image bg_img ) mBackground( Image img, float a, float b, float c )
    -
    -

    This app procedure will call the mBackground function from the Montage -toolkit. This procedure takes in a single image along with the -three coefficients. The procedure then output the background rectified image -after the coefficients have been applied.

    -
    -
    -

    2.2.3. mBgModel

    -
    -
    -
    app ( Table rect_tbl ) mBgModel( Table img_tbl, Table fits_tbl )
    -
    -

    This app procedure will call the mBgModel function from the Montage -toolkit. This procedure takes in an image table that represents the list of images that -will be added into a mosaic and a table of the information that is required to -fit them together. The procedure will then output a rectification table of the -coefficients that must be applied to the images.

    -
    -
    -

    2.2.4. mConcatFit

    -
    -
    -
    app ( Table fits_tbl ) mConcatFit( Table status_tbl, Status stats[] )
    -
    -

    This app procedure will call the mConcatFit function from the Montage -toolkit. This procedure takes in a table representing the status files that were generated -from either mFitplane or mDiffFit and a list of these status files as -input. The procedure will then output a table of all the status files -together. The status files must all reside in the same directory.

    -
    -
    -

    2.2.5. mDiff

    -
    -
    -
    app ( Image diff_img ) mDiff( Image proj_img_1, Image proj_img_2, Header hdr )
    -
    -

    This app procedure will call the mDiff function from the Montage toolkit. This -procedure takes in two images and the FITS header file for the mosaic. The procedure will then output a -difference image representing the information of where the two images overlap.

    -
    -
    -

    2.2.6. mDiffFit

    -
    -
    -
    app ( Image diff_img, Status stat ) mDiffFit( Image img_1, Image img_2, Header hdr )
    -
    -

    This app procedure will call the mDiffFit function from the Montage -toolkit. The mDiffFit function in Montage is the combination of the mDiff and -mFitplane functions.

    -
    -
    -

    2.2.7. mFitplane

    -
    -
    -
    app ( Status stat ) mFitplane( Image diff_img )
    -
    -

    This app procedure will call the mFitplane function from the Montage -toolkit. This procedure takes in as input the difference image that was the output from -the mDiff procedure. The procedure will then output a status file that -contains the information on how to fit these two images together.

    -
    -
    -

    2.2.8. mImgtbl

    -
    -
    -
    app ( Table img_tbl ) mImgtbl( Image imgs[] )
    -
    -

    This app procedure will call the mImgtbl function from the Montage -toolkit. This procedure takes in as input a list of images to create a table -from. The output is an image table that represents these images. All the -images that will be part of this table must reside in the same directory.

    -
    -
    -

    2.2.9. mMakeHdr

    -
    -
    -
    app ( Header hdr ) mMakeHdr( Table img_tbl )
    -
    -

    This app procedure will call the mMakeHdr function from the Montage -toolkit. This procedure will take in as input an image table representing the -images that will be combined into a single mosaic. The procedure will then output the -FITS header file for the mosaic.

    -
    -
    -

    2.2.10. mJPEG

    -
    -
    -
    app ( JPEG mos_img_jpg ) mJPEG( Image mos_img )
    -
    -

    This app procedure will call the mJPEG function from the Montage toolkit. This -procedure will take in as input as input a FITS image. The procedure will -then ouput the same image in jpeg format.

    -
    -
    -

    2.2.11. mOverlaps

    -
    -
    -
    app ( Table diff_tbl ) mOverlaps( Table img_tbl )
    -
    -

    This app procedure will call the mOverlaps function from the Montage -toolkit. This procedure takes in as input an image table of the images that -will be combined into a single mosaic. The procedure will then output a table -of all the images that overlap with each other in the mosaic.

    -
    -
    -

    2.2.12. mProject

    -
    -
    -
    app ( Image proj_img ) mProject( Image raw_img, Header hdr )
    -
    -

    This app procedure will call the mProject function from the Montage -toolkit. This procedure takes in as input a FITS image file and the FITS header file -that for the mosaic. The output is the projected image.

    -
    - - - -
    -Note -The mProject app procedure is for general projection. There are some cases in -which the faster mProjectPP procedure should be used.
    -
    -
    -
    -

    2.2.13. mProjectPP

    -
    -
    -
    app ( Image proj_img ) mProjectPP( Image raw_img, Header hdr )
    -
    -

    This app procedure will call the mProjectPP function from the Montage -toolkit. This procedure takes in as input a FITS image file and the FITS header file -that for the mosaic. The output is the projected image.

    -
    - - - -
    -Note -The mProjectPP app procedure is a "special case" version of mProject -and can be used only where the input and output images have tangent-plane -projections (e.g. TAN, SIN) or where they can be approximated with acceptable -error.
    -
    -
    -
    -

    2.2.14. mShrink

    -
    -
    -
    app ( Image shrunk ) mShrink( Image original, int factor )
    -
    -

    This app procedure will call the mShrink function in the Montage toolkit. This -procedure takes in as input a single image and an re-sizing factor represented -as an integer. The procedure will then output the re-sized image.

    -
    -
    -

    2.2.15. Backgound_list

    -
    -
    -
    app ( Table back_tbl ) Background_list( Table imgs_tbl, Table rect_tbl )
    -
    -

    This app procedure will call the Background_list python script that is included in -the scripts directory for the Swift Montage wrappers. This procedure takes in as input an image table of the -images that are being combined into a single mosaic and the table of -coefficients to rectify the mosaic. The procedure will then output a file in a -format that can be read in by the Swift readData2 function into the -Background_struct declared type.

    -
    -
    -

    2.2.16. create_status_table

    -
    -
    -
    app ( Table stat_tbl ) create_status_table( Table diff_tbl )
    -
    -

    This app procedure will call the create_status_table python script that is -included in the scripts directory for the Swift Montage wrappers. This -procedure takes in as input the difference table that has been generated by -the mOverlaps procedure. The procedure will the output a table that can be -used as input to the mConcatFit app procedure.

    -
    -
    -
    -

    2.3. Batch Wrappers

    -

    These are the Batch scripts. These scripts do most of the file mapping -and is where the parallelization is taking place. They are located in the file -Swift_Montage_Batch.swift

    -
    -

    2.3.1. mBackgroundBatch

    -
    -
    -
    ( Image rect_imgs[] ) mBackgroundBatch( string dest, Image imgs[], Table img_tbl,
    -                                        Table rect_tbl )
    -
    -

    This batch swift script takes in as input a destination directory for the -rectified images, a list of images that will be combined into a -mosaic, an image table representing the images for the mosaic, and a table of -the coefficients that must be applied to each image. The script will then -output a list of the images after the coefficients have been applied. The -application of the coefficients to each image is done in parallel.

    -
    - - - -
    -Note -mBackgroundBatch calls the mBackground app procedure.
    -
    -
    -
    -

    2.3.2. mDiffBatch

    -
    -
    -
    ( Image diff_imgs[] ) mDiffBatch( string src, string dest, string filenames[],
    -                                  Table diff_tbl, Header hdr )
    -
    -

    This batch script takes in as input a source directory of where the images to calculate -overlaps are located, a destination directory of where to store these -difference images, a list of the file names for the images that will be -combined into the mosaic, a difference table that contains which images overlap with -each other, and the FITS header file for the mosaic. This script will then -output the difference images. The calculation each difference image are -done in parallel.

    -
    - - - -
    -Warning -The images that are in the source directory must be projected images.
    -
    -
    - - - -
    -Note -mDiffBatch calls the mDiff app procedure.
    -
    -
    -
    -

    2.3.3. mDiffFitBatch

    -
    -
    -
    ( Image diff_imgs[], Table fits_tbl ) mDiffFitBatch( string src, string dest, string stat,
    -                                                     string filenames[],
    -                                                     Table diff_tbl, Header hdr )
    -
    -

    This batch script takes in as input a source directory of where the images to -calculate overlaps are located, a destination directory of where to store -these difference images, a status directory of where to store the status files -for each image, a list of the file names for the images that will be -combined into the mosaic, a difference table that contains which images overlap -with each other and the FITS header file for the mosaic. This script will then -output a list of difference images and a table of information on how to fit -the images together. The calculation of each difference image and the fitting -table is done in parallel.

    -
    - - - -
    -Warning -The images that are in the source directory must be projected images.
    -
    -
    - - - -
    -Note -mDiffFitBatch calls the mDiffFit app procedure.
    -
    -
    -
    -

    2.3.4. mFitBatch

    -
    -
    -
    ( Table fits_tbl ) mFitBatch( string stat, Image diff_imgs[], Table diff_tbl )
    -
    -

    This batch script takes in as input a directory for which the status files -will be put in, the list of difference images that has -been generated and the table that contains which images overlap with each -other. The script then generates a table containing describing how to fit the -two overalpping images together.

    -
    - - - -
    -Note -mFitBatch calls the mFitplane app procedure.
    -
    -
    -
    -

    2.3.5. mProjectBatch

    -
    -
    -
    ( Image proj_imgs[] ) mProjectBatch( string dest, Image raw_imgs[], Header hdr )
    -
    -

    This batch script takes in as input the destination directory for the -projected images, a list of raw image files and the FITS header file -and projects each image. When projecting each image the function will decide -if it is possible to use the fast image projetion algorithm or to just use -standard projection.

    -
    - - - -
    -Warning -mProjectBatch currently only calls the general mProject app -procedure. It does not check to see if the faster projection mProjectPP can be used.
    -
    -
    -
    -
    -
    -
    -

    - - - Deleted: SwiftApps/Montage/docs/API.pdf =================================================================== --- SwiftApps/Montage/docs/API.pdf 2011-06-20 14:44:45 UTC (rev 4633) +++ SwiftApps/Montage/docs/API.pdf 2011-06-20 14:56:13 UTC (rev 4634) @@ -1,2575 +0,0 @@ -%PDF-1.4 -%???? -1 0 obj -<< /S /GoTo /D (section.1) >> -endobj -4 0 obj -(Overview) -endobj -5 0 obj -<< /S /GoTo /D (section.2) >> -endobj -8 0 obj -(Swift Montage API) -endobj -9 0 obj -<< /S /GoTo /D (subsection.2.1) >> -endobj -12 0 obj -(Types) -endobj -13 0 obj -<< /S /GoTo /D (subsubsection.2.1.1) >> -endobj -16 0 obj -(Image) -endobj -17 0 obj -<< /S /GoTo /D (subsubsection.2.1.2) >> -endobj -20 0 obj -(Header) -endobj -21 0 obj -<< /S /GoTo /D (subsubsection.2.1.3) >> -endobj -24 0 obj -(Table) -endobj -25 0 obj -<< /S /GoTo /D (subsubsection.2.1.4) >> -endobj -28 0 obj -(JPEG) -endobj -29 0 obj -<< /S /GoTo /D (subsubsection.2.1.5) >> -endobj -32 0 obj -(Status) -endobj -33 0 obj -<< /S /GoTo /D (subsubsection.2.1.6) >> -endobj -36 0 obj -(BackgroundStruct) -endobj -37 0 obj -<< /S /GoTo /D (subsubsection.2.1.7) >> -endobj -40 0 obj -(DiffStruct) -endobj -41 0 obj -<< /S /GoTo /D (subsection.2.2) >> -endobj -44 0 obj -(App Procedures) -endobj -45 0 obj -<< /S /GoTo /D (subsubsection.2.2.1) >> -endobj -48 0 obj -(mAdd) -endobj -49 0 obj -<< /S /GoTo /D (subsubsection.2.2.2) >> -endobj -52 0 obj -(mBackground) -endobj -53 0 obj -<< /S /GoTo /D (subsubsection.2.2.3) >> -endobj -56 0 obj -(mBgModel) -endobj -57 0 obj -<< /S /GoTo /D (subsubsection.2.2.4) >> -endobj -60 0 obj -(mConcatFit) -endobj -61 0 obj -<< /S /GoTo /D (subsubsection.2.2.5) >> -endobj -64 0 obj -(mDiff) -endobj -65 0 obj -<< /S /GoTo /D (subsubsection.2.2.6) >> -endobj -68 0 obj -(mDiffFit) -endobj -69 0 obj -<< /S /GoTo /D (subsubsection.2.2.7) >> -endobj -72 0 obj -(mFitplane) -endobj -73 0 obj -<< /S /GoTo /D (subsubsection.2.2.8) >> -endobj -76 0 obj -(mImgtbl) -endobj -77 0 obj -<< /S /GoTo /D (subsubsection.2.2.9) >> -endobj -80 0 obj -(mMakeHdr) -endobj -81 0 obj -<< /S /GoTo /D (subsubsection.2.2.10) >> -endobj -84 0 obj -(mJPEG) -endobj -85 0 obj -<< /S /GoTo /D (subsubsection.2.2.11) >> -endobj -88 0 obj -(mOverlaps) -endobj -89 0 obj -<< /S /GoTo /D (subsubsection.2.2.12) >> -endobj -92 0 obj -(mProject) -endobj -93 0 obj -<< /S /GoTo /D (subsubsection.2.2.13) >> -endobj -96 0 obj -(mProjectPP) -endobj -97 0 obj -<< /S /GoTo /D (subsubsection.2.2.14) >> -endobj -100 0 obj -(mShrink) -endobj -101 0 obj -<< /S /GoTo /D (subsubsection.2.2.15) >> -endobj -104 0 obj -(Backgound\137list) -endobj -105 0 obj -<< /S /GoTo /D (subsubsection.2.2.16) >> -endobj -108 0 obj -(create\137status\137table) -endobj -109 0 obj -<< /S /GoTo /D (subsection.2.3) >> -endobj -112 0 obj -(Batch Wrappers) -endobj -113 0 obj -<< /S /GoTo /D (subsubsection.2.3.1) >> -endobj -116 0 obj -(mBackgroundBatch) -endobj -117 0 obj -<< /S /GoTo /D (subsubsection.2.3.2) >> -endobj -120 0 obj -(mDiffBatch) -endobj -121 0 obj -<< /S /GoTo /D (subsubsection.2.3.3) >> -endobj -124 0 obj -(mDiffFitBatch) -endobj -125 0 obj -<< /S /GoTo /D (subsubsection.2.3.4) >> -endobj -128 0 obj -(mFitBatch) -endobj -129 0 obj -<< /S /GoTo /D (subsubsection.2.3.5) >> -endobj -132 0 obj -(mProjectBatch) -endobj -133 0 obj -<< /S /GoTo /D [134 0 R /FitH ] >> -endobj -136 0 obj << -/Length 216 -/Filter /FlateDecode ->> -stream -x???MK1????q???L>&?QA?Ain??b??`-?B?~??E/^2Ifx?y#??????????*?jI#Gr??l??????6p?r?> endobj -137 0 obj << -/D [134 0 R /XYZ -16.307 900.716 null] ->> endobj -140 0 obj << -/D [134 0 R /XYZ 56.693 759.068 null] ->> endobj -135 0 obj << -/Font << /F50 138 0 R /F51 139 0 R /F52 141 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -178 0 obj << -/Length 903 -/Filter /FlateDecode ->> -stream -x???Ko?@????=?????=&i?RT???CE?`???.?????c?PU???????????,??????r?PP "?d??y?* -&?????,u\??}?Z??<,?.???U&? 4???8??b ???(???N'?o g??? (2??P ??us?@??wdJ????p? ?"??c???^XO&Pa?s??P& ??T~?.?MaB?;?k#~??"????KD??'c??!?????&??S>ka?!?#Iv??:?[p?]?A???D????~??Z?))??xPQM???35G"??:??Tv?J*l?d??O?aJ????????ro??Gra????v??d;M? -?G -??F?i`_??C?=????^m at w??]?????B????????H?~???)i> endobj -143 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [55.697 706.356 113.38 715.332] -/A << /S /GoTo /D (section.1) >> ->> endobj -144 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [55.697 676.558 154.535 687.437] -/A << /S /GoTo /D (section.2) >> ->> endobj -145 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [70.641 658.49 119.099 669.394] -/A << /S /GoTo /D (subsection.2.1) >> ->> endobj -146 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 640.558 152.324 651.461] -/A << /S /GoTo /D (subsubsection.2.1.1) >> ->> endobj -147 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 624.682 156.19 633.529] -/A << /S /GoTo /D (subsubsection.2.1.2) >> ->> endobj -148 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 606.749 149.315 615.596] -/A << /S /GoTo /D (subsubsection.2.1.3) >> ->> endobj -149 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 588.817 150.122 597.663] -/A << /S /GoTo /D (subsubsection.2.1.4) >> ->> endobj -150 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 570.884 151.786 579.73] -/A << /S /GoTo /D (subsubsection.2.1.5) >> ->> endobj -151 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 550.894 199.925 561.798] -/A << /S /GoTo /D (subsubsection.2.1.6) >> ->> endobj -152 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 535.018 167.576 543.865] -/A << /S /GoTo /D (subsubsection.2.1.7) >> ->> endobj -153 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [70.641 515.028 159.457 525.932] -/A << /S /GoTo /D (subsection.2.2) >> ->> endobj -154 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 499.153 152.334 507.999] -/A << /S /GoTo /D (subsubsection.2.2.1) >> ->> endobj -155 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 479.163 183.876 490.067] -/A << /S /GoTo /D (subsubsection.2.2.2) >> ->> endobj -156 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 461.23 172.817 472.134] -/A << /S /GoTo /D (subsubsection.2.2.3) >> ->> endobj -157 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 445.355 174.481 454.201] -/A << /S /GoTo /D (subsubsection.2.2.4) >> ->> endobj -158 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 427.422 151.527 436.268] -/A << /S /GoTo /D (subsubsection.2.2.5) >> ->> endobj -159 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 409.489 162.605 418.336] -/A << /S /GoTo /D (subsubsection.2.2.6) >> ->> endobj -160 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 389.499 167.836 400.403] -/A << /S /GoTo /D (subsubsection.2.2.7) >> ->> endobj -161 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 371.566 161.748 382.47] -/A << /S /GoTo /D (subsubsection.2.2.8) >> ->> endobj -162 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 355.571 173.255 364.537] -/A << /S /GoTo /D (subsubsection.2.2.9) >> ->> endobj -163 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 337.758 157.873 346.605] -/A << /S /GoTo /D (subsubsection.2.2.10) >> ->> endobj -164 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 317.768 170.994 328.672] -/A << /S /GoTo /D (subsubsection.2.2.11) >> ->> endobj -165 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 299.835 163.402 310.739] -/A << /S /GoTo /D (subsubsection.2.2.12) >> ->> endobj -166 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 281.903 174.481 292.806] -/A << /S /GoTo /D (subsubsection.2.2.13) >> ->> endobj -167 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 266.027 161.749 274.874] -/A << /S /GoTo /D (subsubsection.2.2.14) >> ->> endobj -168 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 246.037 189.972 256.941] -/A << /S /GoTo /D (subsubsection.2.2.15) >> ->> endobj -169 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 229.081 203.232 239.008] -/A << /S /GoTo /D (subsubsection.2.2.16) >> ->> endobj -170 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [70.641 210.172 160.005 221.075] -/A << /S /GoTo /D (subsection.2.3) >> ->> endobj -171 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 192.239 207.118 203.143] -/A << /S /GoTo /D (subsubsection.2.3.1) >> ->> endobj -172 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 176.363 174.769 185.21] -/A << /S /GoTo /D (subsubsection.2.3.2) >> ->> endobj -173 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 158.431 185.848 167.277] -/A << /S /GoTo /D (subsubsection.2.3.3) >> ->> endobj -174 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 140.498 169.499 149.344] -/A << /S /GoTo /D (subsubsection.2.3.4) >> ->> endobj -175 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 120.508 186.645 131.412] -/A << /S /GoTo /D (subsubsection.2.3.5) >> ->> endobj -179 0 obj << -/D [177 0 R /XYZ -11.232 900.716 null] ->> endobj -176 0 obj << -/Font << /F50 138 0 R /F51 139 0 R /F52 141 0 R /F57 180 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -183 0 obj << -/Length 1794 -/Filter /FlateDecode ->> -stream -x??Y?s?6 ?_???w K?%???[???m?????Sl?Q+K?$7???)K???u??C ? ???????W???7?R??@y????b/?1???+??}????Eq???l??????????{` ?(? ?8$?w!K??XX'? j.??^??? ?{??S?_? -?x?-?????o?=??4?? ???g?T?/????3n??G -<?T?Er?C?"??D(?[?}??s?????C???????;{????w$,????6o?Ti?S???? ?????z??????]??v?n??" e???F????/y;?a?K]gm^n?C??u??6u??eM[We???YA?U??K??$???a?v??????<(l??fm???#s??S|???Bo?UCc:???[MSd1???}?W%Mo??Q?????N4$W@k?E?Awli???Vk?z??2????????^?f??J????G 2-??()??????"F!4??8??^?? ?????!?9V!?c?_?VOD??^U???B??N%???\?;??? cS??? -??lk|H?Y?km?????G`?????????&/i?-????\????]??9?P4b?ek,????v??) -??z. ???j?B?T2??d?/??!a?????]?{`?}?0?8Az`???? &????d?q?q????1G??M??B???8J]???Ojwa??l1W???????@I??tcpV?:vd&6'???w??[????Q0'f?F?:???Ehu ??;??a??f?O-??????`??A????A.?????!6??I?? U??2???Pa?@?xG?z????"e?mz??Q??vb,??\???#???:f?>/?? ???????p)'??=?? -???0??cF`f?]?1???????B??????k??xR???u&O|??b#?*(?%????vHYre? ?T???1?3?}i=ro~??c??????????Un?Z????W??!^#?;??Y?IBE?Q?????4T???f?I?$?'??C??@=????xP?8%???o??Q-c?B<?e?\?T?.H]???I?5???vHoa?D? ?[???l7$?6???n{[R?=y??bj???????@]??? ??? ?#???|a? ?ww???\??7?/H??s?/?r???$?,??:?i ;??d????1??S?`??=??z;???????#??b?????|??5???3??|?N?????? ->???r??h????c??($??j??&?????x???????~, -????~Q? -P??? 9?*?????U%?? -endstream -endobj -182 0 obj << -/Type /Page -/Contents 183 0 R -/Resources 181 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 142 0 R ->> endobj -184 0 obj << -/D [182 0 R /XYZ -16.307 900.716 null] ->> endobj -2 0 obj << -/D [182 0 R /XYZ 56.693 759.068 null] ->> endobj -185 0 obj << -/D [182 0 R /XYZ 56.693 731.272 null] ->> endobj -6 0 obj << -/D [182 0 R /XYZ 56.693 596.031 null] ->> endobj -186 0 obj << -/D [182 0 R /XYZ 56.693 556.98 null] ->> endobj -10 0 obj << -/D [182 0 R /XYZ 56.693 556.98 null] ->> endobj -187 0 obj << -/D [182 0 R /XYZ 56.693 529.727 null] ->> endobj -14 0 obj << -/D [182 0 R /XYZ 56.693 500.03 null] ->> endobj -188 0 obj << -/D [182 0 R /XYZ 56.693 474.337 null] ->> endobj -189 0 obj << -/D [182 0 R /XYZ 56.693 468.461 null] ->> endobj -190 0 obj << -/D [182 0 R /XYZ 56.693 471.351 null] ->> endobj -18 0 obj << -/D [182 0 R /XYZ 56.693 417.347 null] ->> endobj -192 0 obj << -/D [182 0 R /XYZ 56.693 391.654 null] ->> endobj -193 0 obj << -/D [182 0 R /XYZ 56.693 385.778 null] ->> endobj -194 0 obj << -/D [182 0 R /XYZ 56.693 388.667 null] ->> endobj -22 0 obj << -/D [182 0 R /XYZ 56.693 334.664 null] ->> endobj -195 0 obj << -/D [182 0 R /XYZ 56.693 308.97 null] ->> endobj -196 0 obj << -/D [182 0 R /XYZ 56.693 303.095 null] ->> endobj -197 0 obj << -/D [182 0 R /XYZ 56.693 305.984 null] ->> endobj -26 0 obj << -/D [182 0 R /XYZ 56.693 240.025 null] ->> endobj -198 0 obj << -/D [182 0 R /XYZ 56.693 214.332 null] ->> endobj -199 0 obj << -/D [182 0 R /XYZ 56.693 208.456 null] ->> endobj -200 0 obj << -/D [182 0 R /XYZ 56.693 211.345 null] ->> endobj -30 0 obj << -/D [182 0 R /XYZ 56.693 157.342 null] ->> endobj -201 0 obj << -/D [182 0 R /XYZ 56.693 131.648 null] ->> endobj -202 0 obj << -/D [182 0 R /XYZ 56.693 125.773 null] ->> endobj -203 0 obj << -/D [182 0 R /XYZ 56.693 128.662 null] ->> endobj -181 0 obj << -/Font << /F50 138 0 R /F51 139 0 R /F52 141 0 R /F90 191 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -206 0 obj << -/Length 2021 -/Filter /FlateDecode ->> -stream -x??Z[??6~???G{&Q%? L??{:?N???4???m&6??{?L????? -?N? -y??.????] l??????7?q?(T??@P$da??8 ?????S?n?/)?????M6?yx???????@?D?X ^?b? -?2Z|c?????????? ?@??? ?i?????Am??8 -?t?}? F4P?o?x?v*?7%???a?,?Bi5????K?1^|??K?7????e????ik:??T???`!??2?H5U??@????8??:?]?{`?k/?)A?S'????Z????=FBK???_ at Y -XoS???cC/??K9?al?m?y??K ?[???!?W??J7?F??????{????m??pdl???7E?1?B6???~??Wv?J?l4?8D?c????r3n-??d?6???c??"I>}|O:??O???Y? ??*i???????(&b>&???Lx+;??? -????n&?$????>?'??N`B???Of"?? ?Q Q?lL??=??U???TEi?.e????A??!?x?n?????b????p ?B???p-x?7{???f?+;>???!?? ????? ??8f?|D??=??U????4??rNL??]??v???8??J??~6.L????*p!?wB2????[? \??I|?n.?DX?w<2????[? \P?B????q?(2?cs7X B?;o?{r???.p???????l??#??;n??????x6X!???ld??MFdB?????{???????E?????S?5?K??)?????&?B'??x?.???K?mv u??R??mm??$xQ????>???/??l?%??M^[??6?"??G5??l?6J???5{%?????C1?s%??b?U??Z????T??Q?Q?Cb?@????`??x????K?nxb?????h??H??)(?\???0?,??[>6'??"?oM?)D? -u/SA?-?b????r?????@&???w%Db??|w%|?_???x_K$?????mW??w??p?????w'?D??[??j>????!!??*7?? ????u?????c?z??B?u?PgOXo???e?f???#??\???y?IG?? -????????y??IW?#5?]e>oz????v}wY????N?O?O ???9?^u -???G?????)G?n?z0???P?M?1'8?#:E??]1<??U4???????Z?? -endstream -endobj -205 0 obj << -/Type /Page -/Contents 206 0 R -/Resources 204 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 142 0 R ->> endobj -207 0 obj << -/D [205 0 R /XYZ -11.232 900.716 null] ->> endobj -34 0 obj << -/D [205 0 R /XYZ 56.693 759.068 null] ->> endobj -208 0 obj << -/D [205 0 R /XYZ 56.693 739.087 null] ->> endobj -209 0 obj << -/D [205 0 R /XYZ 56.693 733.109 null] ->> endobj -210 0 obj << -/D [205 0 R /XYZ 56.693 735.998 null] ->> endobj -211 0 obj << -/D [205 0 R /XYZ 56.693 725.039 null] ->> endobj -212 0 obj << -/D [205 0 R /XYZ 56.693 714.08 null] ->> endobj -213 0 obj << -/D [205 0 R /XYZ 56.693 703.121 null] ->> endobj -214 0 obj << -/D [205 0 R /XYZ 56.693 692.163 null] ->> endobj -215 0 obj << -/D [205 0 R /XYZ 56.693 681.204 null] ->> endobj -216 0 obj << -/D [205 0 R /XYZ 56.693 670.245 null] ->> endobj -38 0 obj << -/D [205 0 R /XYZ 56.693 604.038 null] ->> endobj -217 0 obj << -/D [205 0 R /XYZ 56.693 578.243 null] ->> endobj -218 0 obj << -/D [205 0 R /XYZ 56.693 572.266 null] ->> endobj -219 0 obj << -/D [205 0 R /XYZ 56.693 575.155 null] ->> endobj -220 0 obj << -/D [205 0 R /XYZ 56.693 564.196 null] ->> endobj -221 0 obj << -/D [205 0 R /XYZ 56.693 553.237 null] ->> endobj -222 0 obj << -/D [205 0 R /XYZ 56.693 542.278 null] ->> endobj -223 0 obj << -/D [205 0 R /XYZ 56.693 531.319 null] ->> endobj -224 0 obj << -/D [205 0 R /XYZ 56.693 520.36 null] ->> endobj -225 0 obj << -/D [205 0 R /XYZ 56.693 509.402 null] ->> endobj -226 0 obj << -/D [205 0 R /XYZ 56.693 498.443 null] ->> endobj -42 0 obj << -/D [205 0 R /XYZ 56.693 432.236 null] ->> endobj -227 0 obj << -/D [205 0 R /XYZ 56.693 403.851 null] ->> endobj -46 0 obj << -/D [205 0 R /XYZ 56.693 322.8 null] ->> endobj -228 0 obj << -/D [205 0 R /XYZ 56.693 294.848 null] ->> endobj -229 0 obj << -/D [205 0 R /XYZ 56.693 288.87 null] ->> endobj -230 0 obj << -/D [205 0 R /XYZ 56.693 291.759 null] ->> endobj -50 0 obj << -/D [205 0 R /XYZ 56.693 213.598 null] ->> endobj -231 0 obj << -/D [205 0 R /XYZ 56.693 187.803 null] ->> endobj -232 0 obj << -/D [205 0 R /XYZ 56.693 181.825 null] ->> endobj -233 0 obj << -/D [205 0 R /XYZ 56.693 184.714 null] ->> endobj -204 0 obj << -/Font << /F50 138 0 R /F51 139 0 R /F52 141 0 R /F90 191 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -236 0 obj << -/Length 2171 -/Filter /FlateDecode ->> -stream -x??ZKs?6??W?(U?}?????P??"y2-I?(?BBy?|?????Ph4$x?t??0*?C?p"??_???QJ?v?M??a????q?? 9M?\R?{???gL???U????m?b?mZ????r?b?[?????w?{??P?$??7p?(?v?-?????]?4\OS?s?????x5%,??4?(????n_E]?m?U??K???{C???????????p??73?????s??[? ?@????L??a$s??2?R?C?????ia6?)???-?K[R?~???[??6~)Mm?????m???[?????F????uO?0e??G?????KFz[???????,Z,{?0!6?b?????:VM??7???\.?????vk%F?oV?Vj'E???g??T+???E??cY?m?l6?3?VK??????????s;P?K]??c?9???????+;Xa??*?u?,[?hV?^@ ?^Wq?P???-????#b`i?t4?????X????.[???m?]??x??q5L?5?X??>?K???n??4??"??8?>????l??t???60?wu?+,'???????,?????????|??$M???iA?Y??? A??/???+????x???X????s?O??0Y\?2???!??????t?F??{??`?nv???Ho?4I???? -+zS?x??y???????]????T?NL?S??/???n??_? ?[;C ??? ?W??:` ????????@!=?@??????????????? ?*??^F? 0?P{+`?V/v??[???7???????M?????\J???????M?,???w7?B??_?c?????y?7????/v)%? |?????p??]?8?+?o?T?`???????v&??????OU???p???M7?Q??P?55U9)??%W?(yL??g??%?,7??G [ -?$w??u????Z?G?s??$?.?H)?I???i?"?w?tDJ9%E??????g?????1????KYJ$?@:?$?Ys??q?4fn???????;?gcn??=??=fC??=?!{???/??<"???????u{????v??t????J/@oCd?? ?!T?Gg_????????a?(H?/HX?I./GXF????|gO?!??s ???w??.?OcT/oi?????,21?{z5dj?n???b?v??6w?W >?J/??g??r?a?"?w?tD?HB?T???Lp*&?????y?-2*\y??5?S????X2<?8tI??C-?qG3l???a? [?X-?)?~|c>L?H?W??????Zd?0E!?? ?? z?q?Ue?N?6_?R -8??Q??????}@?%?z?? 1?\ ?4??AQW???1?????>z??N???m+wh???ztu?:8G?LcbF.???@M????k????/?8Ldq?????Y???}?6?? ?;{:0`"i!gb??^>< ?????k?? 6?5p?Q??J#f@?c":???? h??"? -" ?D???&?a4????ze????"?B?O????sN)?R??3????I -endstream -endobj -235 0 obj << -/Type /Page -/Contents 236 0 R -/Resources 234 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 142 0 R ->> endobj -237 0 obj << -/D [235 0 R /XYZ -16.307 900.716 null] ->> endobj -54 0 obj << -/D [235 0 R /XYZ 56.693 759.068 null] ->> endobj -238 0 obj << -/D [235 0 R /XYZ 56.693 739.087 null] ->> endobj -239 0 obj << -/D [235 0 R /XYZ 56.693 734.297 null] ->> endobj -240 0 obj << -/D [235 0 R /XYZ 56.693 737.186 null] ->> endobj -58 0 obj << -/D [235 0 R /XYZ 56.693 661.911 null] ->> endobj -241 0 obj << -/D [235 0 R /XYZ 56.693 637.304 null] ->> endobj -242 0 obj << -/D [235 0 R /XYZ 56.693 632.514 null] ->> endobj -243 0 obj << -/D [235 0 R /XYZ 56.693 635.403 null] ->> endobj -62 0 obj << -/D [235 0 R /XYZ 56.693 560.129 null] ->> endobj -244 0 obj << -/D [235 0 R /XYZ 56.693 535.521 null] ->> endobj -245 0 obj << -/D [235 0 R /XYZ 56.693 530.731 null] ->> endobj -246 0 obj << -/D [235 0 R /XYZ 56.693 533.621 null] ->> endobj -66 0 obj << -/D [235 0 R /XYZ 56.693 458.346 null] ->> endobj -247 0 obj << -/D [235 0 R /XYZ 56.693 433.739 null] ->> endobj -248 0 obj << -/D [235 0 R /XYZ 56.693 428.949 null] ->> endobj -249 0 obj << -/D [235 0 R /XYZ 56.693 431.838 null] ->> endobj -70 0 obj << -/D [235 0 R /XYZ 56.693 368.518 null] ->> endobj -250 0 obj << -/D [235 0 R /XYZ 56.693 343.911 null] ->> endobj -251 0 obj << -/D [235 0 R /XYZ 56.693 339.121 null] ->> endobj -252 0 obj << -/D [235 0 R /XYZ 56.693 342.01 null] ->> endobj -74 0 obj << -/D [235 0 R /XYZ 56.693 266.736 null] ->> endobj -253 0 obj << -/D [235 0 R /XYZ 56.693 242.128 null] ->> endobj -254 0 obj << -/D [235 0 R /XYZ 56.693 237.339 null] ->> endobj -255 0 obj << -/D [235 0 R /XYZ 56.693 240.228 null] ->> endobj -78 0 obj << -/D [235 0 R /XYZ 56.693 164.953 null] ->> endobj -256 0 obj << -/D [235 0 R /XYZ 56.693 140.346 null] ->> endobj -257 0 obj << -/D [235 0 R /XYZ 56.693 135.556 null] ->> endobj -258 0 obj << -/D [235 0 R /XYZ 56.693 138.445 null] ->> endobj -234 0 obj << -/Font << /F50 138 0 R /F51 139 0 R /F52 141 0 R /F90 191 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -261 0 obj << -/Length 2220 -/Filter /FlateDecode ->> -stream -x??ZK???????d?\>$J:?"?? ?N???b@???iYr$y;?_?"??)?z??X?????H???H????n~Y???[D?????`?$'2??`? ->???u7??????:???????????? (?B+????-c$?"T??8??????????? -7h??H ???Iy??n>?N??}( ?$x4=wA?(?B?\?7???v*t0%?y?t?)aT?C?p(?????-???v?~}?-0????F? -?0?|e???????0?$M???????@?t?s?????*f?????? ???=???K?????Y???(???fJq7C7?$4??????VJ????m?X??q??=?=wu???m>?o^0??nj??8????w??v??_w???f)I?%=???1?m!e?2 2?m?jXI?fa??Y?:4n??cQ???)'u?\]#?U?u???M???@ j??|(:2?"??Oz???SsFg??????+?v|V???????? -XDI???k? ?_l-???#T??B?>X ?M??Z????jE;??>??h????nv -V???????%z?i???yS?}{b??P!??T -NB????#??!??????RD??@jY?O?b???-?o??a\??g???U_?i???? -0TBpH??X??c???????G?c(?!d@,?F?????R?`??s?R]{?????L???.??4???cb?????E[B???a:8&?+M????B??LK???! ->?ycG?????????`$L??B????'?3????e?(??????n???>? -C?P?????>??OPaN??!??l?j?-?!??vdU>??h3;??? _??.?Y]?=rOD?Vi?D_??;UA&???KU??u?MD???8s?J6&5 g?9=??;???h??0?Iz?c????O???^??????u????J????n??|????Q?1yC???C????$????t? -2?_!??????)??1?C?_?!?sI~? ????????== -??F????6g'!~L])??bST?<3)??4?k?u??)??$B?E -???A???  #???? ?? xC???S???c2???????}???bd??> ???ms/?????W??j???k?????'???? -?p??e> endobj -262 0 obj << -/D [260 0 R /XYZ -11.232 900.716 null] ->> endobj -82 0 obj << -/D [260 0 R /XYZ 56.693 759.068 null] ->> endobj -263 0 obj << -/D [260 0 R /XYZ 56.693 739.087 null] ->> endobj -264 0 obj << -/D [260 0 R /XYZ 56.693 734.166 null] ->> endobj -265 0 obj << -/D [260 0 R /XYZ 56.693 737.055 null] ->> endobj -86 0 obj << -/D [260 0 R /XYZ 56.693 673.418 null] ->> endobj -266 0 obj << -/D [260 0 R /XYZ 56.693 648.68 null] ->> endobj -267 0 obj << -/D [260 0 R /XYZ 56.693 643.76 null] ->> endobj -268 0 obj << -/D [260 0 R /XYZ 56.693 646.649 null] ->> endobj -90 0 obj << -/D [260 0 R /XYZ 56.693 573.114 null] ->> endobj -269 0 obj << -/D [260 0 R /XYZ 56.693 546.319 null] ->> endobj -270 0 obj << -/D [260 0 R /XYZ 56.693 541.398 null] ->> endobj -271 0 obj << -/D [260 0 R /XYZ 56.693 544.287 null] ->> endobj -94 0 obj << -/D [260 0 R /XYZ 56.693 422.55 null] ->> endobj -272 0 obj << -/D [260 0 R /XYZ 56.693 395.655 null] ->> endobj -273 0 obj << -/D [260 0 R /XYZ 56.693 390.734 null] ->> endobj -274 0 obj << -/D [260 0 R /XYZ 56.693 393.624 null] ->> endobj -98 0 obj << -/D [260 0 R /XYZ 56.693 269.994 null] ->> endobj -275 0 obj << -/D [260 0 R /XYZ 56.693 243.099 null] ->> endobj -276 0 obj << -/D [260 0 R /XYZ 56.693 238.179 null] ->> endobj -277 0 obj << -/D [260 0 R /XYZ 56.693 241.068 null] ->> endobj -102 0 obj << -/D [260 0 R /XYZ 56.693 177.431 null] ->> endobj -278 0 obj << -/D [260 0 R /XYZ 56.693 152.693 null] ->> endobj -279 0 obj << -/D [260 0 R /XYZ 56.693 147.772 null] ->> endobj -280 0 obj << -/D [260 0 R /XYZ 56.693 150.662 null] ->> endobj -259 0 obj << -/Font << /F50 138 0 R /F51 139 0 R /F52 141 0 R /F90 191 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -284 0 obj << -/Length 2180 -/Filter /FlateDecode ->> -stream -x??ZKs?8??W?hW%l>D?:n?l??T??]5????"??vl?#????? ?,?v???>L?I4? ???9??Ow?gw?>H?$Mx?Q?I?"M??f?????K?h?\??_???? -????>N??~,?? VA?A????H*%??0C??;?$v???gw??10?F,? I`=?2?P????_h4??%q??'??$???????????? -???Yt?)a4A?8???ab???QJ'ym??<6m?n??6{?2:Y??-Yq??i?A?#%8Q?n??%Kgq?I???6??o?????C??%yX3+=V???}????Y??+!)O?`?SX?G8??woJ??q??\*Rto?? }??k??z?P???eO??'M??6@???????:???????Z;/???}=??& -????>z_?O?wh?*?c??-??>???dSW??ok???b?BF??HN??g;mTb/??vY?(??u?i???E??vQ?????=?????????mUE???????YZxV?p&{/?K -6uC?p????????f???????o???l[/??S $?,3?)?N?;????e??d???lJS???=??@?????291?*? -??rt?}?B??n? ?m?6c???y?:????????gm?:;????7?,???*???P??\??????erY7%S??/!?ND?8?h?y?????s?/?o{x?????JyLD"??0? '0??X??C?K??????+??1p??B??jZ?T ??N`?J)_y?k??(????s????????`?&??n?U???-???&@?6?mVYnv????????F???1??WvV??]?G????]?g? ??%#Zu?$??3???|??????~?m9????VJIC?A?8&???!???qb??'???!?0?^^O????~=??w??X?7??????Lt`?b(???rh????M?a?????v?O??j??6a??7x?%D????????a??gj????K??g3??q??jJA?T??????$?qj -?'O?@c?? ?%?Q??r??F?eIH?W?(}???L?|?f???b??M`kY?S6??????\????K?????=?.*?=???Z?%???W?q?B??,6??????I?n%vHL????F?bZ????Mhp??x???5???_??????2???? X? ? ??m?GO~??Ua?a?&?7??8???????.?]? t??0?J?wx???Y?????????J/ZS#????=??2??Q7J"Zwzp??p ??<@???o/v?Ttv??l?u? -??Ui??Y@?d???w?IH??????p??!?k??&~???a;(?d????V??H/k????????r?eg?C?????U???;?8r? ?rFv??_m? ???????????b??? -? ??v(V$??4?Y????G{??$??n?b]?h$? -?sc????????????be?lmNc??/??????W??&?5??*?Q??e?/??'Z??9?/&?C?>k???????\????O?{}X?8???}DlY.? D???C!l?????? -??=S?<a]+I???U??$???????*k?leS?^?YR{ -?eda??h -????&????+?3???@?$??H???a?????9K? ??!U??qt?,`???????? v'D;L;?J=?z?qTe?D?k????j??c??C?????1,W?YQ6HY.???? ????l?zQ4? ?XOc:?GP????? ??????xA?;?4???sp??$??~?i???5??????????`??f????df??=t}R?oT???5 7W?0?8? > endobj -281 0 obj << -/Type /XObject -/Subtype /Form -/FormType 1 -/PTEX.FileName (/usr/local/share/dblatex/latex/contrib/db2latex/graphics/warning.pdf) -/PTEX.PageNumber 1 -/PTEX.InfoDict 304 0 R -/BBox [0 0 29 29] -/Resources << -/ProcSet [ /PDF ] -/ExtGState << -/R8 305 0 R -/R7 306 0 R ->>>> -/Length 566 -/Filter /FlateDecode ->> -stream -x?]TI?T1 ??Y?0?9b?$@?{?Xp}????[?(??~???O???6?t -???>??j?????4'?W5??3??/?%H?K*???J,?.?H????&>?=o??&)?d?$+?]K????7??]?:(mm???? ?'??<(_?OU'?K 2?????X????~?op/????_???H ???]&?????2??%??d?w^?%bT??XE!x??8j?$?4????3?x??7?"?89?? ?2?m???F6?,? ?a;?,???w??8?]50&??}?)???0Hc?3p ha?> -endobj -305 0 obj -<< -/Type /ExtGState -/op true ->> -endobj -306 0 obj -<< -/Type /ExtGState -/OPM 1 -/SA true ->> -endobj -285 0 obj << -/D [283 0 R /XYZ -16.307 900.716 null] ->> endobj -106 0 obj << -/D [283 0 R /XYZ 56.693 759.068 null] ->> endobj -286 0 obj << -/D [283 0 R /XYZ 56.693 739.087 null] ->> endobj -287 0 obj << -/D [283 0 R /XYZ 56.693 733.109 null] ->> endobj -288 0 obj << -/D [283 0 R /XYZ 56.693 735.998 null] ->> endobj -110 0 obj << -/D [283 0 R /XYZ 56.693 657.837 null] ->> endobj -289 0 obj << -/D [283 0 R /XYZ 56.693 629.451 null] ->> endobj -114 0 obj << -/D [283 0 R /XYZ 56.693 587.653 null] ->> endobj -290 0 obj << -/D [283 0 R /XYZ 56.693 561.858 null] ->> endobj -291 0 obj << -/D [283 0 R /XYZ 56.693 555.881 null] ->> endobj -292 0 obj << -/D [283 0 R /XYZ 56.693 558.77 null] ->> endobj -293 0 obj << -/D [283 0 R /XYZ 56.693 547.811 null] ->> endobj -118 0 obj << -/D [283 0 R /XYZ 56.693 406.486 null] ->> endobj -294 0 obj << -/D [283 0 R /XYZ 56.693 378.534 null] ->> endobj -295 0 obj << -/D [283 0 R /XYZ 56.693 372.556 null] ->> endobj -296 0 obj << -/D [283 0 R /XYZ 56.693 375.445 null] ->> endobj -297 0 obj << -/D [283 0 R /XYZ 56.693 364.487 null] ->> endobj -122 0 obj << -/D [283 0 R /XYZ 56.693 150.064 null] ->> endobj -298 0 obj << -/D [283 0 R /XYZ 56.693 122.112 null] ->> endobj -299 0 obj << -/D [283 0 R /XYZ 56.693 116.134 null] ->> endobj -300 0 obj << -/D [283 0 R /XYZ 56.693 119.023 null] ->> endobj -301 0 obj << -/D [283 0 R /XYZ 56.693 108.064 null] ->> endobj -302 0 obj << -/D [283 0 R /XYZ 56.693 97.105 null] ->> endobj -282 0 obj << -/Font << /F50 138 0 R /F51 139 0 R /F52 141 0 R /F90 191 0 R >> -/XObject << /Im1 281 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -309 0 obj << -/Length 1809 -/Filter /FlateDecode ->> -stream -x??Y???6 ?_?????e???????p[??Z??\?:vf; ???)?v.??G?NE??????9??m?f9{?N 'vc?kg?v?????D??X:????8?nq?+1?????.??/7???????s"P?%*"??????R?B??0???F???????3???(?j??????????g?d0??nG??Hn? ?????0?k&x)????? v=?????h???WI?n?l????J??w???'?9K?I???Y2????Is??????n?S?^S{??M??7,Zl!?????M?2??I????S??_???????5?u -??+?)?F?????*???????@???J_[?D_?ma?em????X/|5_?x?2?Vn???A??n??9}P?{??SM?????;??!"O0??'cG????v{??m?$U??XQ?i6q?LX??(K??X.?????3??]$+R?m?&E:tW??.Y???^??????????? -d=?64lw?????GY]Y??%MR?y???yz???k??@???Gjz]??u -W?A?^?S -p)?:F -?????2? ?i?x}????5?;j?b?W??????????+?qj?.bSa?N_???@y?g???">?H?????bF?Bm/C? -b??x[|p?-?Y??????h???z??N^QT^:?{LZ??>? ?n=F?i?Y?A?\?Yw?1?m?????{??5NM?N"l?8?]?4??????B? -/|J?N???C>???U??t???rn?`C?????;`C0 -???>%?P???vlJp???????b????0?#m?sO -x??\Y??C???????[`w???.??~?|gM -cA) ?)? ?o?OB ? ?5wt[9?\jH??\????????/???n C?????yO????k???????^=????Li??m?????S??_?X????????/???]???wP?U???????M?|??>Q???e6??????1??>?@???wc???;???K???Ww?^? 0+ _/2r}?(?pT?]?T???B?M??? -+'A|? -?~?p?,|H???b ????4? V???i?a??y?????? R???K1?#L?8?`..7M?y~2x?2??Mrxv??J?d?3q?Tp????p???+?`\???g8?q?q?3???gx?q???&uE=.u?\??~??A???tj?s(L?R -?????~p?C*?????????3<}?U? ?ITH[w?1????RA?(M?%????]&9?z_?/?q? d?<-2?)??v??l?n??J70?> endobj -310 0 obj << -/D [308 0 R /XYZ -11.232 900.716 null] ->> endobj -126 0 obj << -/D [308 0 R /XYZ 56.693 560.885 null] ->> endobj -311 0 obj << -/D [308 0 R /XYZ 56.693 532.933 null] ->> endobj -312 0 obj << -/D [308 0 R /XYZ 56.693 526.955 null] ->> endobj -313 0 obj << -/D [308 0 R /XYZ 56.693 529.844 null] ->> endobj -130 0 obj << -/D [308 0 R /XYZ 56.693 400.582 null] ->> endobj -314 0 obj << -/D [308 0 R /XYZ 56.693 372.63 null] ->> endobj -315 0 obj << -/D [308 0 R /XYZ 56.693 366.652 null] ->> endobj -316 0 obj << -/D [308 0 R /XYZ 56.693 369.541 null] ->> endobj -307 0 obj << -/Font << /F50 138 0 R /F51 139 0 R /F52 141 0 R /F90 191 0 R >> -/XObject << /Im1 281 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -318 0 obj -[600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600] -endobj -319 0 obj -[500 500 500 500 500 500 500 500 500 333 333 570 570 570 500 930 722 667 722 722 667 611 778 778 389 500 778 667 944 722 778 611 778 722 556 667 722 722 1000 722 722 667 333 278 333 581 500 333 500 556 444 556 444 333 500 556 278 333 556 278 833 556 500 556 556 444 389 333 556 500 722] -endobj -320 0 obj -[278 278 556 556 556 556 556 556 556 556 556 556 333 333 584 584 584 611 975 722 722 722 722 667 611 778 722 278 556 722 611 833 722 778 667 778 722 667 611 722 667 944 667 667 611 333 278 333 584 556 278 556 611 556 611 556 333 611 611 278 278 556 278 889 611 611 611 611 389 556 333 611 556 778 556 556] -endobj -321 0 obj -[355 556 556 889 667 222 333 333 389 584 278 333 278 278 556 556 556 556 556 556 556 556 556 556 278 278 584 584 584 556 1015 667 667 722 722 667 611 778 722 278 500 667 556 833 722 778 667 778 722 667 611 722 667 944 667 667 611 278 278 278 469 556 222 556 556 500 556 556 278 556 556 222 222 500 222 833 556 556 556 556 333 500 278 556 500 722 500 500] -endobj -322 0 obj -[556 556 167 333 611 278 333 333 0 333 564 0 611 444 333 278 0 0 0 0 0 0 0 0 0 0 0 0 333 180 250 333 408 500 500 833 778 333 333 333 500 564 250 333 250 278 500 500 500 500 500 500 500 500 500 500 278 278 564 564 564 444 921 722 667 667 722 611 556 722 722 333 389 722 611 889 722 722 556 722 667 556 611 722 722 944 722 722 611 333 278 333 469 500 333 444 500 444 500 444 333 500 500 278 278 500 278 778 500 500 500 500 333 389 278 500 500 722 500 500 444] -endobj -323 0 obj << -/Length1 1612 -/Length2 12917 -/Length3 0 -/Length 13735 -/Filter /FlateDecode ->> -stream -x??yeT??-??N??$???n?id7????????????]?? 3l? -??$+L?7??a*???y?>  ???y"fC?^??U???$??????&??FKc2??x^?)??lc?1a????LKQ6?[??T?N?T??G*???]-:???????P?{^???eL?s5 -?c?????x(???X???1q????1??X??~?c???a?????????O ??????#?e???????V?~96?j at n??T???}?n:?g6}????d????~?????VD -{u??Qdr"??Y??*??~?jc2D?=?6??jb?N?~5 ?&???3??L??a -X?*lY????*???????]??o??x?8x????8????B[?2?v????l??A,?? ???A???D???ci?n5?]?@7?K?'???.??$/???b?????:l??I??WpYW??M???? l\eo?'M?3?sE???????3??6zI?:?b6?,??cI???{?'n???????T ????,??=q??u%#c&ik -????V?%T?M?@:??$??w??'r?=? ?4??/???)???7U?HT?`E? ??e?????`????.-?;??? ~6?5L*?s?O? -O?~l8t_^f?.~??h? *F ??????(???8=???::q???s?t?Zr?[?+ 8??u???8????i(fQfc??n2k?wq?=*?p??9?N??L??[)L?_?$es????2w?w1!?o/??p? -???G????$?}??}?p?oJ?({??????qU??u??i?A?j?{R??I'?=??oy*?k??R;-?~???,r????5gMs?)_'5??`]?9?O?1(????1?d????]D?T?Z??k?3?V?|??"?uZ???4VOt?e??C6lj?D]??#$?????#D?/?P?s?^W?F??;?2l???'?????4??W)!????ZGW?S???l??t&??? -?fB7?59m-??/x"1{HR^b??((?? -t??? -???!???_?Gnb%??????L!zu??+?n?a??d?^'?V??,D??Z??JQ7B73???s(?{???cGX!?r??????t?0?3??4Y???lQ US?R??."?!??q?C?? -??@?f?????? -}E[. yPhM??l?^?+Ls??B/?{???"?eb?d??V??u???????????-?&?Lb???H?[dt???G?j?????s!? ?z5??u_ ??"?X?`D????D?Y?????V~?????O??u??????5f???E?!???%???cT???^#Vt??Y -??f??k??[?8a?v??>??|!w???l????????7!????&?7Xj?J?jPOa{ pp???j?r????f&?]??S?zmH???.G?????c(??v?|!?2???F?S?_??o? -C??f?X??B?(? w??;?-??????!??????uKY??l?? ?M?????????P%n???G??St?????=?&??????Z?Z&r??l5??z!??????9?q??????}??e??\?P??!$?7 +??@#?7iq??F?g???.?y?N???X1zori?Ou?Y,A(?D?6E ??}c???Q:O?R?"??lp?????>??Cn u??A?v?]??????5?l??6&??r?~;?J???{R?Q?* -?w?!/d%d???k9??a?4?l??r???????p2F?????H5?7?-??|???6???T??[?????j|?o??& ( iGw,ew=?]??Y?sc?y>A???`$?? -!R?i?????ng??Qi??????slK3?l?m??y??g0I?`??_???+??P?7?b??#??b?pU????Jr?? -AS!??i3?????Iz=Ut?SL'????,?k??}?vJ?????jW??b?????k?A??)$.???X?T#??39?????g??J?G?Em{????o?????\??Vm?????:? -??? L/?_G????CS+????)?I:?J>??I9-??$?Y?m??d?W???#?D???3?3?:i?!???R??@@D?????v??x!Qd??Y~???6$t ?????-0?????;????E???HE??o[Q?????????f????????????T??J????y?K`qB?X?K(?????+???#`?z?/?? h???????J?S???3?K??!?????????(}G?=????m^ou????P?? ???/?|?>lO???l?????y?6%??G?UG?@?z?$??z?`PP|10pw@???,???????????K???? \$ ?:??[?m??]???-?<{'x???? ??GL???8??F??z??y?F(? -k)???????C ???$?p|?i??h - at -?dq?C??d`????/)S0?SEg??9F? s=??1???y?g?=???wOm -?r? ?v???)6*?YF?k?\E???????b>???????}??)??/?/??L"??h,,???Z??$????x9?? -?\k???W8??L?????0m???"b???P???A1?R?? ~?td?He3y?R?????????f??????????eY?cm?b? -=?x6?o??z42/????d$?Na?cd?N ?q??_?????PR??????~0??8?FN?=0D?-g]z?????????*?H?"w?\??5e8rw??j????al?o%?c?2)7?wZ8h$-??L?Bh?k????Mu?V??????0?2?v?5??u???q???t??~??hZ??S?O??_?zj?? -! ???k8U#Wg? -?i?5?F27R??,#??? &>??? -??Z/?A?x???G8?30?S:????6Q@?*L??Fc???yh?N?????!?aUK?q??E-???icC??_?}?????F??I})f???6 -??#??F????? ?N?g:???j{?4 ??Z??N?g???'????BA??"????~a<??@?_! -?O?'???L?tu^x9???v??????{?c%???~??1!?^5}?.??W???;????????u??`r???k??U??jZ????e???? -??????A????MW??????T`?_7???????E8?f-1???WU?0 ?E??67a??m?p)'?n???:????p??*?L??5A?q#b|Jf?w?? M???wm7????????f????s?????Q/?d??????S??Q????Y?|?9?"8/?7??8/?sD? K?bQ?51?Q C????5`Qa?K??0??. ?)J??bI??0 ??N?4B?\]??D???t??? -i?h ceC#?6??>?>J?3? ???B?0??GT?*:???R6O????? ?r=???????d??!Uk ????)?s???AV*9V?(y?? ??S???|??U?????????s????W???$?@????????Y??}?? -1R?K4K?I"P????k?#nDM?~-}?3????b??T?FPo?arV??*???????Y?t?%['?}?T0?[D???L?W?P??y???? -??W?d?;%:?????>??K?T???iW?@"3?_?(???*S8C?_?svR??????????-o??????6?=X?????(?O???3Ll?????6???rT?????k??D?k?nP#T??*$?v???Z??]????y???Yj?e?`?b?>??';ph?:??_??1B??'???8n?"?????l?t??g*2???x7?E5????T??X?U????Z??Wl????2?????hG??e?~q?$????#?}??~?K???h?????????s>??? -?ik?wwm~%?)%?;Q???o'?;??Q?????? ":???\ -?<??h$^GE?l?s?,??M???F???)~T??????U?R???)?????9???kk???&?/9&J?M%c??xE??W0????~ ????-TO?R?tz??????????e)(?-4N'????a????????p?:?-?`?K!??P ????+??????G?L`?\?????d???h8n"????y??? ?n????l????*??1??=K_?????T??Y??????=???K???)???gw ??A????8 b?K????H????t?+O?Gm?f)uu????????mA??????;?^????K"?5.?t?o ?????G?v=GpF?)?_??D???>m)??6?/a??.?????>??`Wh9V????N??y9t??!??E9?{???F????????n?X8?????????zg?]+?g?$?i???D??@?T?Kjj?*????"M3K???????%?->??4'??t?!?w?(??? -?0H?m?????????lj??????? ???mn???}ZF?????Hc?U"#??<>??x2~?@?f????o???j??D?Y??@??i????TS?!??? 7?LQ??`7????QJ+???qJ?:):?tsj???B?^?"21E?????rs??Y#{%?E???d?,C/ $???4 -???zq?@?'??M??i????$P#???+;??3????.??E`?[6?!u???'3N????(?r[??Q?k?|???????z?|[????FS ???(???C??????????w????_????????>:???%/??????l??(?{??'?R>M?!????O,S??2|???????$Kf????Bg??1?=?-b.????!m?Y?G?VK4?Y???????1x"?A?Hf ????? Y7?????!U[???0??<?a??????????;?7? :??? -?E ?I???>?????pV???K??! -???gY?=#T?e?f?@?[????;?? Z??v>???x?Z? ?O???O??  -$?'n?c???????s?s?R?~5?C??F{??HN???h&Y???????"I?-NE?4?Zyer??q???n?tZ2?;]?????? ?z#?x?pl?L???_???P???????_ ????????{@? ?D??O?????}?d?S????>O;?S? ??-2??)?pOM??K??;????3????"??T?u?X1??????? -;??U?BP)?6g&?vI??=}?>iK?b^!`?????????????|??V?B????lY7?CWW????+_-??p?????????? -?%????=????! ?{?a?L ?????_?N??z??????6?}:??4?P?'[u???C?R?m?U?^y?????????6?A??|*?=????Sj????5)V?Au??4?y -???$???L?K??FH??????_c??Q???p???????A??#?q??????? -?'qME2?~%?? &|;Q1X?C]???a?#[L?/l}~#????M?i??U?? "r?V?S???p?CFw?.???(^[/???5 -?jk? -??-NJ?5~Yg?8????9 7??=????#F?????I=6g?EO5?G???N?/??gF??"?YX?`?e??]?k??1??:????Vz??~???4?????|J??V???9RdU~??&????M9??0???$? M_??1 ????D?i???)i??KE??J?g.E;-k??XTP???????????6%Nv??l?e?Nl^dc:3? ??G??Y?Z|:?%??4#pC?0~??V?7?'?QD??}1?u?2???r?"3?7?3?????l?#n????{Q?U???2????????????h? -? ?????w#?Z4%????ZG????u?a???????d?2?R??j?:.???BcE??/??????D&?F???????x?%C??Z` k????6 4??F?e?50?????W??w????G???????`??8???????x??+?????4??LT?????????\?V?[??r2??6J?????Foke???@?????, ?7?????l{_?K7?|??????#F??'+??v??7??Sn n???T^?O???b`1?o????A???J???\???????jA???R??B1?wO?:? ?^???r?m????C?c?w??(??]+?+ ??pk??^u??S#???35???g]{Ue??:ix?+k???B?&V???? -?VF[??IR???%???T?Of?'?i??? ?X ???)???LG???A??6?F"g6????3???C???w??&?"Xm*?s?;?wp\????^"e??,^?W??xh???/8_??t???????e?UP???b?f???????>??g??4E%n???9?mTNcB?????-c I??#][B???k?????????????g?????y;1????0???B????^v?"?R&?i???z??}????D*?7????{???8??!?????|?G?q???U?-?b.d?(? ???/??u?#??p&???? ??-K?[?@Z?x??U????tI???y??e?&??'U? -#???????9.?8?X?sh?Le???L??#?Q???&q[U?}e3?'P??????.??K ?hv????????|?Z"?y&??D?w?G??_??}e]?y'???z????^cQ? f?fP+?)ji??do????<`N*"? ?????.??b?4??+r????1? i[?v???G?_[?:?Z5f?$???M?L??????%,?cW???%??8????b?i?????^?9{?b?]v???@??.??11???W?$?M??2nM?YR?}U???o]?\?9??? !?h?????I? o?? B??????\?O{S?yWd? ?n????q??/??,?W??U????Ep??Oz2?F?????!??A?T???? ??????????8???????l?]b?/?`?!???T??s??N????????f???????f???~5???Z???`?@>z??]???b? -p??D3???|?Vt?t?f??? ?'?3?????????dH}?Ow?L ?? ?? ??L?w?@L?OiD???*4?k? a??sr????Y?x-?n???n???bG??9???x??c???d@??S??~J??r?:???f??%M?IH?Aqy??~l??tE?\$H?N_??e??f?@?????.??.?f#??a??,?z?{k?~?l????(?????B??=?g\????nWX???u?? ???3??????M??i? -?K m5dfB1/:?y??d}U^m??????~~??8U????6?'?6??????44L?d??0i?????M?y?%????????9C???a???lm?U$??hw?6??]zL?Fexv?Id??S(?????mx???cAw??????Mu?p???"?w?N?{1???N??-m]b-m?D??nl ~??=?%??k;??Mm???*6.R?*z???+????+??i?Fg2-?5D?????????-zN_??: -J??_y?-??EC?E7???T???????????d?q????hW~?'>>X?_??Q???{2????@{`?=???0b ????(+??????J??????,??,??? -?9gQ?Z?:eIGt???>??[s????0i?3?????|???????#??6 ?/?c.?K??8? -?v8????W??7QpuQ??8??_?P?e??????>???Vu7w?(m?cO??9?8??:?4 ?@?????[%?u??6`i -]?#e?O??d???:yP??BC?_?bi??T??S?XL?????N????&???'?H?????@??????"??C??????l??5????|???PcE??e???????????h?i??wM??????OO=??SN??5?[[?J??q?-?? ????B????z??2?X???????4?3?I?&? ? ?k?P0??????u?I????y?m???.vS???^?W,l?b5Rp???|?c??5?1?h?????8???ha?? -C?q?p???? -??i?/7????X?Tu?Y????????V|?????}????G=??#?J?Ly{R=????6?W??V???? -mn?n??0;8;??;?ts????Cn???M?]v -??e?i?ut?'??'I??w?TT?Dh?d?Il?k????W%- -endstream -endobj -324 0 obj << -/Type /FontDescriptor -/FontName /TZLUSU+NimbusMonL-Regu -/Flags 4 -/FontBBox [-12 -237 650 811] -/Ascent 625 -/CapHeight 557 -/Descent -147 -/ItalicAngle 0 -/StemV 41 -/XHeight 426 -/CharSet (/A/B/C/D/E/F/G/H/I/J/M/O/P/S/T/a/b/braceleft/braceright/bracketleft/bracketright/c/comma/d/e/f/g/h/i/j/k/l/m/n/o/one/p/parenleft/parenright/r/s/semicolon/t/two/u/underscore/v/w/y) -/FontFile 323 0 R ->> endobj -325 0 obj << -/Length1 1608 -/Length2 10163 -/Length3 0 -/Length 10992 -/Filter /FlateDecode ->> -stream -x??veT???5?wk??C??\?C????;?? ??;$???????????u??5s?Z????kW?????RE?E? b????X8X?J [gGuc??8?? ?f?A???p;? `Ic'?@ h??89???(4 ?????? @????????O?_!?????tY??o.@??-???????,?s? - ???#?$??Q???@c???? -??2?? s????)l??4G?7,1G?1??h -z?t5???b?lA??o??#??????'6?q6??????7!;?[???? -L???h??s?eU???O'Kc??r;?????[???????????y??A`G?????\&@???????-????o?? ???0??f6 at G?7?7?????:??zc;;??oC???/ 'G??9+ -?[NS??? 0 -?_?"6?8??a7s??O? ?????53 o$?? `7???M ???@??S???'??A????y?o???F?m?????????66J??o?????8?1?_??-??????@-???O rN?om[?I????#?Q? -4S9?Z??m?z??]lt???oZ??F ???4,A????????? 6?W?o????MBM???4????G??????f?F???P?????/ qq?+????? ??????l?\~n~??!??@?<+;9?\zoE?s?]???y2?)?)???9Qw2?????r?:;8?)??????????t??,?BL?R??:Ud?K?u?s????h???????I Y?/??T?Z;*???6s`??%?????oC?; x?M?E?????L??????fX??z??q:?? -????y{}XU??? ?l?????????%???????iru4^+f-ve??!m??? -]?@_o??s??-??hdAc???'?/W5??_Y~ -d??P?v?#??WP??S?m????Y??s?????????%???%?2p???l`?l??U'*??~,2ak???L?M??0??VKC?? ?-y+jf?2k????:?M???m????E???J??l???S????C?????E1??b?5.???!?a lbvm?6?23????z-?l]??6?'??>?wj )???Vi-"??Q???D`L0?????V-#K}???vq?$?\??1i???[?9?}0????k?}:pr??hD??P?A??#?r[?v???,? ?M?Q?;EoJH???I??R^pr?H?^????&? -oso?L???\???c; -4?V???o ]?A??|???? -?9?j?[??^(???U? ??[???lYo?q????>? ???6?????K?,???,?? -?B???c??{??????? -?=?hV??????#R????%?@*?&M,?9*?0G? m????s_??IA??????G[??k?x?M??_????U??i=?@'????AGB?o?G?f`??f???J??d??9?wlAR_H&?9???x>?????!??g;?8??IU?O?m????n?e???/WE?yG ????=<.??[????r???)?s??qls,)E??FBR?KE#Xy???"N?(??m??X_??????A24??m.iR?????#?????[?4<^??$Q????x;?fg?_ha[(??k????1???????*?3v?UT?U?U?t??7i? ?8r????}IJU???1$X -P?[?? -Z??4E?j? ?Y? -E????A!_-D???/rC??H?B?]????g[6?y?M?*?S`?,;???! ?&????Z????l??h??1"?sj?uI??^?X? -<$&?&|x???????| Z?f?2??b?x?!?8??????_2???????????H??? ???'??Hm???+??cy??M?F6??????p|??????T?a????;?Q?z???????B???37?J?K?????>??O??\??EFU#?i????????????w???_?6N???u -spP???(??T?*?&??_%???/??J??????}6???????(?UC???dX*'Q?,??s???n? ?J?????>???????????u*?a??B???_?e,. ??a?P`??N??B??HS?e??K?PE?{?????????[y?i0m.?????b&?#??????]Y? -?j????? j?????????n{x?D???y5?F????Z+?;??&??\}Y?{52?*??6'?$??y?}????}?????2?+?F+?4??&8????|?p-? ?(?r????????????C??;?4??y??????????A{uN;???2????k???????].?wy??`???2?c!??s?5Vb? -? ??1???????xW?sh????w?)?E??K?wtZ?????) -y)????x??0_????/?*??z]iE?c????B?????Es?.??T??A?]=3ACw??6=?EX???i?XW??|h???va%?,????sL?????n? -???&,6????b??? -c?&3????J??A? FR?b?1z?? ???`?U?^td=?i?[??g?#r8?@-??, ??~?g?v_?/"??!????R8?? ?Q$?9?=~??\Y2?VW??????w2? 1?+??:?,??y??#\???8???????????????yS?Q?eEF"?m???NE?.?V3b??eJB -???I??????.l?^=?H???????J5?E??y? ????? ~^I?Gw?? ??? ?V(,??v.b]?????????g??%@????:?]??~???J???y??o`??C?"?|??SS]???zM??????;g[?x?f???&??8??????g????`K???L??;??$QY?qM??L ?/(e???H???|TH???P?r????K?[???%q?Au8???cj??V` ?eg?#?0??+e????"&X??DT^????(T -e?g?????v??*e??4J[??-??TL ??80f?|.???Z -|?*Qw?1c?? ?~?7~?z}??????? ??Ps?%?N??d?i??WE??AE(g??W>2a???w??=O?[?l?}kU????L??S3;??? -{??MRX?2?????}w6?????^?j?m1?'?4?????LWS#???d????:F`?qi????\?Y?#?Qd?43???T????l?????gp?????!]~?Y`?_??&eA????4???.???6????k? ?X????:???wby???Q?;???5z$C??i???????L?P??J?h?:0?V?3???W?{h? ?c??????????O??????I???'?3?E_j/?n?L:?jul?`?v?f????????D???D&????v??R??a?y0????-?o -? 34Q?Rg}l2?M?g~?9??????o???qf????/??Sv?{???h?w??P??|??????y!{??X^(???Sj?k????w?4???e?T???N??+?????i>?5???Z(} ??)En?[ ?>J??*m'?aJ@????N??!m??mMS?=}6?T?~?Q"?????J???#/nC? -???zh???qwZ?.???????AvF??J?.?|DP`n????q???}???\$?k7?b4B?*?YSY?????"???,?z -#??9??wh?P?w?????:9???l??w2Z?c ???*7?F##??6?D?~??e$????c^v?d??P<]?+??iu? -?.?q  ??.??[?\?{F?3g????J+??J?????g?k?3?sh????????? ?????/??????Hlu???P8????x,?@Q?z???L???`[~ 9R?j[J?"?e???e6/ ???uv??q??~DiJ??V??.?h4??????$??y -?5?r??9C???^?U?g?lu?.,?*???~??Q???c????R?F???J??\?L??Lx??t??cYb?>?J?`:?????"?:?V_[f3?? ???G????d??k0??[????t|???X?V??\MG?z)? ?($l??Q,?_??/??3??C ??e?;?$?f?nN???*?/???zq-9 '?DO?B$?T?x?/1?????{0?#?p????????$N!m??s?0*$???W????,?0wYg??MS??)?<4?&??wHH?=k?nx?f?5U??NUp?A??r??y?2??????t???-I'O??3?V -?????????n??S.????BG%???z?_?@?i??x'f?^ ?:?i??k?p??????P?)nO????x?H?? ZT?`v?>#?=????f? ~P%?e????[x??A -)?Oq??f????;z??lJ????j???f'[9?S?????Hx??=??wBA???~S=?!?'???%?A??w?l??f?~? -??T??a???0?pO8????+<??m???\?.???d68??-???A5Q?[~H=?=^??l?-??$?1+?????H?hq????????N_` B??`?5s?? ?5!?????"m2????K?N~Ys??#Z?BM?w~[S0R?????U&V?3???z$?l????7~?kD?+y???????0Q?(F???`y?????4???Ogx?@??V???s??8?f??D?eUy???k? l??g?[gZ???r?'?PD??????_*?u?PEN:y??????V???e????Z?(nXI??f -??g~??d[P4??+??qmQ?^.n?uK?Z?fa?}??j???6m?????????????F????S]??&o?t???hg?l*?=????k?=??8??S?~d ?qt?)?c???????(Nj???,0H2I??}+wX??????H?k<1??_?+?Z???>o<$*???????? f??#?????@/?:?~?|tC? ??5????}V??+??i??G??c???C?Z?|???^?u???r?6?'N ?Q?h?%???C? ???}BU{7?r,?W;???k??iy(?g?a??"'L?9?? ;bO??H?V7?H??]??5?j? (}??????"?3?K?b????>D???? -I ?????S??8Q[F5#?K6???j?????????-z?6???1?f"??:c??}m~??? C?:~"???;??? -X?l?c?r?Xx???.6?K???p?dck3???,??^?Z{2?V???4???[q?$?\1+8? -???Z?l\cU?Y??d%k?*y?`?9^bp$X???x 0~P????'K??.v??(?G?? -??????m?j??\'???%)??O???????(w0??????VF?E?????u.W?P?Y?JV???????$r???T_?f?vIQ$*???? ????? -???r???Gv???!6=R6??? ??*?Nu????R??h. -u?"????C??r????J?kLP? ???S??FN??]0?FB? -e??$????=/???d -?+?? ???FG???UV L??D??>V?????[?W+lK>F -?V??h?9=@01C???j?PG-?L???q??7?x????>?_??????kG?x?6?u??H????????Y??K/q? ??*?-:????Z?=M??O ? 3#??4r???s??Fb???(??Y T?????/?????? -?\?0?]u???>??R??-??M?o?H -??v???N??!????F?7o?????U???????? -?\[[i?u???L?}q?=7d?m???l??u=??6??5>??W??8Z?????u'???????F??X?????A? ? ? ??n''???B?,;?/|?;KL?? ???D??0?????p??4W$? -vN?2?s???l)?-]?R ?2)??? %%H??"f???S?Z??4cK~[$aU??B-?V??|h-G????a?????^??1????"?l???+???`???Fk?F??0?5m?Q????4?DQ?r???@GR??? -????????!??%????????)???u????o?l????:U??(???c?eI|nA?"?????g?oO??Hb??x?K57????[7k???E'? ?????V?e?Oe<^[??r??(????Alv?T3?k??Im??=?C???*???$S???m?[???N????w'?5D??a??? *??R.?`?"?Z D???"? 9.?N -?s?????v?7+\??d}?y/r????G;?????_h??t?????E??%????;???=FM,??Dd?7?"????Q%?2h??P -?? u?C?jM???}?r? ???????O??Z?{?>??U1=1???!?M??5(??rx?L4???+??C???p?ix^??u:????4&?`?????v??`6FA?Hq???K~???????????cH?\?1Q???c?1nX?vt??1t??????????4????p????Ih;?u_??a?$G?+????????Ua??g?>?????p??h6{???}$?SZ?A??V?N??~??:?d",y???????????`xR??y?>(???k???Z6?%>Q??Q|Y?0? W{d??!9h?@???M?i??E'?w???????y?C?]???o1??Y ??d?r*?UA????????[\?????????S?\?sk9?????z?<^ ?????L????B???j_?uHWJXS?_?M?&??!??q?!?A???|???o?t?X???v????????????????+?~?"|,?MV?i*?H?@?Ze?O?Dgm??W?{?v??_b;?r#g1??Ac(?,?:y??,?J??? /n???4?x>???Lh?8??+?=4_3 -???Czo?u??;?"?V???????-?n????!?TMe3?P?98?tH?O+??0? r???$?&k?????y?+M????A???W?8 ?a???p%?|??.?7a?Yc??? "?W????? -?,[m]???G?W)?'???????pX"????+???h??jB????`Kj?S??0] ??????-????H?(~??@ l?L??K?g???I???? -W????6|?m|??\?y?]/9?????7U7)???/????~#3vhT??@?l(U*?w;??X??Ki??S?9iG}?q^???S?Vj?W" -[?S?j at 3Vy?>?M?1?T7??uU?????I?/?4??9??v???~?C3Z_?????(OE??|?|????=fA%???K}n????Wj?Q???^???4R?????(???-9e,????0??? -????B????SR??z -?6?n???s????y??Y???(?Y?t?h> endobj -327 0 obj << -/Length1 1166 -/Length2 6977 -/Length3 0 -/Length 7752 -/Filter /FlateDecode ->> -stream -x?uWe\U???AZJ? -Hw?tJI7(?????aS???%??t?H?4R?F?)?zx?;??{?}??a?9??c?1?,Z -mi+?P -q???????-\???!?Z@?#(`????r??~$da at sg"g????????a^n?(?????????@(L??C=@g ??0=??]?g? ?????????X?,?@??c?;?# ??s?f? ?ssrs????Z?>?v?;\???2R??V?b????????>????p? - <:?1????3?K??t??0?o???| ??D??Q??Fr??? `???,???uY?[??[???5?/??j??????YC? ?C??????_`??F#M??Z??%%?P?????????ig???????aQ?F??Q??CO???????p?4?;4?: ?>?1? -?J???s????4a:??*?????>?PmB??I? ?L p?6?y??~???.???o'"????? -!???".+?f/?j{L??????]????s?|??\P???????AIqF?+S??w?p??ER?[ g??lk_? -3???waB??)??t1?<0???0??* -b?b???\???~h????S3?[?G?#/?()?N?E^??k/????N/??r????s???+I???+$?|???I ?a=X?~????_%?3?U?\ ???(??(?HWVG?c?N????R{a/????????*d?9???D??-K2???????@[K N'???????8n???~? -\?tw#3??Pir?????ow^U??????0???%~m??H?t????U?????~?M6?M?3???m?5?Z?y]??H?_?v?|??>:!?|J????=??A=y????;?k.??c?2??:~?m????~?Q5k??)???!xMy??Ee?G'?#??E??H??F??g?????|3?U??E??x???6kx?jS4?$6?W[<2? ?_??*?sm? ?H2?? -?Imv????W?X6Mh??)?<(?????bG??h???"r??.?Xz?I??T$vT~??ef?/?z???C???nE6-??4~?0????"zN?\_x0i?z?f?$??]?'4?Cy?w??R?,p.?????k??M??'???Bm?OK?T?4E?Qk?E?????=?-?S?j? ????!?i??q?S%A5?>?i??{?+??7?TN?%??? ?3SR??m2 -???? ??6??~ W~?????4?(sS??>??K??bA?e???=|O%??HK>?==AMyh?!?z?c??? ???g?????x?2??'4???J??[>QIw??d? )??? /???O????!{)M?#?? -?%??????9?'??1??????k????J??<6??j?l|o?u2??Z????>? -?6?2su? -yX???????"??n????v?G(??@?? ?BU????!??!.?X?????[ ?C?u??2:>WS??U??9jzAs?O?Zu??9????N?? -Kh???T?? -??u??? -j??K???&??>n!U?gE?2???? -TK?w6?.?P? `,??? 90?????????O????U?wz??=?:?vd??8??k?"??m?2?m??/? -r???'???e????L???w?O,a?C/???_??}Dlfy?d??4??*?_::,m?Y?]?^a?????0 G?]??E???v:??-6;xI?/zv?vG?O0f?7?\?????dhS-8???^??wY??P????)t????.?L? K?o? +?x????%<$#q??D?( ???????>???@??zy%?f?????Z{?%?2T????Ve??%??9 -(????sT??B0?m??k?wE?????m-? -Q??"z[????2R?j??V????o?????`??1?&??mBK?????7?np??N ?0?"?????w??j???H -? ?????g?Z?y?T?Hm?M??? ???.???????q????I??6???l????V??)?A ?N%02?{c?????`?k52?????V?|W???Y????~???W? -???B????/????2fd?P; -??M???????+??S??Fu??E ? -??.???V#?q=/?????3????4 ??s]T?????n?)/ ???#?|{?e?[pk5??|FC?}T)'??eV?->4??G?2???t? Q?6O;(??rwhR?!??[?2???????< ?N]*???g?lud??d`=??w[_aX????r? ??L|?kD?M?\?nu?z?.? ???a??s?{ayBi?? 3?????<;H?s??Vi???cojco_??6v'???x???9?[V??4?f^?(??MLSq???2???r??h? T??*????I<.?,??9? ?????d? v?u??U)?'?9?Q?b?y?I}???X?????#????Eb??Qr?V,???????`M?tq?&e5???]?T9???)? ?:??????Y???;6?2?L?k&{3??r?/??/1??B7E?A -??k7?@??VA3N% -$????#%/?L??7???to??R~?My`i???a?5????,??????a???-@??O,????? ???V?x???^??CRGX?+??D)1??????d??Q???Y{:r ?V2?T OT??j??????#)8????{7?? -?????"#????Z?A??>J?$???"?Qe????????W????,wJ?9????H?p%?k>?2??????M? ?:6?lS?1?W?f?? -y?|B"??R;3????????aT?F??Y[??m???Q?C-?5?pK???????y??T?X??+??Zb_a??U?\??.}!?o]/:?.?5??&1t?oq`?0??v???8???6$?@?`?S? R??:lXf?;?o???u???.p-?|?????mqtSk4+Y????:/B???????=??????4?\=h#?h?@0??G?????/??~?=??\R?[?.??Hw??xU??2?U0??JhI??L???????VMm.?-:v??{??????+????N???l?.?S??????O?1??????ex? -??w"i???O?T??>???NF??rR?!?>??|!!??}?"?,S?U=n1~?JV????????Y???s?5?t????k??PQ?????S>qo1?Y???c???C?O]C?VV ?k??;???7?9xz???(P*g???`??j????`.????}?#$?yg????0?l?~b at VsePY?.?Q 6f???u???3}?h -? ??3o?$p*??S?)????g#a?)H??a?^?YG7vP]?h>?m??????;??*?un?2IFG?e!&?HU??????\?G\?E`??y?D?'O?.?????c??N?e???^???i?1??t?z?#'!?3{q??????)?9?2B????i?+?????b??G2?a????F32hra?iOy?<)a???Leh??Z?E?7?E??&??O?]1u:?eL?M?H??Z-?:?~?"N???????]qf}???XjY ??P?d???AV?b]???x?E?@?C????4?.???*eKaTaRhw?????n? -?3??S????]EJuxF??A??T????r?O}?x?????a(Aiy?????y???b??)T??^?T?1?"y??????_???i$?w??~4A??z???S???~????MB?o?1 -??!?z; -+? -?}n????? ???~??G\?C? ?????o?J  ?\????&J?????`on??7???~9?'?x???b?q?Md?Wd~?6.??8~O?7<=1???R??????M?]6????(EQ18?;??LG????!???3???DTF=??c???5???e??>?U??T???[ ??O????? kL??13 -M???m? -?]ZYm??l??????t{?\t????^Dsj4 ?\???ei?????iA?&?X?H???Z?)??n -???I??~?w3?lbK???1?????A???$f?Q7p^??d???G6u(?R??]? -O? ???,??DQ3?2eb???,?~?????L`;??,????? 2??>v?Q??^? -??.z??30?]??????h???\?K?G????${???q'??O???VjU?b????a?1??????tt??1?A???`lB?_???e2,?*tn??E&??8?????>1x?q???wv-???L?s??U????F???V??Tk7?X?Gm?q?">i? >??[?|b?l=??,rqq??h8??g?7y?? R???4Y???H???RU:6??R??>???w|>?Ja??????F?????+?%?^8???b??Z?Twx???pJOnQ?^???Z??]A????/??O??#??w??????:o?'???????cY`5????{r???gy?l??)?=?z??<&?G???)G???T?u??.1?vN?5h??C? N??)~l?\???nx?CpL?5z???Mj?VD??,???C? -????k?&J?? -?;~???%? -endstream -endobj -328 0 obj << -/Type /FontDescriptor -/FontName /ZMBSGR+NimbusSanL-Regu -/Flags 4 -/FontBBox [-174 -285 1001 953] -/Ascent 712 -/CapHeight 712 -/Descent -213 -/ItalicAngle 0 -/StemV 85 -/XHeight 523 -/CharSet (/A/B/C/D/F/H/I/M/N/P/S/T/a/b/c/comma/d/e/f/five/four/g/h/hyphen/i/j/k/l/m/n/o/one/p/parenleft/parenright/period/quotedbl/r/s/six/slash/t/three/two/u/v/w/x/y) -/FontFile 327 0 R ->> endobj -329 0 obj << -/Length1 1626 -/Length2 7736 -/Length3 0 -/Length 8565 -/Filter /FlateDecode ->> -stream -x??TeX????ST:?tw?tw??????????.i)??n? )Q?;?;A???3?73f?????g?????? ??,?C??????o??r????(??2?j??,????'P?q ?:?Gn???*???o))?;????_?????x? ?s??%?q???jw????????~?:?? -F????6?psG???????m????(????????vrYb?MC,E?mS?S?5???2F??\?!??z???J??????s?D?@?()??"M??????N(M?NQ ???Q?????v_G???~????????AU???if ????E`{?R?????S??/?sA@??/???+????????]Da??B?(?i??'C?,?? -?D1N_F?6?????1???d ???{2?,Y ? ???I\???3}2xW?j!L}??^?? -A???????~???hf????%?cd?Y??????H /L???u7??\??Q? -?2????3,D???df??????d??m??3????????uwKile?TI?y???????oL??M??d?oc????I???iF?????C??2????6t|??? -???s?o;?z?a???wLP?????oi???$TwR]7-?:?"Io??W\Oe?@??E??^=l#?f?[??{Z>?w?IO???}s5y????v?9? -^?[??l?b/D????N?"e????oB??x?#??g>??~?c??Er/6Z?=?_??yN? -???N????????5p[3???97?]?yM`??4??:?s? -??[???I??h|???T vg<Ug?g@?????=?[?B??!'s?I????@>3??? X? -*??X?~c?VB????E????D?,us???Rl??L;v?rz? ~+??J??q?{UZ?{_|_??????f???n?b????]?8?????i????Rv??n??5??????U.+b??I?????!?H?}?????u?????s?TN????Z???,?7B??v????I?$?B?H?UP??5j?C??j/????r?S?5Gb -?W~?Ua??B?j?\????H:j-\ah?&????mZE??C???FmR?H?Xe?d?????mM?'? ?l?G??&,??/?????>?j?4???E(V?|l.??(x\???'#?qY???[/;J???D?8:?[????f???oh*????????Q?]}?? -|0?n???????l ?Kx??YpBX??Z7??V?x=?W.;???#?? ?=?Ayy????;??+?????6???0?w???wzD?????>OU,?3????????G?r??EU%w?q??&n?n??I ??I -Ao(?b,???[????&????_??&?-?@?5?????%?*??tf???-?P0??s|!kl?F:??+?n?0+??_?cn?T?W2w+??????O??>NT8???K???'??1?;??fui???e??N????u????FHW?*??\A`??&Rhk??P?)~2?2Z??Q|E[???-??????=[]#:???0# -?"{??dSq????H???????G?*?? ??z+??x.??'6?3%????]?????Z????[???????"??}%{?J~fV??r???/1?b?q???2!"??MwS???*>K??h0??F???3e???f?? 7?y&??i#??? ??7??;?H??Qk -?????t??????6< d?m??m?#8????N?????E??idw?9?0cpxv???a???B????????4????3)?"?%4{ -?E?2?;?|????@q6???@???r at A)0 -???H?k?[?UV T??f??_?;l??Z?u????M??Kxns<5G??Q??l?77?g?Z+x\?B??I?^?}r??o? -?$??6>??b6?.??D>Sp??a? -r?[??T -?!]??q??4??{??zlk?CWo??>?:%??W????`?????A-??0.????t?????z '?uu???U?)?I?$??j ?JW ?????nk??s???+?|(n?n??k??????N????7?L?It)Q?j???+)?? ?(??* ?}4???? ????? ??pk??Y?#??Es?'?????o?>?k??????B@??-????0E"ZO?G&???z?.[??W#??+????Y????V????I9B??2??Fm??,2C???? ?eqh????ZE?F1?????.?~?3:;?*? ??<1-2X[???u???1?)???G.?H????M?R????n&? ???'#?? ?????>????B??.??oM???(0??,???yM???<,??E?f?^???Z4??21w@??s????@??o??R????p80*(T?|?+0 $?6+fb~??&??e?XBv?D?s?Q1Jd?xL???K???B??????jm???8?????e?\?R??a|????xbC%t? ???bN??L???U?KJ&? ?_ -8?1???????rQ?j2????j????a|ES!??R?6Ti?HD???*?[??Y??:^kF?????Lc????|?????=?i-?Q??Z?)b??2?????V'u%??????L, -?'=?Kf[???v??OuDV?q????????(??O??g???A??/??S\L?|*?n?cg????????;X?2-? ??&???~?D?o?9?:???|?????@?md?.????#?R72??4u?A?!? ????eBI?"[??????XO?N???N?Np?P[M?TJE?k???g/??e?Bz??O? ?9C?????????a)??b`??q??e??F????y???&&\????>2]?}xt?<#?Cd?Z??}?z?? ?^T???I??`$m??%^????zG?X?T?)?????-??}^?V?1Q???NS?y?>? ???1???.O?Ex?Ws? +?a[L!?;"?t???@?c7?Z??A?.???9h?7??? -??????&??v??g?|??n?? C???R\Y ??j:?H???kxDa? -w?0?9G?ah??zL,???6f}U/???J??S?k&L?C?W?zi???`????#/??Qr??M???????I??????,???Y??h ?X??Q?*???"i??? -!????z9?=?ZI???x????&??a??O??2???|J????????N???P??$?`57?A.??A?$ z??*???1|?????}?]?{N???#?5?Yx?El??3????!????qI??kI: *;?f5H?0?P:????n??0??????/?$??S??8???#?!W?D??5?f??????G?]???]???#?.?o -,V?&O?#D???q??>'I?R??5;e?rd;C?}y???G??9i?:[?{??7 ???KB???L??e?????????/ -??DU??IR?)B? -~????it?7?HN?-?C?9j_Q???<=jx??x??!I? -??0]???+f????6??-????{??3??D7?F????Y???? ????1wU???$}??c?o6[c?H?{Y??k?~2?X?.????z???/i???%?LX? K??1)?Z?miq?????H@?",???R?}b?X?v-?zs?Z???}??X?WJ?:?fmA?Lp~?? <?^GXjy??[!?$????UY&dzND -?PO???qm?><?????%\45?To??y?k???{?????O??qo??u52???'Ns?a?{????N?)?9??u?c??8??$??g??_?? -?^h/!f??s??????^X%?A?+??P?j????XS????#?AH???b??b??p??W??7[Z?nZ?'?d? -+???????`O,?3O?F|???~U??En?b -???%????6!Y?????D????>????????=??O?q5?WK??>'??d??g?>?ed0I?[/????oV????E???y??@/?{9eZY.u?vG??zd8?@???????????Y?% -??5?J? -q?J???????? - ???????3??????v?-??<:?? )?????>?ec_St?? ??'?Mx????#?u[C???g????[2? yH?@?y?r?N4??????FY?9X???e?????G??#?i?e6?M???>?^???NN6?[O$"???0pn?????@??G????|(,xv???8P???lv -|?? -?'?0F:??????IO??????Z??????Q?@??:?G5v+??$}?,??4y?BqmR??? ?FL????`???{??*????T~U???4????3s??9~??????|~?9????????ats??.Bu??@??#p??L??Wv??an ??2???????J?!6?Tl???q???? ? ??O?;?????i??????~?s???_?S?????}??W?/????T?]???UW^Wt~?=???$??fIz~??5Q?ki,G????Ep]????#??c??^B?????M?{P???M??'???-??2>,\?????????+?xr?'??C???S?&?$?????UX??|: -V???u???.??6?? -?aj?!!8??????Q1?u??.,????O?DF?c?7_??D?_??~ -?*8??"g?>',s???o -?hw|???d`?L=3??vY?i?Dd{I?~? ??4?T+D??&??t1?k?L???;%N?t??????d F2V?Q??iw|r[d q?,?_????T?-???=?Z????U?>?K??k3?(IO)S??E6????)?$b63E? ????)?G??^???u???l?N??5???C???????{??a???X??]{?`?V."??v?)??om?'?l?????} -?T???u?;5??!? -l???N??*???z#??Q?;?r?X1N:??E19 ???????+eg^f?M?/Q -r??/?,???c??? ????U Wt?j[> endobj -331 0 obj << -/Length1 1630 -/Length2 15197 -/Length3 0 -/Length 16037 -/Filter /FlateDecode ->> -stream -x???ct???&??X+?m???b?6+?mWP?SA?????|????O??u??>????5q?{.rb%Uza3????+=3@?????E??N??[?^h???g?#'u?Z9???y?@3????`????#?:8z9[YX???U4?ii??S?? ????,#]?,??????v@{??????@ ??0??D???$T? -?I?=?????fbke -??2?????? S{3?Zsa??%?0?8M???=M??????@g;+???+????????:??Mm???)?????_9:;????k? ?????b?l?? -??UIL??u?Z????????`??????????e? ???jle?pz????0?rq?5????/??????ps????? -??@ cg3[???_????L????/?;:?z?+??_^??+W??93?????s[X??1??+???f???????t????????E?9??z???p? -?S???Xf??#???????[??#??r????\z.????oA?,l~????b?OY????????o&?u??~?)??q{S?VG????????O??fS7g??$????????=? 4?[]r0? -????tm?????c s,oV+) -?s? -?????6z?ch?????Z??$I?????o5???%?????&? ???x+????%? ???OT -*!???l??D3) -&.?Lem????l?????H1B -??U)?B?q?]?a?{@j?2s???G???????2Z0????i?6x??`??7=F???%?????Om@???i??T{lt8?P?;?????g/~/??? ??&\?u?k?I???-?sl?t???????????f???@3 -]mJ?[?U??3??S?f?Q.Gy?(G??+?K?[+iFZ?5 ?T*?+V?n?b^a?????????????H?UD ???^ E ?N??D???2?? -?L?04oOY -??@a?????1I????E?????????? -?m7V??6a?B???V?B????kw??P?^?t\A??T.L???P?(?v?2%\gA??Zi>?/?@F?????~???????lC+` v~???zKz dS???A??l?2??x??/WC? ???=>?'??[I3l??X/?????????A?D?t??\????r?C???ZC" -??4u??vI???Tur-?:3'o???????W???V?)Pj?>V ???3?&?,p??(k|?????vZv?? ?UcN?o??F???b?{?|??B???P???\I???c??d???s??C??%K ?*{??+? ??Q?p?<? ?????Q????;??v?i?w???-y?? a???U??,?J5V????'???{?? ???_?3`yI??????$???a?^??F??z3A?*[???Rit?r?m= Q??gOT3TG+?Q??8?%Ju?N?Wj-[???)?2???,b?6?i?? F?s??c-|??_?t????+5X -d??????????F?S=p??_6?Am?TCG???mM??t???Z???l??BP?3:7??;*Y6Hj+??MI??????????/?2???l???^Q??c(?2 ?N??2E?-?B??z.A7?qHt??? -C?'???Q?+?J????b???! -???QSk? ;??6c?#??-?xj??????????????ryU?????O*?U?(8U3????'????[PNK?Lk???C????/?i? n\^????????_.??????+M???S}/?$??AU>/?!#?#???? -???}?(b?>v>RS,?\@??S????zf??y????@I???w??p??{??~r< }???#???L??B ????F?? -?Ef?+??u???????"??? Gx???E???7?????\??f??n?o??D?????A?5!5w??0%0?3???K????? -D$??W!???xz?,???ma???Cpv?: `???.?>?-??,?{?905F??z8\?J????R?+????L????ps at z?Ir????o?qrzV???D:??QM????????EP5?!???WN???? -??j?? ?\ a????7?D6O?c?_?}?1?>???e?2??X??!???9???~d??VW?9?QNL????!?!??????@*Ds??#?Y5???@d?3O??{=|?)???R???(oWv???4?G?8???6??)?8? ??X?z??????r???'???`+?%$?p?K5d?<:A??x ??2??b?gakU,????p??3???-YA?q(H?????$2??h??j:??%?\fN??&?+?;??d J?_D?C=6Wo?? I?\?s?????l??rs???RV?.??B?:????? -?????????`?]%?A????2??l{"???????^????(?????t?? ????%?.9?n?n?"SN?3?3??,??)???? Z0????s(AS?f?6\?'????K?????<?p-k??Y??Hw7,????? $ye??J????~v=?u?~g??p??7?/??9??????? -?;?f -???r???YK??Q??NW???Mi5??i.R??_?Y????9?#R~)? ?V\??8????C?B?x????(?!$???K.??eM ????t?{?M?]\[4????'????H.???{ ?cf??O?S???>???P3m?4?n?D!e??c?^?G??| ????6?5????!m?k$s??,?? -?Lf?(#B?*?Ucv?+s???a?p?&oYr{~>R ?7?R&????A????q????????$??hK?hk????T?Sk*B?[s]]???wD??=|?Y??ogO????????? -?FdU?K&?t?v/???DL/?F?0???????-?[???{?4o??UC?Z???wO?;???Q???????$?)H?"?"???@~ n??v?????M(??+?&?d?V?R?????m ??"???? E???=;}(?hI???X]T??\f?????x^?s?{#??W??B?y$???p8???????h???'X??]?i;?X??N??Qc(?K?DG???L?+???C?k??2???? -??????(??0???m+???o?????B??c??9?Si?E -??r?{)R?(LH3?r?($?'v?U?9????J??)????????h?O?xU????y???????W??f#o}?Qj5J????eK??0?i?M??C,?`?MD?;??&o?Of???B?:?8????y%??Qe????????a( --?%E?U~[~n?u?%?7h\8?n??bk??!?r+BQ?vvw???Y??5q}?? ????'0qj?@Sh7?f????;?q?????i??'L? ?D?xH@?L??;?p?~2|?nAU???TpaN!T?~-gv?Z???-v????,?N????%??!?m?? -Q?\?*}??m??f,??C^.?Uf?e??(;8W????? [??????k??1?U????m?? ????R???1??wH???2O?cR???]M2?wC ?????qa?? {]??m+I+?s5???$??,?nX??>??`I??\?lnZw"Y?:b???:?R?%C?X?&)fn%?_E?U?????y?]e???5??k8RM?Aob??#8 c?WB? X?? ?,? -,w?????9P?{?^:%???????`qe???|]?V#?????zJ??!?]^?~5 I???????????y?-'?,?z???T? ?? ?O?M-???"?9??7?p?Y?n?&k???1?V(?v?6,.d?=????R-??`r?F -?Z??9)??,K-?x at qC???g?M??z?V?0>F??|???Vwr???!i4???????cG\??P?7d???RPbRKx???C:?^?~a???f???????Y=Q???\????????R??n`c?D???1?Iq???????@???d?`??Qv/7?8?M?o????????????Q-l*?2n??ox?Av?^w]???J??U?t?????zz????8??J??p?v7}?s~7>?z??8k???d?ULZW1NvYRo?????????h8d?`P?@??? -??n_??? ^S^?eW?_V?????V??0????j????k?MC'b???i?u???? ????????!?jY=??j???F$A?Y???L?!3?1?m??? ?IcG^?#?C????s E?mH??ii?????Wl????n?K!?v?^?f4l??(??? -?M???Vk?~?G?h?? D5?? ?????A?"??.????Wl?Y?!??? ??? -???_5????_;?v???R??Hk_v??kNj*r?0?- -?)??  -K*??f?|?????????j??>E2y?d?6?b?$??m?h>Jm?} ?>???8"???????????z??!????2?????^&)'???*??x?m???fLS????-v????s -ik??wC?Y?)OP?j3??T???_????xe=? h???=e?by:b,??p?W00"???Bk~-??e|?Sj???&??<? -W?B~?-I -?x'??S??Z???hD7?Q?G????????f3?????4t??ZK???S?ob?T??="???????????mX?Y{??qp?2s?~/?,??????5;[v??g????7?QE????Z??u?Jx?5??{????v>???'k??*??^??*?OR? Z$???=??Y?9??J?K?(fHS;[Y6^<+??c74D0gw?????:d8???[O??d?)a??%??RG?&??Et?r[??r8??&??x?y?????T*zy?N??????s$??9wP[v?l???~yua???9??E?!??+?wo???_0qcf??Z0^?Z??Lr?b??Z??i?J????zL???V??c?Wi?y?zBj?q?h??Jv_=?????J?x?VXOt???6???"? ?Abg?BH??{??H8?r;?XQ?X?{&?8o???$??j'k??t?m??z+D2i???HC+/ ?m???:4?1$v??? ??X|.???D???=?P???+?]4?????4? ?H??Lx]??????y?p?m??f??r???? ???F?:?W??DNk???bU?*??N?P??"?j???Vq?????????82=??h[?O?W??Ra(?I???????/???#*?DRd?iu2aW?S?U??F??H>???L?c? ZC/g? -???( E????[???}2(??N?Q????L???A?|?][?8??5???7?Cu?R?Q?:?3w*?/?MW?p?<>?Q!?u???4F?]?????\^?????f?k0PM?[??`C?%?? ???\?W:f?zE?TF-??s?]????3?[?2d?#a??2n?34??R???{?????7??@?????B]?@??~K??4??b??m?+????.h?????!??7???j?>jo/m???????????????O??c?b[5>>??8E????U?5>?????k4??^1?va&?z????????4cfWN?????t?dJ)?N?d?????D{?sVu.[?d-?f??????TV??^??&?{:pV??5?jIyo???]??????!????+?;????( ?L????,???S?0>B???!?u #?i??LF ????;0z??v????-?d$ /,y?? ??z+?'J??0=????o)?.M??e?Xa?oX????1????6???x?p???SYc?|lA) -X?,?????qy????R+???M,??=???/?;?)?76?E??? -G?? ?|?(?Q_??? -?;? -??54???u?? -Y4r??8v?[??8)?g;????0???B??Z??mE?y??{9????????KEk?W???};(?Z???f(?C?7?????V;GV??????e???F?3!??04V????eh8?q??_-{?z???>?3??Q3???4X??q?!???\??y???&?a?r+rt ?]??@?,???l???@??X??}??i?,%???A?F?hc??,????_0?]7? AaaA6f?-#?}??s????U~H??Y -?Fr??\ -1?r???C??+??????????9???F????x 1 ??q?7?x, -???j+??,?G7hhr???+??7}?,m?|??g????????N?\?W1?q?Z?5"; ?$h?????_??{+?O^=Z??=e[???P?8???Y7???]a??q50?*?ju???QV??[???A??S?,(??k?h?l"?u>??;??Of??k?`Bh???#???N?/????obk?'?8H?H?H~#????=%xe?c??"!?E??F:?????%Eigo~????l ??U?g?~q?1,?= 3???_#?? ??v??`??7O?o~u?????i??"o????O?%?!???eA???e???8=!???K?sP*??(>??? ????i???TB?????T??_~#*?h?x(L*UK??8?????Y???,m??nE?Z?mu??1?&H]s?*???N?H??k5?@UJA??8^W?5r??????C?+???%s??7???Y j????????f?|~???b????s?C?Vl??**?'-&O!y???Oz???PQ8R???l?]Q??4A???,??yp??O??F???kmsL# -?A{?.Iy?Sp???5????B?W_?Y?I?Q?]????sY)???w9???#7?1mvf( -?n -?Uh^B??'?'ld?aC?X-=e?2??Z?8*?/l???}??C????|???56S???q?????p??U}?oC?,?'=?????m???4l???^????Q?NQ????PPF??????-5????6?(=I??Y?U?(%?D@????Er??z ???Cj??R?C>??6??)??D????????'?4?z'?v?9??rn?6??A?[q?? -?6g?S9?b??z??J???????_??!wY ?????P:??????Kq?!?i?j??????w???&$-?????2??zGD???&?????r???wTK?????,Q?j??u????W??X??Q?@??=??????~?NS???????Tq??~???`?2?g??h???????Z??.T???m?C???'????K?X??nu??~?#V???N?N???&n??Sg?4h???O8?????????c?h\?:W?N -L?QZ))?g~???l0e?S??|r?????w????? ??d??D?#aO?O????[????????.??X -L??s#?[??6J-x????]d?@???o????H??`?j????S??? )?DuS??D?Hz?b?T?q?????;?}????{?6?H,?3?wd3(>?-???%f?v,E? -zq -7??F??v}?%?`??[(??n????3'Rzb??F`S?^4? ?\?4?P???$&(?\??q?????;? T??%?c%l0_ EY???w??????Br'&l14\#?GU Ne?????H?"~?D??2??}??T4 -??#?????~E|?6t3 ?G???~??MN????cq???<?+??+S??`???8?=???nf?/?V>?zP?? ?I??k?????????U??????l\0?fFt~?P??Ppug{???`y???8S?J??????f?#??S2J,?????m???lDs?[P?.?)?"'6?????t?????z????Ko?a??m? ?j?|?aA??? -?(?zB1f%V?Y?????????????m??#???????????????*??"?r<?????fx?" ????????S l|o9???&???^??????Q??u??1q?PS??(???[????l.PO?a?c?Sj?N;.w??]?}??Q ??n?`}O6(?xc????,???1)??_ ???????????2??p?fm????#??0?K????b+?) ??h??.???i?w??H%,?D??? T?g?&?`x?S -"f^?F!r?(?????bC0>v?J???Q(?Tw??^ '?HBW??MZ?tT?u?v?O????,?#???@??????`?????????x{r??n?t_????4f?+,b??y#+?????? -?*?hu??m?=??;??.??$?U?L[??[?? ?d?B0h???)m?T?????bM??|????U??*v?X?^p?ri \???p -??? ??x????????&?0?-'^4 ?????&????M??????SW???oxf?8?F??Y?O???[??q??5,w??Z?"!????5(l????b??`???C3?x?(aso;??? -???7o??}hg??z??L??Q?? -???????????#D~W),?W:?r??? ?}?$?='L[?`????????94??h?f?^???????????#xZ??u??A???????r??????y|??C???G]?9G?B?hh??????J at X???? -????V9"??t?N!?}NV+??N?6]?+?f?ud????,gG4s?mI&<{? -C???9N?u??^ 7mO?3?O!?4J?tn??5??j?????^G4D7^???\??~[????`?)?TB?????????&^?e?M5???.?KCw???q?n? m?q -?N???_J?????D????*b??dNtU?[l7B?8%?Mv{MT??o?4????7?q ??{&?????9Ke?`~????d??y????M?n?1ua?a?LuB8???T?????,???W???pW??@?#?Sq??|^J?????????? -bF??I -y?w&?E??????????????v?a??* =S??#V??g???cN??P?O?PK?n'!?|?>5????'??????????It??'?x?3????k???|6??%???h>???o?? 6???"???????????]oH9S?qo????Sq?{I?> endobj -317 0 obj << -/Type /Encoding -/Differences [2/fi/fl 34/quotedbl 39/quoteright/parenleft/parenright 44/comma/hyphen/period/slash/zero/one/two/three/four/five/six/seven/eight/nine 59/semicolon 65/A/B/C/D/E/F/G/H/I/J 77/M/N/O/P 83/S/T 87/W 91/bracketleft 93/bracketright 95/underscore 97/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/braceleft 125/braceright] ->> endobj -191 0 obj << -/Type /Font -/Subtype /Type1 -/BaseFont /TZLUSU+NimbusMonL-Regu -/FontDescriptor 324 0 R -/FirstChar 40 -/LastChar 125 -/Widths 318 0 R -/Encoding 317 0 R ->> endobj -141 0 obj << -/Type /Font -/Subtype /Type1 -/BaseFont /CRAVFF+NimbusSanL-Bold -/FontDescriptor 326 0 R -/FirstChar 46 -/LastChar 121 -/Widths 320 0 R -/Encoding 317 0 R ->> endobj -139 0 obj << -/Type /Font -/Subtype /Type1 -/BaseFont /ZMBSGR+NimbusSanL-Regu -/FontDescriptor 328 0 R -/FirstChar 34 -/LastChar 121 -/Widths 321 0 R -/Encoding 317 0 R ->> endobj -180 0 obj << -/Type /Font -/Subtype /Type1 -/BaseFont /DIXNGO+NimbusRomNo9L-Medi -/FontDescriptor 330 0 R -/FirstChar 49 -/LastChar 119 -/Widths 319 0 R -/Encoding 317 0 R ->> endobj -138 0 obj << -/Type /Font -/Subtype /Type1 -/BaseFont /SIGNJG+NimbusRomNo9L-Regu -/FontDescriptor 332 0 R -/FirstChar 2 -/LastChar 122 -/Widths 322 0 R -/Encoding 317 0 R ->> endobj -142 0 obj << -/Type /Pages -/Count 6 -/Parent 333 0 R -/Kids [134 0 R 177 0 R 182 0 R 205 0 R 235 0 R 260 0 R] ->> endobj -303 0 obj << -/Type /Pages -/Count 2 -/Parent 333 0 R -/Kids [283 0 R 308 0 R] ->> endobj -333 0 obj << -/Type /Pages -/Count 8 -/Kids [142 0 R 303 0 R] ->> endobj -334 0 obj << -/Type /Outlines -/First 3 0 R -/Last 7 0 R -/Count 2 ->> endobj -131 0 obj << -/Title 132 0 R -/A 129 0 R -/Parent 111 0 R -/Prev 127 0 R ->> endobj -127 0 obj << -/Title 128 0 R -/A 125 0 R -/Parent 111 0 R -/Prev 123 0 R -/Next 131 0 R ->> endobj -123 0 obj << -/Title 124 0 R -/A 121 0 R -/Parent 111 0 R -/Prev 119 0 R -/Next 127 0 R ->> endobj -119 0 obj << -/Title 120 0 R -/A 117 0 R -/Parent 111 0 R -/Prev 115 0 R -/Next 123 0 R ->> endobj -115 0 obj << -/Title 116 0 R -/A 113 0 R -/Parent 111 0 R -/Next 119 0 R ->> endobj -111 0 obj << -/Title 112 0 R -/A 109 0 R -/Parent 7 0 R -/Prev 43 0 R -/First 115 0 R -/Last 131 0 R -/Count -5 ->> endobj -107 0 obj << -/Title 108 0 R -/A 105 0 R -/Parent 43 0 R -/Prev 103 0 R ->> endobj -103 0 obj << -/Title 104 0 R -/A 101 0 R -/Parent 43 0 R -/Prev 99 0 R -/Next 107 0 R ->> endobj -99 0 obj << -/Title 100 0 R -/A 97 0 R -/Parent 43 0 R -/Prev 95 0 R -/Next 103 0 R ->> endobj -95 0 obj << -/Title 96 0 R -/A 93 0 R -/Parent 43 0 R -/Prev 91 0 R -/Next 99 0 R ->> endobj -91 0 obj << -/Title 92 0 R -/A 89 0 R -/Parent 43 0 R -/Prev 87 0 R -/Next 95 0 R ->> endobj -87 0 obj << -/Title 88 0 R -/A 85 0 R -/Parent 43 0 R -/Prev 83 0 R -/Next 91 0 R ->> endobj -83 0 obj << -/Title 84 0 R -/A 81 0 R -/Parent 43 0 R -/Prev 79 0 R -/Next 87 0 R ->> endobj -79 0 obj << -/Title 80 0 R -/A 77 0 R -/Parent 43 0 R -/Prev 75 0 R -/Next 83 0 R ->> endobj -75 0 obj << -/Title 76 0 R -/A 73 0 R -/Parent 43 0 R -/Prev 71 0 R -/Next 79 0 R ->> endobj -71 0 obj << -/Title 72 0 R -/A 69 0 R -/Parent 43 0 R -/Prev 67 0 R -/Next 75 0 R ->> endobj -67 0 obj << -/Title 68 0 R -/A 65 0 R -/Parent 43 0 R -/Prev 63 0 R -/Next 71 0 R ->> endobj -63 0 obj << -/Title 64 0 R -/A 61 0 R -/Parent 43 0 R -/Prev 59 0 R -/Next 67 0 R ->> endobj -59 0 obj << -/Title 60 0 R -/A 57 0 R -/Parent 43 0 R -/Prev 55 0 R -/Next 63 0 R ->> endobj -55 0 obj << -/Title 56 0 R -/A 53 0 R -/Parent 43 0 R -/Prev 51 0 R -/Next 59 0 R ->> endobj -51 0 obj << -/Title 52 0 R -/A 49 0 R -/Parent 43 0 R -/Prev 47 0 R -/Next 55 0 R ->> endobj -47 0 obj << -/Title 48 0 R -/A 45 0 R -/Parent 43 0 R -/Next 51 0 R ->> endobj -43 0 obj << -/Title 44 0 R -/A 41 0 R -/Parent 7 0 R -/Prev 11 0 R -/Next 111 0 R -/First 47 0 R -/Last 107 0 R -/Count -16 ->> endobj -39 0 obj << -/Title 40 0 R -/A 37 0 R -/Parent 11 0 R -/Prev 35 0 R ->> endobj -35 0 obj << -/Title 36 0 R -/A 33 0 R -/Parent 11 0 R -/Prev 31 0 R -/Next 39 0 R ->> endobj -31 0 obj << -/Title 32 0 R -/A 29 0 R -/Parent 11 0 R -/Prev 27 0 R -/Next 35 0 R ->> endobj -27 0 obj << -/Title 28 0 R -/A 25 0 R -/Parent 11 0 R -/Prev 23 0 R -/Next 31 0 R ->> endobj -23 0 obj << -/Title 24 0 R -/A 21 0 R -/Parent 11 0 R -/Prev 19 0 R -/Next 27 0 R ->> endobj -19 0 obj << -/Title 20 0 R -/A 17 0 R -/Parent 11 0 R -/Prev 15 0 R -/Next 23 0 R ->> endobj -15 0 obj << -/Title 16 0 R -/A 13 0 R -/Parent 11 0 R -/Next 19 0 R ->> endobj -11 0 obj << -/Title 12 0 R -/A 9 0 R -/Parent 7 0 R -/Next 43 0 R -/First 15 0 R -/Last 39 0 R -/Count -7 ->> endobj -7 0 obj << -/Title 8 0 R -/A 5 0 R -/Parent 334 0 R -/Prev 3 0 R -/First 11 0 R -/Last 111 0 R -/Count -3 ->> endobj -3 0 obj << -/Title 4 0 R -/A 1 0 R -/Parent 334 0 R -/Next 7 0 R ->> endobj -335 0 obj << -/Names [(Doc-Start) 140 0 R (_app_procedures) 227 0 R (_backgound_list) 278 0 R (_backgroundstruct) 208 0 R (_batch_wrappers) 289 0 R (_create_status_table) 286 0 R] -/Limits [(Doc-Start) (_create_status_table)] ->> endobj -336 0 obj << -/Names [(_diffstruct) 217 0 R (_header) 192 0 R (_image) 188 0 R (_jpeg) 198 0 R (_madd) 228 0 R (_mbackground) 231 0 R] -/Limits [(_diffstruct) (_mbackground)] ->> endobj -337 0 obj << -/Names [(_mbackgroundbatch) 290 0 R (_mbgmodel) 238 0 R (_mconcatfit) 241 0 R (_mdiff) 244 0 R (_mdiffbatch) 294 0 R (_mdifffit) 247 0 R] -/Limits [(_mbackgroundbatch) (_mdifffit)] ->> endobj -338 0 obj << -/Names [(_mdifffitbatch) 298 0 R (_mfitbatch) 311 0 R (_mfitplane) 250 0 R (_mimgtbl) 253 0 R (_mjpeg) 263 0 R (_mmakehdr) 256 0 R] -/Limits [(_mdifffitbatch) (_mmakehdr)] ->> endobj -339 0 obj << -/Names [(_moverlaps) 266 0 R (_mproject) 269 0 R (_mprojectbatch) 314 0 R (_mprojectpp) 272 0 R (_mshrink) 275 0 R (_overview) 185 0 R] -/Limits [(_moverlaps) (_overview)] ->> endobj -340 0 obj << -/Names [(_status) 201 0 R (_swift_montage_api) 186 0 R (_table) 195 0 R (_types) 187 0 R (lstlisting.-1) 189 0 R (lstlisting.-10) 239 0 R] -/Limits [(_status) (lstlisting.-10)] ->> endobj -341 0 obj << -/Names [(lstlisting.-11) 242 0 R (lstlisting.-12) 245 0 R (lstlisting.-13) 248 0 R (lstlisting.-14) 251 0 R (lstlisting.-15) 254 0 R (lstlisting.-16) 257 0 R] -/Limits [(lstlisting.-11) (lstlisting.-16)] ->> endobj -342 0 obj << -/Names [(lstlisting.-17) 264 0 R (lstlisting.-18) 267 0 R (lstlisting.-19) 270 0 R (lstlisting.-2) 193 0 R (lstlisting.-20) 273 0 R (lstlisting.-21) 276 0 R] -/Limits [(lstlisting.-17) (lstlisting.-21)] ->> endobj -343 0 obj << -/Names [(lstlisting.-22) 279 0 R (lstlisting.-23) 287 0 R (lstlisting.-24) 291 0 R (lstlisting.-25) 295 0 R (lstlisting.-26) 299 0 R (lstlisting.-27) 312 0 R] -/Limits [(lstlisting.-22) (lstlisting.-27)] ->> endobj -344 0 obj << -/Names [(lstlisting.-28) 315 0 R (lstlisting.-3) 196 0 R (lstlisting.-4) 199 0 R (lstlisting.-5) 202 0 R (lstlisting.-6) 209 0 R (lstlisting.-7) 218 0 R] -/Limits [(lstlisting.-28) (lstlisting.-7)] ->> endobj -345 0 obj << -/Names [(lstlisting.-8) 229 0 R (lstlisting.-9) 232 0 R (lstnumber.-1.1) 190 0 R (lstnumber.-10.1) 240 0 R (lstnumber.-11.1) 243 0 R (lstnumber.-12.1) 246 0 R] -/Limits [(lstlisting.-8) (lstnumber.-12.1)] ->> endobj -346 0 obj << -/Names [(lstnumber.-13.1) 249 0 R (lstnumber.-14.1) 252 0 R (lstnumber.-15.1) 255 0 R (lstnumber.-16.1) 258 0 R (lstnumber.-17.1) 265 0 R (lstnumber.-18.1) 268 0 R] -/Limits [(lstnumber.-13.1) (lstnumber.-18.1)] ->> endobj -347 0 obj << -/Names [(lstnumber.-19.1) 271 0 R (lstnumber.-2.1) 194 0 R (lstnumber.-20.1) 274 0 R (lstnumber.-21.1) 277 0 R (lstnumber.-22.1) 280 0 R (lstnumber.-23.1) 288 0 R] -/Limits [(lstnumber.-19.1) (lstnumber.-23.1)] ->> endobj -348 0 obj << -/Names [(lstnumber.-24.1) 292 0 R (lstnumber.-24.2) 293 0 R (lstnumber.-25.1) 296 0 R (lstnumber.-25.2) 297 0 R (lstnumber.-26.1) 300 0 R (lstnumber.-26.2) 301 0 R] -/Limits [(lstnumber.-24.1) (lstnumber.-26.2)] ->> endobj -349 0 obj << -/Names [(lstnumber.-26.3) 302 0 R (lstnumber.-27.1) 313 0 R (lstnumber.-28.1) 316 0 R (lstnumber.-3.1) 197 0 R (lstnumber.-4.1) 200 0 R (lstnumber.-5.1) 203 0 R] -/Limits [(lstnumber.-26.3) (lstnumber.-5.1)] ->> endobj -350 0 obj << -/Names [(lstnumber.-6.1) 210 0 R (lstnumber.-6.2) 211 0 R (lstnumber.-6.3) 212 0 R (lstnumber.-6.4) 213 0 R (lstnumber.-6.5) 214 0 R (lstnumber.-6.6) 215 0 R] -/Limits [(lstnumber.-6.1) (lstnumber.-6.6)] ->> endobj -351 0 obj << -/Names [(lstnumber.-6.7) 216 0 R (lstnumber.-7.1) 219 0 R (lstnumber.-7.2) 220 0 R (lstnumber.-7.3) 221 0 R (lstnumber.-7.4) 222 0 R (lstnumber.-7.5) 223 0 R] -/Limits [(lstnumber.-6.7) (lstnumber.-7.5)] ->> endobj -352 0 obj << -/Names [(lstnumber.-7.6) 224 0 R (lstnumber.-7.7) 225 0 R (lstnumber.-7.8) 226 0 R (lstnumber.-8.1) 230 0 R (lstnumber.-9.1) 233 0 R (page.1) 184 0 R] -/Limits [(lstnumber.-7.6) (page.1)] ->> endobj -353 0 obj << -/Names [(page.2) 207 0 R (page.3) 237 0 R (page.4) 262 0 R (page.5) 285 0 R (page.6) 310 0 R (page.i) 137 0 R] -/Limits [(page.2) (page.i)] ->> endobj -354 0 obj << -/Names [(page.ii) 179 0 R (section.1) 2 0 R (section.2) 6 0 R (subsection.2.1) 10 0 R (subsection.2.2) 42 0 R (subsection.2.3) 110 0 R] -/Limits [(page.ii) (subsection.2.3)] ->> endobj -355 0 obj << -/Names [(subsubsection.2.1.1) 14 0 R (subsubsection.2.1.2) 18 0 R (subsubsection.2.1.3) 22 0 R (subsubsection.2.1.4) 26 0 R (subsubsection.2.1.5) 30 0 R (subsubsection.2.1.6) 34 0 R] -/Limits [(subsubsection.2.1.1) (subsubsection.2.1.6)] ->> endobj -356 0 obj << -/Names [(subsubsection.2.1.7) 38 0 R (subsubsection.2.2.1) 46 0 R (subsubsection.2.2.10) 82 0 R (subsubsection.2.2.11) 86 0 R (subsubsection.2.2.12) 90 0 R (subsubsection.2.2.13) 94 0 R] -/Limits [(subsubsection.2.1.7) (subsubsection.2.2.13)] ->> endobj -357 0 obj << -/Names [(subsubsection.2.2.14) 98 0 R (subsubsection.2.2.15) 102 0 R (subsubsection.2.2.16) 106 0 R (subsubsection.2.2.2) 50 0 R (subsubsection.2.2.3) 54 0 R (subsubsection.2.2.4) 58 0 R] -/Limits [(subsubsection.2.2.14) (subsubsection.2.2.4)] ->> endobj -358 0 obj << -/Names [(subsubsection.2.2.5) 62 0 R (subsubsection.2.2.6) 66 0 R (subsubsection.2.2.7) 70 0 R (subsubsection.2.2.8) 74 0 R (subsubsection.2.2.9) 78 0 R (subsubsection.2.3.1) 114 0 R] -/Limits [(subsubsection.2.2.5) (subsubsection.2.3.1)] ->> endobj -359 0 obj << -/Names [(subsubsection.2.3.2) 118 0 R (subsubsection.2.3.3) 122 0 R (subsubsection.2.3.4) 126 0 R (subsubsection.2.3.5) 130 0 R] -/Limits [(subsubsection.2.3.2) (subsubsection.2.3.5)] ->> endobj -360 0 obj << -/Kids [335 0 R 336 0 R 337 0 R 338 0 R 339 0 R 340 0 R] -/Limits [(Doc-Start) (lstlisting.-10)] ->> endobj -361 0 obj << -/Kids [341 0 R 342 0 R 343 0 R 344 0 R 345 0 R 346 0 R] -/Limits [(lstlisting.-11) (lstnumber.-18.1)] ->> endobj -362 0 obj << -/Kids [347 0 R 348 0 R 349 0 R 350 0 R 351 0 R 352 0 R] -/Limits [(lstnumber.-19.1) (page.1)] ->> endobj -363 0 obj << -/Kids [353 0 R 354 0 R 355 0 R 356 0 R 357 0 R 358 0 R] -/Limits [(page.2) (subsubsection.2.3.1)] ->> endobj -364 0 obj << -/Kids [359 0 R] -/Limits [(subsubsection.2.3.2) (subsubsection.2.3.5)] ->> endobj -365 0 obj << -/Kids [360 0 R 361 0 R 362 0 R 363 0 R 364 0 R] -/Limits [(Doc-Start) (subsubsection.2.3.5)] ->> endobj -366 0 obj << -/Dests 365 0 R ->> endobj -367 0 obj << -/Type /Catalog -/Pages 333 0 R -/Outlines 334 0 R -/Names 366 0 R -/PageMode/UseOutlines/PageLabels<>2<>]>> -/OpenAction 133 0 R ->> endobj -368 0 obj << -/Author()/Title(Swift Montage API)/Subject()/Creator(DBLaTeX-0.3)/Producer(pdfTeX-1.40.10)/Keywords() -/CreationDate (D:20110616211653-05'00') -/ModDate (D:20110616211653-05'00') -/Trapped /False -/PTEX.Fullbanner (This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0) ->> endobj -xref -0 369 -0000000000 65535 f -0000000015 00000 n -0000012372 00000 n -0000100188 00000 n -0000000060 00000 n -0000000086 00000 n -0000012492 00000 n -0000100079 00000 n -0000000131 00000 n -0000000166 00000 n -0000012611 00000 n -0000099970 00000 n -0000000216 00000 n -0000000240 00000 n -0000012731 00000 n -0000099896 00000 n -0000000296 00000 n -0000000320 00000 n -0000012973 00000 n -0000099809 00000 n -0000000376 00000 n -0000000401 00000 n -0000013216 00000 n -0000099722 00000 n -0000000457 00000 n -0000000481 00000 n -0000013458 00000 n -0000099635 00000 n -0000000537 00000 n -0000000560 00000 n -0000013701 00000 n -0000099548 00000 n -0000000616 00000 n -0000000641 00000 n -0000016338 00000 n -0000099461 00000 n -0000000697 00000 n -0000000732 00000 n -0000016946 00000 n -0000099387 00000 n -0000000788 00000 n -0000000817 00000 n -0000017615 00000 n -0000099261 00000 n -0000000868 00000 n -0000000901 00000 n -0000017736 00000 n -0000099187 00000 n -0000000957 00000 n -0000000980 00000 n -0000017976 00000 n -0000099100 00000 n -0000001036 00000 n -0000001066 00000 n -0000020763 00000 n -0000099013 00000 n -0000001122 00000 n -0000001149 00000 n -0000021006 00000 n -0000098926 00000 n -0000001205 00000 n -0000001234 00000 n -0000021249 00000 n -0000098839 00000 n -0000001290 00000 n -0000001314 00000 n -0000021492 00000 n -0000098752 00000 n -0000001370 00000 n -0000001397 00000 n -0000021735 00000 n -0000098665 00000 n -0000001453 00000 n -0000001481 00000 n -0000021977 00000 n -0000098578 00000 n -0000001537 00000 n -0000001563 00000 n -0000022220 00000 n -0000098491 00000 n -0000001619 00000 n -0000001646 00000 n -0000025056 00000 n -0000098404 00000 n -0000001703 00000 n -0000001727 00000 n -0000025299 00000 n -0000098317 00000 n -0000001784 00000 n -0000001812 00000 n -0000025540 00000 n -0000098230 00000 n -0000001869 00000 n -0000001896 00000 n -0000025783 00000 n -0000098143 00000 n -0000001953 00000 n -0000001982 00000 n -0000026025 00000 n -0000098054 00000 n -0000002039 00000 n -0000002066 00000 n -0000026268 00000 n -0000097963 00000 n -0000002124 00000 n -0000002161 00000 n -0000030208 00000 n -0000097885 00000 n -0000002219 00000 n -0000002264 00000 n -0000030452 00000 n -0000097770 00000 n -0000002316 00000 n -0000002350 00000 n -0000030574 00000 n -0000097691 00000 n -0000002407 00000 n -0000002443 00000 n -0000030878 00000 n -0000097598 00000 n -0000002500 00000 n -0000002530 00000 n -0000031183 00000 n -0000097505 00000 n -0000002587 00000 n -0000002620 00000 n -0000033758 00000 n -0000097412 00000 n -0000002677 00000 n -0000002706 00000 n -0000034002 00000 n -0000097333 00000 n -0000002763 00000 n -0000002796 00000 n -0000003146 00000 n -0000003388 00000 n -0000002849 00000 n -0000003265 00000 n -0000096816 00000 n -0000096471 00000 n -0000003327 00000 n -0000096300 00000 n -0000096989 00000 n -0000004865 00000 n -0000005015 00000 n -0000005166 00000 n -0000005321 00000 n -0000005482 00000 n -0000005642 00000 n -0000005803 00000 n -0000005964 00000 n -0000006124 00000 n -0000006285 00000 n -0000006446 00000 n -0000006602 00000 n -0000006763 00000 n -0000006924 00000 n -0000007084 00000 n -0000007245 00000 n -0000007406 00000 n -0000007567 00000 n -0000007728 00000 n -0000007888 00000 n -0000008049 00000 n -0000008211 00000 n -0000008373 00000 n -0000008535 00000 n -0000008697 00000 n -0000008859 00000 n -0000009021 00000 n -0000009183 00000 n -0000009339 00000 n -0000009500 00000 n -0000009660 00000 n -0000009821 00000 n -0000009982 00000 n -0000010205 00000 n -0000004470 00000 n -0000003486 00000 n -0000010143 00000 n -0000096642 00000 n -0000013944 00000 n -0000012191 00000 n -0000010316 00000 n -0000012310 00000 n -0000012431 00000 n -0000012551 00000 n -0000012670 00000 n -0000012790 00000 n -0000012851 00000 n -0000012912 00000 n -0000096129 00000 n -0000013033 00000 n -0000013094 00000 n -0000013155 00000 n -0000013276 00000 n -0000013336 00000 n -0000013397 00000 n -0000013518 00000 n -0000013579 00000 n -0000013640 00000 n -0000013761 00000 n -0000013822 00000 n -0000013883 00000 n -0000018219 00000 n -0000016157 00000 n -0000014055 00000 n -0000016276 00000 n -0000016398 00000 n -0000016459 00000 n -0000016520 00000 n -0000016581 00000 n -0000016642 00000 n -0000016702 00000 n -0000016763 00000 n -0000016824 00000 n -0000016885 00000 n -0000017006 00000 n -0000017067 00000 n -0000017128 00000 n -0000017189 00000 n -0000017250 00000 n -0000017311 00000 n -0000017372 00000 n -0000017433 00000 n -0000017493 00000 n -0000017554 00000 n -0000017675 00000 n -0000017794 00000 n -0000017855 00000 n -0000017915 00000 n -0000018036 00000 n -0000018097 00000 n -0000018158 00000 n -0000022463 00000 n -0000020582 00000 n -0000018330 00000 n -0000020701 00000 n -0000020823 00000 n -0000020884 00000 n -0000020945 00000 n -0000021066 00000 n -0000021127 00000 n -0000021188 00000 n -0000021309 00000 n -0000021370 00000 n -0000021431 00000 n -0000021552 00000 n -0000021613 00000 n -0000021674 00000 n -0000021795 00000 n -0000021856 00000 n -0000021917 00000 n -0000022037 00000 n -0000022098 00000 n -0000022159 00000 n -0000022280 00000 n -0000022341 00000 n -0000022402 00000 n -0000026512 00000 n -0000024875 00000 n -0000022574 00000 n -0000024994 00000 n -0000025116 00000 n -0000025177 00000 n -0000025238 00000 n -0000025359 00000 n -0000025419 00000 n -0000025479 00000 n -0000025600 00000 n -0000025661 00000 n -0000025722 00000 n -0000025842 00000 n -0000025903 00000 n -0000025964 00000 n -0000026085 00000 n -0000026146 00000 n -0000026207 00000 n -0000026329 00000 n -0000026390 00000 n -0000026451 00000 n -0000029003 00000 n -0000031548 00000 n -0000028884 00000 n -0000026623 00000 n -0000030146 00000 n -0000030269 00000 n -0000030330 00000 n -0000030391 00000 n -0000030513 00000 n -0000030635 00000 n -0000030696 00000 n -0000030757 00000 n -0000030817 00000 n -0000030939 00000 n -0000031000 00000 n -0000031061 00000 n -0000031122 00000 n -0000031244 00000 n -0000031305 00000 n -0000031366 00000 n -0000031427 00000 n -0000031488 00000 n -0000097106 00000 n -0000029906 00000 n -0000030041 00000 n -0000030090 00000 n -0000034245 00000 n -0000033577 00000 n -0000031687 00000 n -0000033696 00000 n -0000033819 00000 n -0000033880 00000 n -0000033941 00000 n -0000034063 00000 n -0000034123 00000 n -0000034184 00000 n -0000095757 00000 n -0000034384 00000 n -0000034747 00000 n -0000035051 00000 n -0000035374 00000 n -0000035746 00000 n -0000036221 00000 n -0000050077 00000 n -0000050481 00000 n -0000061594 00000 n -0000061971 00000 n -0000069843 00000 n -0000070227 00000 n -0000078912 00000 n -0000079186 00000 n -0000095344 00000 n -0000097191 00000 n -0000097260 00000 n -0000100259 00000 n -0000100493 00000 n -0000100676 00000 n -0000100879 00000 n -0000101073 00000 n -0000101267 00000 n -0000101466 00000 n -0000101692 00000 n -0000101917 00000 n -0000102143 00000 n -0000102363 00000 n -0000102590 00000 n -0000102824 00000 n -0000103057 00000 n -0000103291 00000 n -0000103521 00000 n -0000103747 00000 n -0000103973 00000 n -0000104183 00000 n -0000104345 00000 n -0000104541 00000 n -0000104801 00000 n -0000105066 00000 n -0000105332 00000 n -0000105593 00000 n -0000105799 00000 n -0000105917 00000 n -0000106041 00000 n -0000106157 00000 n -0000106277 00000 n -0000106370 00000 n -0000106485 00000 n -0000106523 00000 n -0000106691 00000 n -trailer -<< /Size 369 -/Root 367 0 R -/Info 368 0 R -/ID [<68998779D743C6E5BAFD2838B06BD2FA> <68998779D743C6E5BAFD2838B06BD2FA>] >> -startxref -107011 -%%EOF Deleted: SwiftApps/Montage/docs/API.txt =================================================================== --- SwiftApps/Montage/docs/API.txt 2011-06-20 14:44:45 UTC (rev 4633) +++ SwiftApps/Montage/docs/API.txt 2011-06-20 14:56:13 UTC (rev 4634) @@ -1,366 +0,0 @@ -Swift Montage API -================= -:toc: -:icons: -:numbered: - -Overview --------- - -This is the API for the Swift Montage wrappers. Montage is a toolkit for -generating science grade astronomical mosaics. The image file format for -Montage is Flexible Image Transport System or FITS. - -Swift is a dataflow parallel scripting language. The language allows the user -to parallelize a workflow that has been represented as a swiftscript. Swift -implements the site execution model to allow for efficient use of available -resources for the user's application. - -NOTE: Both the Montage binaries as well as the Swift binaries must be included -in your PATH environment variable for the wrappers to function properly. - - -Swift Montage API ------------------ - -Types -~~~~~ -These are all the Types that are declared for Swift. They are located in the -file Swift_Montage_types.swift. - -Image -^^^^^ ----- -type Image; ----- -This is the Image type. It is used to declare the raw images, projected -images, difference images, rectified images, and the mosaic. - -Header -^^^^^^ ----- -type Header; ----- -This is the Header type. It is used to declare and map to the FITS header -file. - -Table -^^^^^ ----- -type Table; ----- -This is the Table type. During the execution of the workflow several files of -metadata is generated. These are tables that the Montage functions use to read -for the next stage of the workflow. - -JPEG -^^^^ ----- -type JPEG ----- -This is the JPEG type. This is used to map to the jpeg version of the mosaic. - -Status -^^^^^^ ----- -type Status; ----- -This is the status type. During the difference stage of the workflow status -file are generated that have the information about the coefficients that will -be used to rectify the image. - -BackgroundStruct -^^^^^^^^^^^^^^^^ ----- -type BackgroundStruct -{ - string fname; - float a; - float b; - float c; -}; ----- -This is a struct type. The entries are a string for the name of the image and -three coefficients to rectify this portion of the mosaic of all floating point -types. - -DiffStruct -^^^^^^^^^^ ----- -type DiffStruct -{ - int cntr1; - int cntr2; - Image plus; - Image minus; - Image diff; -}; ----- -This is a struct type. The entries are two control integers that make this -entry unique, the two images that overlapped which are name plus and minus, -and the name of the difference image that they produced. - -App Procedures -~~~~~~~~~~~~~~ -These are all the app procedures for Swift Montage. They are located in the -file Swift_Montage_Apps.swift - -NOTE: Currently the options to the Montage functions are hard coded and the -user cannot choose which options to run. - -mAdd -^^^^ ----- -app ( Image mos ) mAdd( Image imgs[], Table img_tbl, Header hdr ) ----- -This app procedure will call the mAdd fucntion from the Montage toolkit. This -procedure takes -in a list of images to be added together, the img_tbl for these images, and -the FITS header file for the mosaic being created. The procedure then outputs -a single FITS file that represents the mosaic. All the images that will be -part of this mosaic must reside in the same directory. - -mBackground -^^^^^^^^^^^ ----- -app ( Image bg_img ) mBackground( Image img, float a, float b, float c ) ----- -This app procedure will call the mBackground function from the Montage -toolkit. This procedure takes in a single image along with the -three coefficients. The procedure then output the background rectified image -after the coefficients have been applied. - -mBgModel -^^^^^^^^ ----- -app ( Table rect_tbl ) mBgModel( Table img_tbl, Table fits_tbl ) ----- -This app procedure will call the mBgModel function from the Montage -toolkit. This procedure takes in an image table that represents the list of images that -will be added into a mosaic and a table of the information that is required to -fit them together. The procedure will then output a rectification table of the -coefficients that must be applied to the images. - -mConcatFit -^^^^^^^^^^ ----- -app ( Table fits_tbl ) mConcatFit( Table status_tbl, Status stats[] ) ----- -This app procedure will call the mConcatFit function from the Montage -toolkit. This procedure takes in a table representing the status files that were generated -from either mFitplane or mDiffFit and a list of these status files as -input. The procedure will then output a table of all the status files -together. The status files must all reside in the same directory. - -mDiff -^^^^^ ----- -app ( Image diff_img ) mDiff( Image proj_img_1, Image proj_img_2, Header hdr ) ----- -This app procedure will call the mDiff function from the Montage toolkit. This -procedure takes in two images and the FITS header file for the mosaic. The procedure will then output a -difference image representing the information of where the two images overlap. - -mDiffFit -^^^^^^^^ ----- -app ( Image diff_img, Status stat ) mDiffFit( Image img_1, Image img_2, Header hdr ) ----- -This app procedure will call the mDiffFit function from the Montage -toolkit. The mDiffFit function in Montage is the combination of the mDiff and -mFitplane functions. - -mFitplane -^^^^^^^^^ ----- -app ( Status stat ) mFitplane( Image diff_img ) ----- -This app procedure will call the mFitplane function from the Montage -toolkit. This procedure takes in as input the difference image that was the output from -the mDiff procedure. The procedure will then output a status file that -contains the information on how to fit these two images together. - -mImgtbl -^^^^^^^ ----- -app ( Table img_tbl ) mImgtbl( Image imgs[] ) ----- -This app procedure will call the mImgtbl function from the Montage -toolkit. This procedure takes in as input a list of images to create a table -from. The output is an image table that represents these images. All the -images that will be part of this table must reside in the same directory. - -mMakeHdr -^^^^^^^^ ----- -app ( Header hdr ) mMakeHdr( Table img_tbl ) ----- -This app procedure will call the mMakeHdr function from the Montage -toolkit. This procedure will take in as input an image table representing the -images that will be combined into a single mosaic. The procedure will then output the -FITS header file for the mosaic. - -mJPEG -^^^^^ ----- -app ( JPEG mos_img_jpg ) mJPEG( Image mos_img ) ----- -This app procedure will call the mJPEG function from the Montage toolkit. This -procedure will take in as input as input a FITS image. The procedure will -then ouput the same image in jpeg format. - -mOverlaps -^^^^^^^^^ ----- -app ( Table diff_tbl ) mOverlaps( Table img_tbl ) ----- -This app procedure will call the mOverlaps function from the Montage -toolkit. This procedure takes in as input an image table of the images that -will be combined into a single mosaic. The procedure will then output a table -of all the images that overlap with each other in the mosaic. - -mProject -^^^^^^^^ ----- -app ( Image proj_img ) mProject( Image raw_img, Header hdr ) ----- -This app procedure will call the mProject function from the Montage -toolkit. This procedure takes in as input a FITS image file and the FITS header file -that for the mosaic. The output is the projected image. - -NOTE: The mProject app procedure is for general projection. There are some cases in -which the faster mProjectPP procedure should be used. - -mProjectPP -^^^^^^^^^^ ----- -app ( Image proj_img ) mProjectPP( Image raw_img, Header hdr ) ----- -This app procedure will call the mProjectPP function from the Montage -toolkit. This procedure takes in as input a FITS image file and the FITS header file -that for the mosaic. The output is the projected image. - -NOTE: The mProjectPP app procedure is a "special case" version of mProject -and can be used only where the input and output images have tangent-plane -projections (e.g. TAN, SIN) or where they can be approximated with acceptable -error. - - -mShrink -^^^^^^^ ----- -app ( Image shrunk ) mShrink( Image original, int factor ) ----- -This app procedure will call the mShrink function in the Montage toolkit. This -procedure takes in as input a single image and an re-sizing factor represented -as an integer. The procedure will then output the re-sized image. - -Backgound_list -^^^^^^^^^^^^^^ ----- -app ( Table back_tbl ) Background_list( Table imgs_tbl, Table rect_tbl ) ----- -This app procedure will call the Background_list python script that is included in -the scripts directory for the Swift Montage wrappers. This procedure takes in as input an image table of the -images that are being combined into a single mosaic and the table of -coefficients to rectify the mosaic. The procedure will then output a file in a -format that can be read in by the Swift readData2 function into the -Background_struct declared type. - -create_status_table -^^^^^^^^^^^^^^^^^^^ ----- -app ( Table stat_tbl ) create_status_table( Table diff_tbl ) ----- -This app procedure will call the create_status_table python script that is -included in the scripts directory for the Swift Montage wrappers. This -procedure takes in as input the difference table that has been generated by -the mOverlaps procedure. The procedure will the output a table that can be -used as input to the mConcatFit app procedure. - -Batch Wrappers -~~~~~~~~~~~~~~ -These are the Batch scripts. These scripts do most of the file mapping -and is where the parallelization is taking place. They are located in the file -Swift_Montage_Batch.swift - -mBackgroundBatch -^^^^^^^^^^^^^^^^ ----- -( Image rect_imgs[] ) mBackgroundBatch( string dest, Image imgs[], Table img_tbl, - Table rect_tbl ) ----- -This batch swift script takes in as input a destination directory for the -rectified images, a list of images that will be combined into a -mosaic, an image table representing the images for the mosaic, and a table of -the coefficients that must be applied to each image. The script will then -output a list of the images after the coefficients have been applied. The -application of the coefficients to each image is done in parallel. - -NOTE: mBackgroundBatch calls the mBackground app procedure. - -mDiffBatch -^^^^^^^^^^ ----- -( Image diff_imgs[] ) mDiffBatch( string src, string dest, string filenames[], - Table diff_tbl, Header hdr ) ----- -This batch script takes in as input a source directory of where the images to calculate -overlaps are located, a destination directory of where to store these -difference images, a list of the file names for the images that will be -combined into the mosaic, a difference table that contains which images overlap with -each other, and the FITS header file for the mosaic. This script will then -output the difference images. The calculation each difference image are -done in parallel. - -WARNING: The images that are in the source directory must be projected images. - -NOTE: mDiffBatch calls the mDiff app procedure. - -mDiffFitBatch -^^^^^^^^^^^^^ ----- -( Image diff_imgs[], Table fits_tbl ) mDiffFitBatch( string src, string dest, string stat, - string filenames[], - Table diff_tbl, Header hdr ) ----- -This batch script takes in as input a source directory of where the images to -calculate overlaps are located, a destination directory of where to store -these difference images, a status directory of where to store the status files -for each image, a list of the file names for the images that will be -combined into the mosaic, a difference table that contains which images overlap -with each other and the FITS header file for the mosaic. This script will then -output a list of difference images and a table of information on how to fit -the images together. The calculation of each difference image and the fitting -table is done in parallel. - -WARNING: The images that are in the source directory must be projected images. - -NOTE: mDiffFitBatch calls the mDiffFit app procedure. - -mFitBatch -^^^^^^^^^ ----- -( Table fits_tbl ) mFitBatch( string stat, Image diff_imgs[], Table diff_tbl ) ----- -This batch script takes in as input a directory for which the status files -will be put in, the list of difference images that has -been generated and the table that contains which images overlap with each -other. The script then generates a table containing describing how to fit the -two overalpping images together. - -NOTE: mFitBatch calls the mFitplane app procedure. - -mProjectBatch -^^^^^^^^^^^^^ ----- -( Image proj_imgs[] ) mProjectBatch( string dest, Image raw_imgs[], Header hdr ) ----- -This batch script takes in as input the destination directory for the -projected images, a list of raw image files and the FITS header file -and projects each image. When projecting each image the function will decide -if it is possible to use the fast image projetion algorithm or to just use -standard projection. - -WARNING: mProjectBatch currently only calls the general mProject app -procedure. It does not check to see if the faster projection mProjectPP can be used. Copied: SwiftApps/Montage/docs/SwiftMontageAPI.html (from rev 4633, SwiftApps/Montage/docs/API.html) =================================================================== --- SwiftApps/Montage/docs/SwiftMontageAPI.html (rev 0) +++ SwiftApps/Montage/docs/SwiftMontageAPI.html 2011-06-20 14:56:13 UTC (rev 4634) @@ -0,0 +1,1185 @@ + + + + + +SwiftMontage API + + + + + +
    +
    +

    1. Overview

    +
    +

    This is the API for the SwiftMontage wrappers. Montage is a toolkit for +generating science grade astronomical mosaics. The image file format for +Montage is Flexible Image Transport System or FITS.

    +

    Swift is a dataflow parallel scripting language. The language allows the user +to parallelize a workflow that has been represented as a swiftscript. Swift +implements the site execution model to allow for efficient use of available +resources for the user’s application.

    +
    + + + +
    +Note +Both the Montage binaries as well as the Swift binaries must be included +in your PATH environment variable for the wrappers to function properly.
    +
    +
    +
    +
    +

    2. SwiftMontage API

    +
    +
    +

    2.1. Types

    +

    These are all the Types that are declared for Swift. They are located in the +file Swift_Montage_types.swift.

    +
    +

    2.1.1. Image

    +
    +
    +
    type Image;
    +
    +

    This is the Image type. It is used to declare the raw images, projected +images, difference images, rectified images, and the mosaic.

    +
    +
    +

    2.1.2. Header

    +
    +
    +
    type Header;
    +
    +

    This is the Header type. It is used to declare and map to the FITS header +file.

    +
    +
    +

    2.1.3. Table

    +
    +
    +
    type Table;
    +
    +

    This is the Table type. During the execution of the workflow several files of +metadata is generated. These are tables that the Montage functions use to read +for the next stage of the workflow.

    +
    +
    +

    2.1.4. JPEG

    +
    +
    +
    type JPEG
    +
    +

    This is the JPEG type. This is used to map to the jpeg version of the mosaic.

    +
    +
    +

    2.1.5. Status

    +
    +
    +
    type Status;
    +
    +

    This is the status type. During the difference stage of the workflow status +file are generated that have the information about the coefficients that will +be used to rectify the image.

    +
    +
    +

    2.1.6. BackgroundStruct

    +
    +
    +
    type BackgroundStruct
    +{
    +    string fname;
    +    float a;
    +    float b;
    +    float c;
    +};
    +
    +

    This is a struct type. The entries are a string for the name of the image and +three coefficients to rectify this portion of the mosaic of all floating point +types.

    +
    +
    +

    2.1.7. DiffStruct

    +
    +
    +
    type DiffStruct
    +{
    +    int cntr1;
    +    int cntr2;
    +    Image plus;
    +    Image minus;
    +    Image diff;
    +};
    +
    +

    This is a struct type. The entries are two control integers that make this +entry unique, the two images that overlapped which are name plus and minus, +and the name of the difference image that they produced.

    +
    +
    +
    +

    2.2. App Procedures

    +

    These are all the app procedures for SwiftMontage. They are located in the +file Swift_Montage_Apps.swift

    +
    + + + +
    +Note +Currently the options to the Montage functions are hard coded and the +user cannot choose which options to run.
    +
    +
    +

    2.2.1. mAdd

    +
    +
    +
    app ( Image mos ) mAdd( Image imgs[], Table img_tbl, Header hdr )
    +
    +

    This app procedure will call the mAdd fucntion from the Montage toolkit. This +procedure takes +in a list of images to be added together, the img_tbl for these images, and +the FITS header file for the mosaic being created. The procedure then outputs +a single FITS file that represents the mosaic. All the images that will be +part of this mosaic must reside in the same directory.

    +
    +
    +

    2.2.2. mBackground

    +
    +
    +
    app ( Image bg_img ) mBackground( Image img, float a, float b, float c )
    +
    +

    This app procedure will call the mBackground function from the Montage +toolkit. This procedure takes in a single image along with the +three coefficients. The procedure then output the background rectified image +after the coefficients have been applied.

    +
    +
    +

    2.2.3. mBgModel

    +
    +
    +
    app ( Table rect_tbl ) mBgModel( Table img_tbl, Table fits_tbl )
    +
    +

    This app procedure will call the mBgModel function from the Montage +toolkit. This procedure takes in an image table that represents the list of images that +will be added into a mosaic and a table of the information that is required to +fit them together. The procedure will then output a rectification table of the +coefficients that must be applied to the images.

    +
    +
    +

    2.2.4. mConcatFit

    +
    +
    +
    app ( Table fits_tbl ) mConcatFit( Table status_tbl, Status stats[] )
    +
    +

    This app procedure will call the mConcatFit function from the Montage +toolkit. This procedure takes in a table representing the status files that were generated +from either mFitplane or mDiffFit and a list of these status files as +input. The procedure will then output a table of all the status files +together. The status files must all reside in the same directory.

    +
    +
    +

    2.2.5. mDiff

    +
    +
    +
    app ( Image diff_img ) mDiff( Image proj_img_1, Image proj_img_2, Header hdr )
    +
    +

    This app procedure will call the mDiff function from the Montage toolkit. This +procedure takes in two images and the FITS header file for the mosaic. The procedure will then output a +difference image representing the information of where the two images overlap.

    +
    +
    +

    2.2.6. mDiffFit

    +
    +
    +
    app ( Image diff_img, Status stat ) mDiffFit( Image img_1, Image img_2, Header hdr )
    +
    +

    This app procedure will call the mDiffFit function from the Montage +toolkit. The mDiffFit function in Montage is the combination of the mDiff and +mFitplane functions.

    +
    +
    +

    2.2.7. mFitplane

    +
    +
    +
    app ( Status stat ) mFitplane( Image diff_img )
    +
    +

    This app procedure will call the mFitplane function from the Montage +toolkit. This procedure takes in as input the difference image that was the output from +the mDiff procedure. The procedure will then output a status file that +contains the information on how to fit these two images together.

    +
    +
    +

    2.2.8. mImgtbl

    +
    +
    +
    app ( Table img_tbl ) mImgtbl( Image imgs[] )
    +
    +

    This app procedure will call the mImgtbl function from the Montage +toolkit. This procedure takes in as input a list of images to create a table +from. The output is an image table that represents these images. All the +images that will be part of this table must reside in the same directory.

    +
    +
    +

    2.2.9. mMakeHdr

    +
    +
    +
    app ( Header hdr ) mMakeHdr( Table img_tbl )
    +
    +

    This app procedure will call the mMakeHdr function from the Montage +toolkit. This procedure will take in as input an image table representing the +images that will be combined into a single mosaic. The procedure will then output the +FITS header file for the mosaic.

    +
    +
    +

    2.2.10. mJPEG

    +
    +
    +
    app ( JPEG mos_img_jpg ) mJPEG( Image mos_img )
    +
    +

    This app procedure will call the mJPEG function from the Montage toolkit. This +procedure will take in as input as input a FITS image. The procedure will +then ouput the same image in jpeg format.

    +
    +
    +

    2.2.11. mOverlaps

    +
    +
    +
    app ( Table diff_tbl ) mOverlaps( Table img_tbl )
    +
    +

    This app procedure will call the mOverlaps function from the Montage +toolkit. This procedure takes in as input an image table of the images that +will be combined into a single mosaic. The procedure will then output a table +of all the images that overlap with each other in the mosaic.

    +
    +
    +

    2.2.12. mProject

    +
    +
    +
    app ( Image proj_img ) mProject( Image raw_img, Header hdr )
    +
    +

    This app procedure will call the mProject function from the Montage +toolkit. This procedure takes in as input a FITS image file and the FITS header file +that for the mosaic. The output is the projected image.

    +
    + + + +
    +Note +The mProject app procedure is for general projection. There are some cases in +which the faster mProjectPP procedure should be used.
    +
    +
    +
    +

    2.2.13. mProjectPP

    +
    +
    +
    app ( Image proj_img ) mProjectPP( Image raw_img, Header hdr )
    +
    +

    This app procedure will call the mProjectPP function from the Montage +toolkit. This procedure takes in as input a FITS image file and the FITS header file +that for the mosaic. The output is the projected image.

    +
    + + + +
    +Note +The mProjectPP app procedure is a "special case" version of mProject +and can be used only where the input and output images have tangent-plane +projections (e.g. TAN, SIN) or where they can be approximated with acceptable +error.
    +
    +
    +
    +

    2.2.14. mShrink

    +
    +
    +
    app ( Image shrunk ) mShrink( Image original, int factor )
    +
    +

    This app procedure will call the mShrink function in the Montage toolkit. This +procedure takes in as input a single image and an re-sizing factor represented +as an integer. The procedure will then output the re-sized image.

    +
    +
    +

    2.2.15. Backgound_list

    +
    +
    +
    app ( Table back_tbl ) Background_list( Table imgs_tbl, Table rect_tbl )
    +
    +

    This app procedure will call the Background_list python script that is included in +the scripts directory for the SwiftMontage wrappers. This procedure takes in as input an image table of the +images that are being combined into a single mosaic and the table of +coefficients to rectify the mosaic. The procedure will then output a file in a +format that can be read in by the Swift readData2 function into the +Background_struct declared type.

    +
    +
    +

    2.2.16. create_status_table

    +
    +
    +
    app ( Table stat_tbl ) create_status_table( Table diff_tbl )
    +
    +

    This app procedure will call the create_status_table python script that is +included in the scripts directory for the SwiftMontage wrappers. This +procedure takes in as input the difference table that has been generated by +the mOverlaps procedure. The procedure will the output a table that can be +used as input to the mConcatFit app procedure.

    +
    +
    +
    +

    2.3. Batch Wrappers

    +

    These are the Batch scripts. These scripts do most of the file mapping +and is where the parallelization is taking place. They are located in the file +Swift_Montage_Batch.swift

    +
    +

    2.3.1. mBackgroundBatch

    +
    +
    +
    ( Image rect_imgs[] ) mBackgroundBatch( string dest, Image imgs[], Table img_tbl,
    +                                        Table rect_tbl )
    +
    +

    This batch swift script takes in as input a destination directory for the +rectified images, a list of images that will be combined into a +mosaic, an image table representing the images for the mosaic, and a table of +the coefficients that must be applied to each image. The script will then +output a list of the images after the coefficients have been applied. The +application of the coefficients to each image is done in parallel.

    +
    + + + +
    +Note +mBackgroundBatch calls the mBackground app procedure.
    +
    +
    +
    +

    2.3.2. mDiffBatch

    +
    +
    +
    ( Image diff_imgs[] ) mDiffBatch( string src, string dest, string filenames[],
    +                                  Table diff_tbl, Header hdr )
    +
    +

    This batch script takes in as input a source directory of where the images to calculate +overlaps are located, a destination directory of where to store these +difference images, a list of the file names for the images that will be +combined into the mosaic, a difference table that contains which images overlap with +each other, and the FITS header file for the mosaic. This script will then +output the difference images. The calculation each difference image are +done in parallel.

    +
    + + + +
    +Warning +The images that are in the source directory must be projected images.
    +
    +
    + + + +
    +Note +mDiffBatch calls the mDiff app procedure.
    +
    +
    +
    +

    2.3.3. mDiffFitBatch

    +
    +
    +
    ( Image diff_imgs[], Table fits_tbl ) mDiffFitBatch( string src, string dest, string stat,
    +                                                     string filenames[],
    +                                                     Table diff_tbl, Header hdr )
    +
    +

    This batch script takes in as input a source directory of where the images to +calculate overlaps are located, a destination directory of where to store +these difference images, a status directory of where to store the status files +for each image, a list of the file names for the images that will be +combined into the mosaic, a difference table that contains which images overlap +with each other and the FITS header file for the mosaic. This script will then +output a list of difference images and a table of information on how to fit +the images together. The calculation of each difference image and the fitting +table is done in parallel.

    +
    + + + +
    +Warning +The images that are in the source directory must be projected images.
    +
    +
    + + + +
    +Note +mDiffFitBatch calls the mDiffFit app procedure.
    +
    +
    +
    +

    2.3.4. mFitBatch

    +
    +
    +
    ( Table fits_tbl ) mFitBatch( string stat, Image diff_imgs[], Table diff_tbl )
    +
    +

    This batch script takes in as input a directory for which the status files +will be put in, the list of difference images that has +been generated and the table that contains which images overlap with each +other. The script then generates a table containing describing how to fit the +two overalpping images together.

    +
    + + + +
    +Note +mFitBatch calls the mFitplane app procedure.
    +
    +
    +
    +

    2.3.5. mProjectBatch

    +
    +
    +
    ( Image proj_imgs[] ) mProjectBatch( string dest, Image raw_imgs[], Header hdr )
    +
    +

    This batch script takes in as input the destination directory for the +projected images, a list of raw image files and the FITS header file +and projects each image. When projecting each image the function will decide +if it is possible to use the fast image projetion algorithm or to just use +standard projection.

    +
    + + + +
    +Warning +mProjectBatch currently only calls the general mProject app +procedure. It does not check to see if the faster projection mProjectPP can be used.
    +
    +
    +
    +
    +
    +
    +

    + + + Copied: SwiftApps/Montage/docs/SwiftMontageAPI.pdf (from rev 4633, SwiftApps/Montage/docs/API.pdf) =================================================================== --- SwiftApps/Montage/docs/SwiftMontageAPI.pdf (rev 0) +++ SwiftApps/Montage/docs/SwiftMontageAPI.pdf 2011-06-20 14:56:13 UTC (rev 4634) @@ -0,0 +1,2596 @@ +%PDF-1.4 +%???? +1 0 obj +<< /S /GoTo /D (section.1) >> +endobj +4 0 obj +(Overview) +endobj +5 0 obj +<< /S /GoTo /D (section.2) >> +endobj +8 0 obj +(SwiftMontage API) +endobj +9 0 obj +<< /S /GoTo /D (subsection.2.1) >> +endobj +12 0 obj +(Types) +endobj +13 0 obj +<< /S /GoTo /D (subsubsection.2.1.1) >> +endobj +16 0 obj +(Image) +endobj +17 0 obj +<< /S /GoTo /D (subsubsection.2.1.2) >> +endobj +20 0 obj +(Header) +endobj +21 0 obj +<< /S /GoTo /D (subsubsection.2.1.3) >> +endobj +24 0 obj +(Table) +endobj +25 0 obj +<< /S /GoTo /D (subsubsection.2.1.4) >> +endobj +28 0 obj +(JPEG) +endobj +29 0 obj +<< /S /GoTo /D (subsubsection.2.1.5) >> +endobj +32 0 obj +(Status) +endobj +33 0 obj +<< /S /GoTo /D (subsubsection.2.1.6) >> +endobj +36 0 obj +(BackgroundStruct) +endobj +37 0 obj +<< /S /GoTo /D (subsubsection.2.1.7) >> +endobj +40 0 obj +(DiffStruct) +endobj +41 0 obj +<< /S /GoTo /D (subsection.2.2) >> +endobj +44 0 obj +(App Procedures) +endobj +45 0 obj +<< /S /GoTo /D (subsubsection.2.2.1) >> +endobj +48 0 obj +(mAdd) +endobj +49 0 obj +<< /S /GoTo /D (subsubsection.2.2.2) >> +endobj +52 0 obj +(mBackground) +endobj +53 0 obj +<< /S /GoTo /D (subsubsection.2.2.3) >> +endobj +56 0 obj +(mBgModel) +endobj +57 0 obj +<< /S /GoTo /D (subsubsection.2.2.4) >> +endobj +60 0 obj +(mConcatFit) +endobj +61 0 obj +<< /S /GoTo /D (subsubsection.2.2.5) >> +endobj +64 0 obj +(mDiff) +endobj +65 0 obj +<< /S /GoTo /D (subsubsection.2.2.6) >> +endobj +68 0 obj +(mDiffFit) +endobj +69 0 obj +<< /S /GoTo /D (subsubsection.2.2.7) >> +endobj +72 0 obj +(mFitplane) +endobj +73 0 obj +<< /S /GoTo /D (subsubsection.2.2.8) >> +endobj +76 0 obj +(mImgtbl) +endobj +77 0 obj +<< /S /GoTo /D (subsubsection.2.2.9) >> +endobj +80 0 obj +(mMakeHdr) +endobj +81 0 obj +<< /S /GoTo /D (subsubsection.2.2.10) >> +endobj +84 0 obj +(mJPEG) +endobj +85 0 obj +<< /S /GoTo /D (subsubsection.2.2.11) >> +endobj +88 0 obj +(mOverlaps) +endobj +89 0 obj +<< /S /GoTo /D (subsubsection.2.2.12) >> +endobj +92 0 obj +(mProject) +endobj +93 0 obj +<< /S /GoTo /D (subsubsection.2.2.13) >> +endobj +96 0 obj +(mProjectPP) +endobj +97 0 obj +<< /S /GoTo /D (subsubsection.2.2.14) >> +endobj +100 0 obj +(mShrink) +endobj +101 0 obj +<< /S /GoTo /D (subsubsection.2.2.15) >> +endobj +104 0 obj +(Backgound\137list) +endobj +105 0 obj +<< /S /GoTo /D (subsubsection.2.2.16) >> +endobj +108 0 obj +(create\137status\137table) +endobj +109 0 obj +<< /S /GoTo /D (subsection.2.3) >> +endobj +112 0 obj +(Batch Wrappers) +endobj +113 0 obj +<< /S /GoTo /D (subsubsection.2.3.1) >> +endobj +116 0 obj +(mBackgroundBatch) +endobj +117 0 obj +<< /S /GoTo /D (subsubsection.2.3.2) >> +endobj +120 0 obj +(mDiffBatch) +endobj +121 0 obj +<< /S /GoTo /D (subsubsection.2.3.3) >> +endobj +124 0 obj +(mDiffFitBatch) +endobj +125 0 obj +<< /S /GoTo /D (subsubsection.2.3.4) >> +endobj +128 0 obj +(mFitBatch) +endobj +129 0 obj +<< /S /GoTo /D (subsubsection.2.3.5) >> +endobj +132 0 obj +(mProjectBatch) +endobj +133 0 obj +<< /S /GoTo /D [134 0 R /FitH ] >> +endobj +136 0 obj << +/Length 210 +/Filter /FlateDecode +>> +stream +x???OkA ???)?q??1????c mQ(X??x??P+???wV?E??KH^??1z0>?k1??????*?jI#Gr???1of??????=.?????????]?I? +R???>'/?D(?po?C?V??H?d????1 )[?vf?`??n?????A???:?`f? ?b??+??$ +Yec?#???S???n???u ????_?G>?w???g??S +endstream +endobj +134 0 obj << +/Type /Page +/Contents 136 0 R +/Resources 135 0 R +/MediaBox [0 0 595.276 841.89] +/Parent 142 0 R +>> endobj +137 0 obj << +/D [134 0 R /XYZ -16.307 900.716 null] +>> endobj +140 0 obj << +/D [134 0 R /XYZ 56.693 759.068 null] +>> endobj +135 0 obj << +/Font << /F50 138 0 R /F51 139 0 R /F52 141 0 R >> +/ProcSet [ /PDF /Text ] +>> endobj +178 0 obj << +/Length 901 +/Filter /FlateDecode +>> +stream +x???Ko?0??? +???o?c??S?6??????h )??d i??~y?=4?*h} ?3C>???1??????v?PP "?d??y?* +&?????,?^-S:.??>]:???l(2*h>?)qv??*???Q?_i?N???t"?Pd?=??@Lc??? ?? + ?????1?ABE?}??O ???L?????+?L@?E??$3:\????Rw2?F?:?Ex{???KD?????b??????????) +??????$?YT +?V??B?xP*m ?:^???????e +A?s(TT%???L??????7/???? +:?????R}??3!?'???2<??JC???z?/[\???9???y?????"?q,??????X??/?V?Lp??????z9??v???M?Q/`????g????a???? +*?IV?O?h??d?'l???4??^??????,G#S??K2?q??D??????????D??z^\?[D??n'1 {O???I??????:r?vm? t?????]?C????~:}(??????J?I?k????w?]3z??,i7?n?????60???w?bJ??;J?? +??)?0?z?ow??????Z??9Lq?3?-g??w;"???+?]?V2?P??Y??A? +endstream +endobj +177 0 obj << +/Type /Page +/Contents 178 0 R +/Resources 176 0 R +/MediaBox [0 0 595.276 841.89] +/Parent 142 0 R +/Annots [ 143 0 R 144 0 R 145 0 R 146 0 R 147 0 R 148 0 R 149 0 R 150 0 R 151 0 R 152 0 R 153 0 R 154 0 R 155 0 R 156 0 R 157 0 R 158 0 R 159 0 R 160 0 R 161 0 R 162 0 R 163 0 R 164 0 R 165 0 R 166 0 R 167 0 R 168 0 R 169 0 R 170 0 R 171 0 R 172 0 R 173 0 R 174 0 R 175 0 R ] +>> endobj +143 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [55.697 706.356 113.38 715.332] +/A << /S /GoTo /D (section.1) >> +>> endobj +144 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [55.697 676.558 152.045 687.437] +/A << /S /GoTo /D (section.2) >> +>> endobj +145 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [70.641 658.49 119.099 669.394] +/A << /S /GoTo /D (subsection.2.1) >> +>> endobj +146 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 640.558 152.324 651.461] +/A << /S /GoTo /D (subsubsection.2.1.1) >> +>> endobj +147 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 624.682 156.19 633.529] +/A << /S /GoTo /D (subsubsection.2.1.2) >> +>> endobj +148 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 606.749 149.315 615.596] +/A << /S /GoTo /D (subsubsection.2.1.3) >> +>> endobj +149 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 588.817 150.122 597.663] +/A << /S /GoTo /D (subsubsection.2.1.4) >> +>> endobj +150 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 570.884 151.786 579.73] +/A << /S /GoTo /D (subsubsection.2.1.5) >> +>> endobj +151 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 550.894 199.925 561.798] +/A << /S /GoTo /D (subsubsection.2.1.6) >> +>> endobj +152 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 535.018 167.576 543.865] +/A << /S /GoTo /D (subsubsection.2.1.7) >> +>> endobj +153 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [70.641 515.028 159.457 525.932] +/A << /S /GoTo /D (subsection.2.2) >> +>> endobj +154 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 499.153 152.334 507.999] +/A << /S /GoTo /D (subsubsection.2.2.1) >> +>> endobj +155 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 479.163 183.876 490.067] +/A << /S /GoTo /D (subsubsection.2.2.2) >> +>> endobj +156 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 461.23 172.817 472.134] +/A << /S /GoTo /D (subsubsection.2.2.3) >> +>> endobj +157 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 445.355 174.481 454.201] +/A << /S /GoTo /D (subsubsection.2.2.4) >> +>> endobj +158 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 427.422 151.527 436.268] +/A << /S /GoTo /D (subsubsection.2.2.5) >> +>> endobj +159 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 409.489 162.605 418.336] +/A << /S /GoTo /D (subsubsection.2.2.6) >> +>> endobj +160 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 389.499 167.836 400.403] +/A << /S /GoTo /D (subsubsection.2.2.7) >> +>> endobj +161 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 371.566 161.748 382.47] +/A << /S /GoTo /D (subsubsection.2.2.8) >> +>> endobj +162 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 355.571 173.255 364.537] +/A << /S /GoTo /D (subsubsection.2.2.9) >> +>> endobj +163 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 337.758 157.873 346.605] +/A << /S /GoTo /D (subsubsection.2.2.10) >> +>> endobj +164 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 317.768 170.994 328.672] +/A << /S /GoTo /D (subsubsection.2.2.11) >> +>> endobj +165 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 299.835 163.402 310.739] +/A << /S /GoTo /D (subsubsection.2.2.12) >> +>> endobj +166 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 281.903 174.481 292.806] +/A << /S /GoTo /D (subsubsection.2.2.13) >> +>> endobj +167 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 266.027 161.749 274.874] +/A << /S /GoTo /D (subsubsection.2.2.14) >> +>> endobj +168 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 246.037 189.972 256.941] +/A << /S /GoTo /D (subsubsection.2.2.15) >> +>> endobj +169 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 229.081 203.232 239.008] +/A << /S /GoTo /D (subsubsection.2.2.16) >> +>> endobj +170 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [70.641 210.172 160.005 221.075] +/A << /S /GoTo /D (subsection.2.3) >> +>> endobj +171 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 192.239 207.118 203.143] +/A << /S /GoTo /D (subsubsection.2.3.1) >> +>> endobj +172 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 176.363 174.769 185.21] +/A << /S /GoTo /D (subsubsection.2.3.2) >> +>> endobj +173 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 158.431 185.848 167.277] +/A << /S /GoTo /D (subsubsection.2.3.3) >> +>> endobj +174 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 140.498 169.499 149.344] +/A << /S /GoTo /D (subsubsection.2.3.4) >> +>> endobj +175 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [93.555 120.508 186.645 131.412] +/A << /S /GoTo /D (subsubsection.2.3.5) >> +>> endobj +179 0 obj << +/D [177 0 R /XYZ -11.232 900.716 null] +>> endobj +176 0 obj << +/Font << /F50 138 0 R /F51 139 0 R /F52 141 0 R /F57 180 0 R >> +/ProcSet [ /PDF /Text ] +>> endobj +183 0 obj << +/Length 1791 +/Filter /FlateDecode +>> +stream +x??Y?s?6 ?_???w KR%???[???m?????Sl?Q+K?$7???)K???u??C? ???????W???7?R?*????S???Kx??4?+??}???_???6z~!#?????\?V?%??d +?MB?B?F1 ???5 +?f???f???"????).??v??#?V????Y?&????z??L +??w=?}??&?`3???BD??* ?4B???Bp?????z]?k??"????g?? ??$&9????_f U??>ze? ]a?k?????*??N????????e??0??Q?F??m'???H????#??pO???o61N????????????F6?4?X2??o+???W?6k???? ?? '??=\???????D????8!??NE\???'|y&??9??B????bE`?mV????c?~Il???; V??\??Zl???????????=sA??w?t)?)k^????}&G> endobj +184 0 obj << +/D [182 0 R /XYZ -16.307 900.716 null] +>> endobj +2 0 obj << +/D [182 0 R /XYZ 56.693 759.068 null] +>> endobj +185 0 obj << +/D [182 0 R /XYZ 56.693 731.272 null] +>> endobj +6 0 obj << +/D [182 0 R /XYZ 56.693 596.031 null] +>> endobj +186 0 obj << +/D [182 0 R /XYZ 56.693 556.98 null] +>> endobj +10 0 obj << +/D [182 0 R /XYZ 56.693 556.98 null] +>> endobj +187 0 obj << +/D [182 0 R /XYZ 56.693 529.727 null] +>> endobj +14 0 obj << +/D [182 0 R /XYZ 56.693 500.03 null] +>> endobj +188 0 obj << +/D [182 0 R /XYZ 56.693 474.337 null] +>> endobj +189 0 obj << +/D [182 0 R /XYZ 56.693 468.461 null] +>> endobj +190 0 obj << +/D [182 0 R /XYZ 56.693 471.351 null] +>> endobj +18 0 obj << +/D [182 0 R /XYZ 56.693 417.347 null] +>> endobj +192 0 obj << +/D [182 0 R /XYZ 56.693 391.654 null] +>> endobj +193 0 obj << +/D [182 0 R /XYZ 56.693 385.778 null] +>> endobj +194 0 obj << +/D [182 0 R /XYZ 56.693 388.667 null] +>> endobj +22 0 obj << +/D [182 0 R /XYZ 56.693 334.664 null] +>> endobj +195 0 obj << +/D [182 0 R /XYZ 56.693 308.97 null] +>> endobj +196 0 obj << +/D [182 0 R /XYZ 56.693 303.095 null] +>> endobj +197 0 obj << +/D [182 0 R /XYZ 56.693 305.984 null] +>> endobj +26 0 obj << +/D [182 0 R /XYZ 56.693 240.025 null] +>> endobj +198 0 obj << +/D [182 0 R /XYZ 56.693 214.332 null] +>> endobj +199 0 obj << +/D [182 0 R /XYZ 56.693 208.456 null] +>> endobj +200 0 obj << +/D [182 0 R /XYZ 56.693 211.345 null] +>> endobj +30 0 obj << +/D [182 0 R /XYZ 56.693 157.342 null] +>> endobj +201 0 obj << +/D [182 0 R /XYZ 56.693 131.648 null] +>> endobj +202 0 obj << +/D [182 0 R /XYZ 56.693 125.773 null] +>> endobj +203 0 obj << +/D [182 0 R /XYZ 56.693 128.662 null] +>> endobj +181 0 obj << +/Font << /F50 138 0 R /F51 139 0 R /F52 141 0 R /F90 191 0 R >> +/ProcSet [ /PDF /Text ] +>> endobj +206 0 obj << +/Length 2021 +/Filter /FlateDecode +>> +stream +x??Z]??6}???G{&Q$??>%m??3???}K2w0`? p?????w?$????b??t??#????x?{s?????k???? +?~? ???,???}?}X????e?D?t??r?x?????????xt????0?9!(?\w??C??O?nw???}?#????0? ?z????'?%P??? ??m??8?????????;l&?{???,6 ??(?`?V +?????`???xI????R??H?7?!ntc??j??? f?#??'}?$QPbN??y?A?U???j??,=??IN???????J}|k?1#t? +i??m??? zC??e]z)G?5???>??{| M7P=???R???H}6:???t?*{???!h??;?Ma???f????????e??$??D[?n????[??"???Mm??X:???GG??ge??!Bp?x?u^F?86?????D??D?? ge'0D?@S?X????$??1??wd?Y? LH????L?73?9 +! +???>?#??^?????&??o??|?q??^ ???U?_?H?~????p?????Z?ZmY?jh???!?O?,-????Oe????#?u??2(?k???r=??v:uQ?Eb+??T?e?^R???1?3P??????J?&[??~vJ??j???????bW?Q??z?[/%j?B??.??>?Hzn??/???Ee????A??>?x?n?????l????p ?B???p5x?7{???f?+;>???!?? ????? ??8d?|D???pU???????r?NH??]??v???8??J??~6.L????*p ??wB2?w??Y? \???Ix?f.?DX?w<2?w??Y? \P?|???m??Qd??C}3X B?;o?;r???.p?????e??l??#??;n??????x6X ???l$??LF?C?????;?????????????2?Gd? ??c?k?K!uv)D? ??1????.6?%?N???Si??$xQ????6en??dQ4????&????62C???????Zm?0OZx(?/?????"&7??(trz?]?A?Q?i?G?}?????,??&j???X????? ?j?Y/7;???P??SW????%S)?:??"62?V??????~2*Ter???B +??$x(l?C?ImK/??/?{}??N????Jks?]5H????Ik??f??}???Zi ?>??(toB??"zm??{D??8jRc????????`@`?5??h?????[(8b?y??(8?9?;7?jg +???????Z,x??}??,???5??4??CK???45z?P(??p?6?rP{?N?????;??????D??2IMQ??.??N+?,*??1?mY????^d??\? ??C??o??m|?B???y3?c????e?????{?? +#?/??????P)'??|7??????`dR^?? ?T??G???_ g???e}e ??1`A%????j??6g??O????????*??~K???Q#l??????k(?????????&2&< +??h=y4-?Z??v?? +N@???V?>??9???*w???]\I?2??5??%c7&h?5D????1??F ?D5??Q;??? V?(?p???)7)hY-^?h???y??K?}?? +? ?jD?M??|??_???K[??????@u?\??U???W???Kb?Tw-?Q +]*????N?C??j@??KF0???S?V?{q?uG7?G??,I?M?18M2u#SB?-?b?????rw??????@????$Db??|?$|7_???x_K$????mW??;nt???????}??w-?z5t?????M??;t??\?O9|??E?1??l?Pa?8???????fY??x?n??7W??7?9???S???9?f=???7?"{X?????????z???`????P> endobj +207 0 obj << +/D [205 0 R /XYZ -11.232 900.716 null] +>> endobj +34 0 obj << +/D [205 0 R /XYZ 56.693 759.068 null] +>> endobj +208 0 obj << +/D [205 0 R /XYZ 56.693 739.087 null] +>> endobj +209 0 obj << +/D [205 0 R /XYZ 56.693 733.109 null] +>> endobj +210 0 obj << +/D [205 0 R /XYZ 56.693 735.998 null] +>> endobj +211 0 obj << +/D [205 0 R /XYZ 56.693 725.039 null] +>> endobj +212 0 obj << +/D [205 0 R /XYZ 56.693 714.08 null] +>> endobj +213 0 obj << +/D [205 0 R /XYZ 56.693 703.121 null] +>> endobj +214 0 obj << +/D [205 0 R /XYZ 56.693 692.163 null] +>> endobj +215 0 obj << +/D [205 0 R /XYZ 56.693 681.204 null] +>> endobj +216 0 obj << +/D [205 0 R /XYZ 56.693 670.245 null] +>> endobj +38 0 obj << +/D [205 0 R /XYZ 56.693 604.038 null] +>> endobj +217 0 obj << +/D [205 0 R /XYZ 56.693 578.243 null] +>> endobj +218 0 obj << +/D [205 0 R /XYZ 56.693 572.266 null] +>> endobj +219 0 obj << +/D [205 0 R /XYZ 56.693 575.155 null] +>> endobj +220 0 obj << +/D [205 0 R /XYZ 56.693 564.196 null] +>> endobj +221 0 obj << +/D [205 0 R /XYZ 56.693 553.237 null] +>> endobj +222 0 obj << +/D [205 0 R /XYZ 56.693 542.278 null] +>> endobj +223 0 obj << +/D [205 0 R /XYZ 56.693 531.319 null] +>> endobj +224 0 obj << +/D [205 0 R /XYZ 56.693 520.36 null] +>> endobj +225 0 obj << +/D [205 0 R /XYZ 56.693 509.402 null] +>> endobj +226 0 obj << +/D [205 0 R /XYZ 56.693 498.443 null] +>> endobj +42 0 obj << +/D [205 0 R /XYZ 56.693 432.236 null] +>> endobj +227 0 obj << +/D [205 0 R /XYZ 56.693 403.851 null] +>> endobj +46 0 obj << +/D [205 0 R /XYZ 56.693 322.8 null] +>> endobj +228 0 obj << +/D [205 0 R /XYZ 56.693 294.848 null] +>> endobj +229 0 obj << +/D [205 0 R /XYZ 56.693 288.87 null] +>> endobj +230 0 obj << +/D [205 0 R /XYZ 56.693 291.759 null] +>> endobj +50 0 obj << +/D [205 0 R /XYZ 56.693 213.598 null] +>> endobj +231 0 obj << +/D [205 0 R /XYZ 56.693 187.803 null] +>> endobj +232 0 obj << +/D [205 0 R /XYZ 56.693 181.825 null] +>> endobj +233 0 obj << +/D [205 0 R /XYZ 56.693 184.714 null] +>> endobj +204 0 obj << +/Font << /F50 138 0 R /F51 139 0 R /F52 141 0 R /F90 191 0 R >> +/ProcSet [ /PDF /Text ] +>> endobj +236 0 obj << +/Length 2169 +/Filter /FlateDecode +>> +stream +x??ZKs?6??W?(U? +?????? b?/??z??c??Gs???b_{+j?Vb?feo?vR??{??M?????[Z??=?????f=Co??? ???m?J;??5??U]?Q{??b?-X???`w"???MRn???? +???-?*cd?????7A?8((U??S>??gy?}?PH?-??a8}z$v??fj:&?l??m?????=L!?? +X???????`5????fl?<`iSk?m?????%???e?? ?=???@??r????X????o???w?t???]J?g?{sv>)?o`W|N?J?6?9?w????G?????y??????SUn &?d?~??d??5Ev +DMUN +?"F?2JS9?%<@F %? +???V.??j???%??Y?{ObJ??\?5j????E!?>3?Y??w?W????.1???????b???j?????S?,8?v????L???&?????2??f??!???? ?"??~???X??:l?]v?31n??5^.Y??????}?p.?????\,????!R?r?)v1D???H??=?RNI???9"?5??x??yg???????R?I?5?N(Ih???1s?1??[??c??c??????$d??g???%`?i?y????j-??te?:1tn???????=n???? ???o?BzU???Wu?48x??m! +?? ?s??????y?0????A??\?r???? E????[??$??r?T???>?x???i????.?i???>?????}?O?????> +O?i?OF??}??}?/?6WH?h3:P?w??`?|?B??9??)?????T 1?+2A?L8??%8?u'e???R>)???????mR??]? +?zJ?f?u? ????[??S??q?'? G ??^ +???????????]??????O???!???a?????= ?.??r7?_?? fc?/}??? +?_?(~ +D?T??dt*? O?2]??.?A?l??? ipr?G%n?}?&???;??+??q??Z~(?]?????+???????24P?h???Z??h??/Y?k,`pVc?r?????????? ?HZ??X????A???????@?8? +| +`T????P????? Gf3??.??0?'?< +??p? ????S???+??Lytu???A???q?s??(#/???B}???W?`.?P????2?$?uG?y??_?bq???O+?#??????r?O??Is +.????G at Y'6??????n????SJ?T????/??4 +endstream +endobj +235 0 obj << +/Type /Page +/Contents 236 0 R +/Resources 234 0 R +/MediaBox [0 0 595.276 841.89] +/Parent 142 0 R +>> endobj +237 0 obj << +/D [235 0 R /XYZ -16.307 900.716 null] +>> endobj +54 0 obj << +/D [235 0 R /XYZ 56.693 759.068 null] +>> endobj +238 0 obj << +/D [235 0 R /XYZ 56.693 739.087 null] +>> endobj +239 0 obj << +/D [235 0 R /XYZ 56.693 734.297 null] +>> endobj +240 0 obj << +/D [235 0 R /XYZ 56.693 737.186 null] +>> endobj +58 0 obj << +/D [235 0 R /XYZ 56.693 661.911 null] +>> endobj +241 0 obj << +/D [235 0 R /XYZ 56.693 637.304 null] +>> endobj +242 0 obj << +/D [235 0 R /XYZ 56.693 632.514 null] +>> endobj +243 0 obj << +/D [235 0 R /XYZ 56.693 635.403 null] +>> endobj +62 0 obj << +/D [235 0 R /XYZ 56.693 560.129 null] +>> endobj +244 0 obj << +/D [235 0 R /XYZ 56.693 535.521 null] +>> endobj +245 0 obj << +/D [235 0 R /XYZ 56.693 530.731 null] +>> endobj +246 0 obj << +/D [235 0 R /XYZ 56.693 533.621 null] +>> endobj +66 0 obj << +/D [235 0 R /XYZ 56.693 458.346 null] +>> endobj +247 0 obj << +/D [235 0 R /XYZ 56.693 433.739 null] +>> endobj +248 0 obj << +/D [235 0 R /XYZ 56.693 428.949 null] +>> endobj +249 0 obj << +/D [235 0 R /XYZ 56.693 431.838 null] +>> endobj +70 0 obj << +/D [235 0 R /XYZ 56.693 368.518 null] +>> endobj +250 0 obj << +/D [235 0 R /XYZ 56.693 343.911 null] +>> endobj +251 0 obj << +/D [235 0 R /XYZ 56.693 339.121 null] +>> endobj +252 0 obj << +/D [235 0 R /XYZ 56.693 342.01 null] +>> endobj +74 0 obj << +/D [235 0 R /XYZ 56.693 266.736 null] +>> endobj +253 0 obj << +/D [235 0 R /XYZ 56.693 242.128 null] +>> endobj +254 0 obj << +/D [235 0 R /XYZ 56.693 237.339 null] +>> endobj +255 0 obj << +/D [235 0 R /XYZ 56.693 240.228 null] +>> endobj +78 0 obj << +/D [235 0 R /XYZ 56.693 164.953 null] +>> endobj +256 0 obj << +/D [235 0 R /XYZ 56.693 140.346 null] +>> endobj +257 0 obj << +/D [235 0 R /XYZ 56.693 135.556 null] +>> endobj +258 0 obj << +/D [235 0 R /XYZ 56.693 138.445 null] +>> endobj +234 0 obj << +/Font << /F50 138 0 R /F51 139 0 R /F52 141 0 R /F90 191 0 R >> +/ProcSet [ /PDF /Text ] +>> endobj +261 0 obj << +/Length 2217 +/Filter /FlateDecode +>> +stream +x??ZK???????d?\>$J:?"?? ?N???b@???iYr$y;?_?"??)?z??X?$>??d???H?`????/???~?h??Tr,???D?ABc"R,V????c???VW????[???w???/>?T$0U +=5L`n???4?pr3?d?~??v?????7 ? "I$h?SF$?A????; +V??!?$L??????? ?2???? +?????p?"';L ? +??C???&?n?t??p??;???N?y7?W???A,?+m?n??$??'i?M?}??[?+??$4u +P0??/?o7e(?m?)|Y?? +?DI???>km ?_l-? ??!T???R}??[$??jgKF?-? _???E? +??u?S????  ??(???M??????R???M??????RpR~5?? A/7?t?"????P??DxZ???nY~#|??=?F??????O?????o???C????W[ ??0?=?C? +!?`?5*?m6}??????#???#??????Am?%ms_G4?MV??03?f?6???0 I?iP0???Dc???????v\V??E??pdQu5?+??E?)?P`XUd???K????/5???????T:\?Q4???u?????qMm?c?m?s??R +b?!???w& +?i?k??}????_M^?"??|w???.7?t? ??R8#J?_?????i???|?J?t?',???u?? +~\'i??? 9&?1?????M??Hj9F#TI=?????pFzGhj????????#?h!G? i??c|?????}?X7??D?F???O??i?Q?j?N-??)[ v???x??F?=ch?nGS????? ?????;??0 +?% +????g?=K?&$???gy~??dI??0???Xw????h?p?1?}j6j???????? ???l? +??K??kw|???@r'A?B[???g???\?@??q[??? +p?Tmg??????????n?C???????m?"?/??f??p??s0?^|??8?8[??????pH?`0???[?)q|5?????/7?t???UF6?v????"?D$?[p??b%l??iG?K?.?tL ?!??????hK?q?????0?Lh:LS ??2-9Rw?I|,????'?????=u ?H?????K O?gn +???QP???f??????<+ eCMs?X?c?u.???A???=EV?9>3??[ZE?W???|??????9?????qA???m?=?I[?mE:?T?Hw?/U???6?7???+???$?-? ????Gp????S?'?????????{-?B +????q??r?+=???e??SK-??s???Y3|9?I????d??B????mST'b*??)??C??$?z#???!?{z?%???B?m?-?B|??RR7???TyfRT?i??*??KC?I?x??C?A???  #&{?nC(?? xC?;?S??c"h???-?}???b???>?A??|??a?????J\r?up4????L????>T??e??z)????z???$!????#?????????L??A????*{???A???M3r????????ghh ~??Lr?(?D?,?Q^?Q^y?R??i??Gj??????VG???? 9?2???u?????Jk??h????b????n?cR%??n??]?[Z3j-??~?M.??et?? ???d(;??W?i?;? +? +???+??S??s??:?-?{?M?????`????9d??WyV?Y?????????KRBe?-??%q?? +endstream +endobj +260 0 obj << +/Type /Page +/Contents 261 0 R +/Resources 259 0 R +/MediaBox [0 0 595.276 841.89] +/Parent 142 0 R +>> endobj +262 0 obj << +/D [260 0 R /XYZ -11.232 900.716 null] +>> endobj +82 0 obj << +/D [260 0 R /XYZ 56.693 759.068 null] +>> endobj +263 0 obj << +/D [260 0 R /XYZ 56.693 739.087 null] +>> endobj +264 0 obj << +/D [260 0 R /XYZ 56.693 734.166 null] +>> endobj +265 0 obj << +/D [260 0 R /XYZ 56.693 737.055 null] +>> endobj +86 0 obj << +/D [260 0 R /XYZ 56.693 673.418 null] +>> endobj +266 0 obj << +/D [260 0 R /XYZ 56.693 648.68 null] +>> endobj +267 0 obj << +/D [260 0 R /XYZ 56.693 643.76 null] +>> endobj +268 0 obj << +/D [260 0 R /XYZ 56.693 646.649 null] +>> endobj +90 0 obj << +/D [260 0 R /XYZ 56.693 573.114 null] +>> endobj +269 0 obj << +/D [260 0 R /XYZ 56.693 546.319 null] +>> endobj +270 0 obj << +/D [260 0 R /XYZ 56.693 541.398 null] +>> endobj +271 0 obj << +/D [260 0 R /XYZ 56.693 544.287 null] +>> endobj +94 0 obj << +/D [260 0 R /XYZ 56.693 422.55 null] +>> endobj +272 0 obj << +/D [260 0 R /XYZ 56.693 395.655 null] +>> endobj +273 0 obj << +/D [260 0 R /XYZ 56.693 390.734 null] +>> endobj +274 0 obj << +/D [260 0 R /XYZ 56.693 393.624 null] +>> endobj +98 0 obj << +/D [260 0 R /XYZ 56.693 269.994 null] +>> endobj +275 0 obj << +/D [260 0 R /XYZ 56.693 243.099 null] +>> endobj +276 0 obj << +/D [260 0 R /XYZ 56.693 238.179 null] +>> endobj +277 0 obj << +/D [260 0 R /XYZ 56.693 241.068 null] +>> endobj +102 0 obj << +/D [260 0 R /XYZ 56.693 177.431 null] +>> endobj +278 0 obj << +/D [260 0 R /XYZ 56.693 152.693 null] +>> endobj +279 0 obj << +/D [260 0 R /XYZ 56.693 147.772 null] +>> endobj +280 0 obj << +/D [260 0 R /XYZ 56.693 150.662 null] +>> endobj +259 0 obj << +/Font << /F50 138 0 R /F51 139 0 R /F52 141 0 R /F90 191 0 R >> +/ProcSet [ /PDF /Text ] +>> endobj +284 0 obj << +/Length 2176 +/Filter /FlateDecode +>> +stream +x???K??8???+|??*??%?g?g{"??D?????eD???lE????R2?@??{B??TJ??? 4z?h????????F)I?D?E?p??HSED*?????~?(?S????H2J?H???>?????I?????EAw?F4?N?:F??t??&k?c?f??yl??)?????0%??~?4?? ????(f'`??%??8?$?iT?h??xO?q??~???< ???m=V?_?}?a????+!)O?`?SX?GX??woJ??q??\*Rto?? }??k??z?P?o1????O???? +??>?N ??=??. ?????b?x????7?D????????????????Cg????#e??P??M]?f?? +?_?? +Ky?%:i????j???=?_?eUb?&??M?u?2?%?N?2_m?f??ehg??????6y[?_??????.TX}X??;??????!?Xu?B'????m???????*??u?7???\?.??\N?6e??q???2?c?<??>?????s_?u?{???L???z?m?wS9:??C?y????P?????-g????5?|]??Xx?U??9?vk??/??W +?Y?P?y?~(?Pn?I??H????5%S??a^B??????????????*???????w?*@)??Hd8???*0??X?? (??D???????^? +?0?P???%??Q'T?J)_y?k??(??"+?(u?/KS?A?MV??4???Y[????;??l??r?????W?N}t???w#zu???j????q?n?Hce??????%#Zu?$??3???|??????~T?r???yw???=??d????a?;?6?$)??????kA??????X?7???????\`??????CA???4?G?i?#?_m9???????A?0???\?v????????a??g?4Wp?i +?%D?5?/??q???? ?N?????U??@?u????%????????????H +$????c-?t?&??5?????yU4~(?h????=??@?nz%y?~*JP?]-J?"???,dE~o??G?n$,v$???M +?Q???????uh??L????1??`??????6??CZ?\y#7?2!??m|????Y??&k2?s???m??&?K?Hw???W?F?X??*H3??????cU?4???55?}?>>Gh??,q ucK?u??? W?p/??u?|{?#?????????Ui??,? \+??w%$?Dp>c8?1??AbH?Cq????!1t? +??,????????b +???;{?{??#wp6X????? + &?? w?q?0%???$????? +Z)w? ?????b???b???I};? #,Mo?l??{?G{?bE??P7?X?*I?a???_?:?_oL???_+Sfks??_?l6??v_???0??s?U?Q;?2????$?kN?????Z?5?r^??c?+??{??? b/+X?c[????ro?@"???0ug;W?:7X?gK?8??T?)???$??!\?7???????????t??^?OY????|?oR|??G?@?;?'H5?'?|? +?????.?s?83???C??!p?P?rYP???#ES?k????v?J=S????E&???y?Q +?r? C?]vY??+??(??, ?????????E??z?? +??z??=B9F ??'??????'-??:i??P?I?^?.?2 at b??C??Y at v?4??P?A??J?L????r?ppf?e???????????k 7W?0?8? ?C +???????*RJ?}?+???? ?}\??? +??4>x?=??x ?Jb?"K?b??b7IV??]>?I?VG:????z??-?????~w?)??vc???????!??x1?745??A?p? S8>T??w????????j???)??m?O?&W +??? G?]%NP????1I?HnC1????q?9?6?d ??&4??o u????h?????9??}?o??!D3}?c??~?)m?????\E?"????;G??-o?> endobj +281 0 obj << +/Type /XObject +/Subtype /Form +/FormType 1 +/PTEX.FileName (/usr/local/share/dblatex/latex/contrib/db2latex/graphics/warning.pdf) +/PTEX.PageNumber 1 +/PTEX.InfoDict 304 0 R +/BBox [0 0 29 29] +/Resources << +/ProcSet [ /PDF ] +/ExtGState << +/R8 305 0 R +/R7 306 0 R +>>>> +/Length 566 +/Filter /FlateDecode +>> +stream +x?]TI?T1 ??Y?0?9b?$@?{?Xp}????[?(??~???O???6?t +???>??j?????4'?W5??3??/?%H?K*???J,?.?H????&>?=o??&)?d?$+?]K????7??]?:(mm???? ?'??<(_?OU'?K 2?????X????~?op/????_???H ???]&?????2??%??d?w^?%bT??XE!x??8j?$?4????3?x??7?"?89?? ?2?m???F6?,? ?a;?,???w??8?]50&??}?)???0Hc?3p ha?> +endobj +305 0 obj +<< +/Type /ExtGState +/op true +>> +endobj +306 0 obj +<< +/Type /ExtGState +/OPM 1 +/SA true +>> +endobj +285 0 obj << +/D [283 0 R /XYZ -16.307 900.716 null] +>> endobj +106 0 obj << +/D [283 0 R /XYZ 56.693 759.068 null] +>> endobj +286 0 obj << +/D [283 0 R /XYZ 56.693 739.087 null] +>> endobj +287 0 obj << +/D [283 0 R /XYZ 56.693 733.109 null] +>> endobj +288 0 obj << +/D [283 0 R /XYZ 56.693 735.998 null] +>> endobj +110 0 obj << +/D [283 0 R /XYZ 56.693 657.837 null] +>> endobj +289 0 obj << +/D [283 0 R /XYZ 56.693 629.451 null] +>> endobj +114 0 obj << +/D [283 0 R /XYZ 56.693 587.653 null] +>> endobj +290 0 obj << +/D [283 0 R /XYZ 56.693 561.858 null] +>> endobj +291 0 obj << +/D [283 0 R /XYZ 56.693 555.881 null] +>> endobj +292 0 obj << +/D [283 0 R /XYZ 56.693 558.77 null] +>> endobj +293 0 obj << +/D [283 0 R /XYZ 56.693 547.811 null] +>> endobj +118 0 obj << +/D [283 0 R /XYZ 56.693 406.486 null] +>> endobj +294 0 obj << +/D [283 0 R /XYZ 56.693 378.534 null] +>> endobj +295 0 obj << +/D [283 0 R /XYZ 56.693 372.556 null] +>> endobj +296 0 obj << +/D [283 0 R /XYZ 56.693 375.445 null] +>> endobj +297 0 obj << +/D [283 0 R /XYZ 56.693 364.487 null] +>> endobj +122 0 obj << +/D [283 0 R /XYZ 56.693 150.064 null] +>> endobj +298 0 obj << +/D [283 0 R /XYZ 56.693 122.112 null] +>> endobj +299 0 obj << +/D [283 0 R /XYZ 56.693 116.134 null] +>> endobj +300 0 obj << +/D [283 0 R /XYZ 56.693 119.023 null] +>> endobj +301 0 obj << +/D [283 0 R /XYZ 56.693 108.064 null] +>> endobj +302 0 obj << +/D [283 0 R /XYZ 56.693 97.105 null] +>> endobj +282 0 obj << +/Font << /F50 138 0 R /F51 139 0 R /F52 141 0 R /F90 191 0 R >> +/XObject << /Im1 281 0 R >> +/ProcSet [ /PDF /Text ] +>> endobj +309 0 obj << +/Length 1806 +/Filter /FlateDecode +>> +stream +x??YK??8 ??W??W?,?>n??????6@??P?H?:vj;????(?v&??k1???(?"???0g?0???????;?????/?e?H??????1w??s;?p(??????:[\?????^|^?????T?qj??(p????x???Ka????N???~fN +c??q????s}.?.??f???.??b?c?8??-8???Ju???m??i6??????I?iU???IR??z?$???????n~?n????????oH??Bcn?B H=d?????s???????T^ +t?????b????c?b?a??i?????? \???K1?L?8?`..7M?y^<`???C??????EF6i?D??f&??????(?8???j?r\? ??)??k????I]Q?K?!}?3???|P%?*??? +?J?????{ ???????????????3<}?U? ?ITp[w?6???????Q??W???9?? +endstream +endobj +308 0 obj << +/Type /Page +/Contents 309 0 R +/Resources 307 0 R +/MediaBox [0 0 595.276 841.89] +/Parent 303 0 R +>> endobj +310 0 obj << +/D [308 0 R /XYZ -11.232 900.716 null] +>> endobj +126 0 obj << +/D [308 0 R /XYZ 56.693 560.885 null] +>> endobj +311 0 obj << +/D [308 0 R /XYZ 56.693 532.933 null] +>> endobj +312 0 obj << +/D [308 0 R /XYZ 56.693 526.955 null] +>> endobj +313 0 obj << +/D [308 0 R /XYZ 56.693 529.844 null] +>> endobj +130 0 obj << +/D [308 0 R /XYZ 56.693 400.582 null] +>> endobj +314 0 obj << +/D [308 0 R /XYZ 56.693 372.63 null] +>> endobj +315 0 obj << +/D [308 0 R /XYZ 56.693 366.652 null] +>> endobj +316 0 obj << +/D [308 0 R /XYZ 56.693 369.541 null] +>> endobj +307 0 obj << +/Font << /F50 138 0 R /F51 139 0 R /F52 141 0 R /F90 191 0 R >> +/XObject << /Im1 281 0 R >> +/ProcSet [ /PDF /Text ] +>> endobj +318 0 obj +[600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600] +endobj +319 0 obj +[500 500 500 500 500 500 500 500 500 333 333 570 570 570 500 930 722 667 722 722 667 611 778 778 389 500 778 667 944 722 778 611 778 722 556 667 722 722 1000 722 722 667 333 278 333 581 500 333 500 556 444 556 444 333 500 556 278 333 556 278 833 556 500 556 556 444 389 333 556 500 722] +endobj +320 0 obj +[278 278 556 556 556 556 556 556 556 556 556 556 333 333 584 584 584 611 975 722 722 722 722 667 611 778 722 278 556 722 611 833 722 778 667 778 722 667 611 722 667 944 667 667 611 333 278 333 584 556 278 556 611 556 611 556 333 611 611 278 278 556 278 889 611 611 611 611 389 556 333 611 556 778 556 556] +endobj +321 0 obj +[355 556 556 889 667 222 333 333 389 584 278 333 278 278 556 556 556 556 556 556 556 556 556 556 278 278 584 584 584 556 1015 667 667 722 722 667 611 778 722 278 500 667 556 833 722 778 667 778 722 667 611 722 667 944 667 667 611 278 278 278 469 556 222 556 556 500 556 556 278 556 556 222 222 500 222 833 556 556 556 556 333 500 278 556 500 722 500 500] +endobj +322 0 obj +[556 556 167 333 611 278 333 333 0 333 564 0 611 444 333 278 0 0 0 0 0 0 0 0 0 0 0 0 333 180 250 333 408 500 500 833 778 333 333 333 500 564 250 333 250 278 500 500 500 500 500 500 500 500 500 500 278 278 564 564 564 444 921 722 667 667 722 611 556 722 722 333 389 722 611 889 722 722 556 722 667 556 611 722 722 944 722 722 611 333 278 333 469 500 333 444 500 444 500 444 333 500 500 278 278 500 278 778 500 500 500 500 333 389 278 500 500 722 500 500 444] +endobj +323 0 obj << +/Length1 1612 +/Length2 12917 +/Length3 0 +/Length 13735 +/Filter /FlateDecode +>> +stream +x??yeT??-??N??$???n?id7????????????]?? 3l? +??$+L?7??a*???y?>  ???y"fC?^??U???$??????&??FKc2??x^?)??lc?1a????LKQ6?[??T?N?T??G*???]-:???????P?{^???eL?s5 +?c?????x(???X???1q????1??X??~?c???a?????????O ??????#?e???????V?~96?j at n??T???}?n:?g6}????d????~?????VD +{u??Qdr"??Y??*??~?jc2D?=?6??jb?N?~5 ?&???3??L??a +X?*lY????*???????]??o??x?8x????8????B[?2?v????l??A,?? ???A???D???ci?n5?]?@7?K?'???.??$/???b?????:l??I??WpYW??M???? l\eo?'M?3?sE???????3??6zI?:?b6?,??cI???{?'n???????T ????,??=q??u%#c&ik +????V?%T?M?@:??$??w??'r?=? ?4??/???)???7U?HT?`E? ??e?????`????.-?;??? ~6?5L*?s?O? +O?~l8t_^f?.~??h? *F ??????(???8=???::q???s?t?Zr?[?+ 8??u???8????i(fQfc??n2k?wq?=*?p??9?N??L??[)L?_?$es????2w?w1!?o/??p? +???G????$?}??}?p?oJ?({??????qU??u??i?A?j?{R??I'?=??oy*?k??R;-?~???,r????5gMs?)_'5??`]?9?O?1(????1?d????]D?T?Z??k?3?V?|??"?uZ???4VOt?e??C6lj?D]??#$?????#D?/?P?s?^W?F??;?2l???'?????4??W)!????ZGW?S???l??t&??? +?fB7?59m-??/x"1{HR^b??((?? +t??? +???!???_?Gnb%??????L!zu??+?n?a??d?^'?V??,D??Z??JQ7B73???s(?{???cGX!?r??????t?0?3??4Y???lQ US?R??."?!??q?C?? +??@?f?????? +}E[. yPhM??l?^?+Ls??B/?{???"?eb?d??V??u???????????-?&?Lb???H?[dt???G?j?????s!? ?z5??u_ ??"?X?`D????D?Y?????V~?????O??u??????5f???E?!???%???cT???^#Vt??Y +??f??k??[?8a?v??>??|!w???l????????7!????&?7Xj?J?jPOa{ pp???j?r????f&?]??S?zmH???.G?????c(??v?|!?2???F?S?_??o? +C??f?X??B?(? w??;?-??????!??????uKY??l?? ?M?????????P%n???G??St?????=?&??????Z?Z&r??l5??z!??????9?q??????}??e??\?P??!$?7 +??@#?7iq??F?g???.?y?N???X1zori?Ou?Y,A(?D?6E ??}c???Q:O?R?"??lp?????>??Cn u??A?v?]??????5?l??6&??r?~;?J???{R?Q?* +?w?!/d%d???k9??a?4?l??r???????p2F?????H5?7?-??|???6???T??[?????j|?o??& ( iGw,ew=?]??Y?sc?y>A???`$?? +!R?i?????ng??Qi??????slK3?l?m??y??g0I?`??_???+??P?7?b??#??b?pU????Jr?? +AS!??i3?????Iz=Ut?SL'????,?k??}?vJ?????jW??b?????k?A??)$.???X?T#??39?????g??J?G?Em{????o?????\??Vm?????:? +??? L/?_G????CS+????)?I:?J>??I9-??$?Y?m??d?W???#?D???3?3?:i?!???R??@@D?????v??x!Qd??Y~???6$t ?????-0?????;????E???HE??o[Q?????????f????????????T??J????y?K`qB?X?K(?????+???#`?z?/?? h???????J?S???3?K??!?????????(}G?=????m^ou????P?? ???/?|?>lO???l?????y?6%??G?UG?@?z?$??z?`PP|10pw@???,???????????K???? \$ ?:??[?m??]???-?<{'x???? ??GL???8??F??z??y?F(? +k)???????C ???$?p|?i??h + at -?dq?C??d`????/)S0?SEg??9F? s=??1???y?g?=???wOm +?r? ?v???)6*?YF?k?\E???????b>???????}??)??/?/??L"??h,,???Z??$????x9?? +?\k???W8??L?????0m???"b???P???A1?R?? ~?td?He3y?R?????????f??????????eY?cm?b? +=?x6?o??z42/????d$?Na?cd?N ?q??_?????PR??????~0??8?FN?=0D?-g]z?????????*?H?"w?\??5e8rw??j????al?o%?c?2)7?wZ8h$-??L?Bh?k????Mu?V??????0?2?v?5??u???q???t??~??hZ??S?O??_?zj?? +! ???k8U#Wg? +?i?5?F27R??,#??? &>??? +??Z/?A?x???G8?30?S:????6Q@?*L??Fc???yh?N?????!?aUK?q??E-???icC??_?}?????F??I})f???6 +??#??F????? ?N?g:???j{?4 ??Z??N?g???'????BA??"????~a<??@?_! +?O?'???L?tu^x9???v??????{?c%???~??1!?^5}?.??W???;????????u??`r???k??U??jZ????e???? +??????A????MW??????T`?_7???????E8?f-1???WU?0 ?E??67a??m?p)'?n???:????p??*?L??5A?q#b|Jf?w?? M???wm7????????f????s?????Q/?d??????S??Q????Y?|?9?"8/?7??8/?sD? K?bQ?51?Q C????5`Qa?K??0??. ?)J??bI??0 ??N?4B?\]??D???t??? +i?h ceC#?6??>?>J?3? ???B?0??GT?*:???R6O????? ?r=???????d??!Uk ????)?s???AV*9V?(y?? ??S???|??U?????????s????W???$?@????????Y??}?? +1R?K4K?I"P????k?#nDM?~-}?3????b??T?FPo?arV??*???????Y?t?%['?}?T0?[D???L?W?P??y???? +??W?d?;%:?????>??K?T???iW?@"3?_?(???*S8C?_?svR??????????-o??????6?=X?????(?O???3Ll?????6???rT?????k??D?k?nP#T??*$?v???Z??]????y???Yj?e?`?b?>??';ph?:??_??1B??'???8n?"?????l?t??g*2???x7?E5????T??X?U????Z??Wl????2?????hG??e?~q?$????#?}??~?K???h?????????s>??? +?ik?wwm~%?)%?;Q???o'?;??Q?????? ":???\ +?<??h$^GE?l?s?,??M???F???)~T??????U?R???)?????9???kk???&?/9&J?M%c??xE??W0????~ ????-TO?R?tz??????????e)(?-4N'????a????????p?:?-?`?K!??P ????+??????G?L`?\?????d???h8n"????y??? ?n????l????*??1??=K_?????T??Y??????=???K???)???gw ??A????8 b?K????H????t?+O?Gm?f)uu????????mA??????;?^????K"?5.?t?o ?????G?v=GpF?)?_??D???>m)??6?/a??.?????>??`Wh9V????N??y9t??!??E9?{???F????????n?X8?????????zg?]+?g?$?i???D??@?T?Kjj?*????"M3K???????%?->??4'??t?!?w?(??? +?0H?m?????????lj??????? ???mn???}ZF?????Hc?U"#??<>??x2~?@?f????o???j??D?Y??@??i????TS?!??? 7?LQ??`7????QJ+???qJ?:):?tsj???B?^?"21E?????rs??Y#{%?E???d?,C/ $???4 +???zq?@?'??M??i????$P#???+;??3????.??E`?[6?!u???'3N????(?r[??Q?k?|???????z?|[????FS ???(???C??????????w????_????????>:???%/??????l??(?{??'?R>M?!????O,S??2|???????$Kf????Bg??1?=?-b.????!m?Y?G?VK4?Y???????1x"?A?Hf ????? Y7?????!U[???0??<?a??????????;?7? :??? +?E ?I???>?????pV???K??! +???gY?=#T?e?f?@?[????;?? Z??v>???x?Z? ?O???O??  +$?'n?c???????s?s?R?~5?C??F{??HN???h&Y???????"I?-NE?4?Zyer??q???n?tZ2?;]?????? ?z#?x?pl?L???_???P???????_ ????????{@? ?D??O?????}?d?S????>O;?S? ??-2??)?pOM??K??;????3????"??T?u?X1??????? +;??U?BP)?6g&?vI??=}?>iK?b^!`?????????????|??V?B????lY7?CWW????+_-??p?????????? +?%????=????! ?{?a?L ?????_?N??z??????6?}:??4?P?'[u???C?R?m?U?^y?????????6?A??|*?=????Sj????5)V?Au??4?y +???$???L?K??FH??????_c??Q???p???????A??#?q??????? +?'qME2?~%?? &|;Q1X?C]???a?#[L?/l}~#????M?i??U?? "r?V?S???p?CFw?.???(^[/???5 +?jk? +??-NJ?5~Yg?8????9 7??=????#F?????I=6g?EO5?G???N?/??gF??"?YX?`?e??]?k??1??:????Vz??~???4?????|J??V???9RdU~??&????M9??0???$? M_??1 ????D?i???)i??KE??J?g.E;-k??XTP???????????6%Nv??l?e?Nl^dc:3? ??G??Y?Z|:?%??4#pC?0~??V?7?'?QD??}1?u?2???r?"3?7?3?????l?#n????{Q?U???2????????????h? +? ?????w#?Z4%????ZG????u?a???????d?2?R??j?:.???BcE??/??????D&?F???????x?%C??Z` k????6 4??F?e?50?????W??w????G???????`??8???????x??+?????4??LT?????????\?V?[??r2??6J?????Foke???@?????, ?7?????l{_?K7?|??????#F??'+??v??7??Sn n???T^?O???b`1?o????A???J???\???????jA???R??B1?wO?:? ?^???r?m????C?c?w??(??]+?+ ??pk??^u??S#???35???g]{Ue??:ix?+k???B?&V???? +?VF[??IR???%???T?Of?'?i??? ?X ???)???LG???A??6?F"g6????3???C???w??&?"Xm*?s?;?wp\????^"e??,^?W??xh???/8_??t???????e?UP???b?f???????>??g??4E%n???9?mTNcB?????-c I??#][B???k?????????????g?????y;1????0???B????^v?"?R&?i???z??}????D*?7????{???8??!?????|?G?q???U?-?b.d?(? ???/??u?#??p&???? ??-K?[?@Z?x??U????tI???y??e?&??'U? +#???????9.?8?X?sh?Le???L??#?Q???&q[U?}e3?'P??????.??K ?hv????????|?Z"?y&??D?w?G??_??}e]?y'???z????^cQ? f?fP+?)ji??do????<`N*"? ?????.??b?4??+r????1? i[?v???G?_[?:?Z5f?$???M?L??????%,?cW???%??8????b?i?????^?9{?b?]v???@??.??11???W?$?M??2nM?YR?}U???o]?\?9??? !?h?????I? o?? B??????\?O{S?yWd? ?n????q??/??,?W??U????Ep??Oz2?F?????!??A?T???? ??????????8???????l?]b?/?`?!???T??s??N????????f???????f???~5???Z???`?@>z??]???b? +p??D3???|?Vt?t?f??? ?'?3?????????dH}?Ow?L ?? ?? ??L?w?@L?OiD???*4?k? a??sr????Y?x-?n???n???bG??9???x??c???d@??S??~J??r?:???f??%M?IH?Aqy??~l??tE?\$H?N_??e??f?@?????.??.?f#??a??,?z?{k?~?l????(?????B??=?g\????nWX???u?? ???3??????M??i? +?K m5dfB1/:?y??d}U^m??????~~??8U????6?'?6??????44L?d??0i?????M?y?%????????9C???a???lm?U$??hw?6??]zL?Fexv?Id??S(?????mx???cAw??????Mu?p???"?w?N?{1???N??-m]b-m?D??nl ~??=?%??k;??Mm???*6.R?*z???+????+??i?Fg2-?5D?????????-zN_??: +J??_y?-??EC?E7???T???????????d?q????hW~?'>>X?_??Q???{2????@{`?=???0b ????(+??????J??????,??,??? +?9gQ?Z?:eIGt???>??[s????0i?3?????|???????#??6 ?/?c.?K??8? +?v8????W??7QpuQ??8??_?P?e??????>???Vu7w?(m?cO??9?8??:?4 ?@?????[%?u??6`i +]?#e?O??d???:yP??BC?_?bi??T??S?XL?????N????&???'?H?????@??????"??C??????l??5????|???PcE??e???????????h?i??wM??????OO=??SN??5?[[?J??q?-?? ????B????z??2?X???????4?3?I?&? ? ?k?P0??????u?I????y?m???.vS???^?W,l?b5Rp???|?c??5?1?h?????8???ha?? +C?q?p???? +??i?/7????X?Tu?Y????????V|?????}????G=??#?J?Ly{R=????6?W??V???? +mn?n??0;8;??;?ts????Cn???M?]v +??e?i?ut?'??'I??w?TT?Dh?d?Il?k????W%- +endstream +endobj +324 0 obj << +/Type /FontDescriptor +/FontName /TZLUSU+NimbusMonL-Regu +/Flags 4 +/FontBBox [-12 -237 650 811] +/Ascent 625 +/CapHeight 557 +/Descent -147 +/ItalicAngle 0 +/StemV 41 +/XHeight 426 +/CharSet (/A/B/C/D/E/F/G/H/I/J/M/O/P/S/T/a/b/braceleft/braceright/bracketleft/bracketright/c/comma/d/e/f/g/h/i/j/k/l/m/n/o/one/p/parenleft/parenright/r/s/semicolon/t/two/u/underscore/v/w/y) +/FontFile 323 0 R +>> endobj +325 0 obj << +/Length1 1608 +/Length2 10163 +/Length3 0 +/Length 10992 +/Filter /FlateDecode +>> +stream +x??veT???5?wk??C??\?C????;?? ??;$???????????u??5s?Z????kW?????RE?E? b????X8X?J [gGuc??8?? ?f?A???p;? `Ic'?@ h??89???(4 ?????? @????????O?_!?????tY??o.@??-???????,?s? + ???#?$??Q???@c???? +??2?? s????)l??4G?7,1G?1??h +z?t5???b?lA??o??#??????'6?q6??????7!;?[???? +L???h??s?eU???O'Kc??r;?????[???????????y??A`G?????\&@???????-????o?? ???0??f6 at G?7?7?????:??zc;;??oC???/ 'G??9+ +?[NS??? 0 +?_?"6?8??a7s??O? ?????53 o$?? `7???M ???@??S???'??A????y?o???F?m?????????66J??o?????8?1?_??-??????@-???O rN?om[?I????#?Q? +4S9?Z??m?z??]lt???oZ??F ???4,A????????? 6?W?o????MBM???4????G??????f?F???P?????/ qq?+????? ??????l?\~n~??!??@?<+;9?\zoE?s?]???y2?)?)???9Qw2?????r?:;8?)??????????t??,?BL?R??:Ud?K?u?s????h???????I Y?/??T?Z;*???6s`??%?????oC?; x?M?E?????L??????fX??z??q:?? +????y{}XU??? ?l?????????%???????iru4^+f-ve??!m??? +]?@_o??s??-??hdAc???'?/W5??_Y~ +d??P?v?#??WP??S?m????Y??s?????????%???%?2p???l`?l??U'*??~,2ak???L?M??0??VKC?? ?-y+jf?2k????:?M???m????E???J??l???S????C?????E1??b?5.???!?a lbvm?6?23????z-?l]??6?'??>?wj )???Vi-"??Q???D`L0?????V-#K}???vq?$?\??1i???[?9?}0????k?}:pr??hD??P?A??#?r[?v???,? ?M?Q?;EoJH???I??R^pr?H?^????&? +oso?L???\???c; +4?V???o ]?A??|???? +?9?j?[??^(???U? ??[???lYo?q????>? ???6?????K?,???,?? +?B???c??{??????? +?=?hV??????#R????%?@*?&M,?9*?0G? m????s_??IA??????G[??k?x?M??_????U??i=?@'????AGB?o?G?f`??f???J??d??9?wlAR_H&?9???x>?????!??g;?8??IU?O?m????n?e???/WE?yG ????=<.??[????r???)?s??qls,)E??FBR?KE#Xy???"N?(??m??X_??????A24??m.iR?????#?????[?4<^??$Q????x;?fg?_ha[(??k????1???????*?3v?UT?U?U?t??7i? ?8r????}IJU???1$X +P?[?? +Z??4E?j? ?Y? +E????A!_-D???/rC??H?B?]????g[6?y?M?*?S`?,;???! ?&????Z????l??h??1"?sj?uI??^?X? +<$&?&|x???????| Z?f?2??b?x?!?8??????_2???????????H??? ???'??Hm???+??cy??M?F6??????p|??????T?a????;?Q?z???????B???37?J?K?????>??O??\??EFU#?i????????????w???_?6N???u +spP???(??T?*?&??_%???/??J??????}6???????(?UC???dX*'Q?,??s???n? ?J?????>???????????u*?a??B???_?e,. ??a?P`??N??B??HS?e??K?PE?{?????????[y?i0m.?????b&?#??????]Y? +?j????? j?????????n{x?D???y5?F????Z+?;??&??\}Y?{52?*??6'?$??y?}????}?????2?+?F+?4??&8????|?p-? ?(?r????????????C??;?4??y??????????A{uN;???2????k???????].?wy??`???2?c!??s?5Vb? +? ??1???????xW?sh????w?)?E??K?wtZ?????) +y)????x??0_????/?*??z]iE?c????B?????Es?.??T??A?]=3ACw??6=?EX???i?XW??|h???va%?,????sL?????n? +???&,6????b??? +c?&3????J??A? FR?b?1z?? ???`?U?^td=?i?[??g?#r8?@-??, ??~?g?v_?/"??!????R8?? ?Q$?9?=~??\Y2?VW??????w2? 1?+??:?,??y??#\???8???????????????yS?Q?eEF"?m???NE?.?V3b??eJB +???I??????.l?^=?H???????J5?E??y? ????? ~^I?Gw?? ??? ?V(,??v.b]?????????g??%@????:?]??~???J???y??o`??C?"?|??SS]???zM??????;g[?x?f???&??8??????g????`K???L??;??$QY?qM??L ?/(e???H???|TH???P?r????K?[???%q?Au8???cj??V` ?eg?#?0??+e????"&X??DT^????(T +e?g?????v??*e??4J[??-??TL ??80f?|.???Z +|?*Qw?1c?? ?~?7~?z}??????? ??Ps?%?N??d?i??WE??AE(g??W>2a???w??=O?[?l?}kU????L??S3;??? +{??MRX?2?????}w6?????^?j?m1?'?4?????LWS#???d????:F`?qi????\?Y?#?Qd?43???T????l?????gp?????!]~?Y`?_??&eA????4???.???6????k? ?X????:???wby???Q?;???5z$C??i???????L?P??J?h?:0?V?3???W?{h? ?c??????????O??????I???'?3?E_j/?n?L:?jul?`?v?f????????D???D&????v??R??a?y0????-?o +? 34Q?Rg}l2?M?g~?9??????o???qf????/??Sv?{???h?w??P??|??????y!{??X^(???Sj?k????w?4???e?T???N??+?????i>?5???Z(} ??)En?[ ?>J??*m'?aJ@????N??!m??mMS?=}6?T?~?Q"?????J???#/nC? +???zh???qwZ?.???????AvF??J?.?|DP`n????q???}???\$?k7?b4B?*?YSY?????"???,?z +#??9??wh?P?w?????:9???l??w2Z?c ???*7?F##??6?D?~??e$????c^v?d??P<]?+??iu? +?.?q  ??.??[?\?{F?3g????J+??J?????g?k?3?sh????????? ?????/??????Hlu???P8????x,?@Q?z???L???`[~ 9R?j[J?"?e???e6/ ???uv??q??~DiJ??V??.?h4??????$??y +?5?r??9C???^?U?g?lu?.,?*???~??Q???c????R?F???J??\?L??Lx??t??cYb?>?J?`:?????"?:?V_[f3?? ???G????d??k0??[????t|???X?V??\MG?z)? ?($l??Q,?_??/??3??C ??e?;?$?f?nN???*?/???zq-9 '?DO?B$?T?x?/1?????{0?#?p????????$N!m??s?0*$???W????,?0wYg??MS??)?<4?&??wHH?=k?nx?f?5U??NUp?A??r??y?2??????t???-I'O??3?V +?????????n??S.????BG%???z?_?@?i??x'f?^ ?:?i??k?p??????P?)nO????x?H?? ZT?`v?>#?=????f? ~P%?e????[x??A +)?Oq??f????;z??lJ????j???f'[9?S?????Hx??=??wBA???~S=?!?'???%?A??w?l??f?~? +??T??a???0?pO8????+<??m???\?.???d68??-???A5Q?[~H=?=^??l?-??$?1+?????H?hq????????N_` B??`?5s?? ?5!?????"m2????K?N~Ys??#Z?BM?w~[S0R?????U&V?3???z$?l????7~?kD?+y???????0Q?(F???`y?????4???Ogx?@??V???s??8?f??D?eUy???k? l??g?[gZ???r?'?PD??????_*?u?PEN:y??????V???e????Z?(nXI??f +??g~??d[P4??+??qmQ?^.n?uK?Z?fa?}??j???6m?????????????F????S]??&o?t???hg?l*?=????k?=??8??S?~d ?qt?)?c???????(Nj???,0H2I??}+wX??????H?k<1??_?+?Z???>o<$*???????? f??#?????@/?:?~?|tC? ??5????}V??+??i??G??c???C?Z?|???^?u???r?6?'N ?Q?h?%???C? ???}BU{7?r,?W;???k??iy(?g?a??"'L?9?? ;bO??H?V7?H??]??5?j? (}??????"?3?K?b????>D???? +I ?????S??8Q[F5#?K6???j?????????-z?6???1?f"??:c??}m~??? C?:~"???;??? +X?l?c?r?Xx???.6?K???p?dck3???,??^?Z{2?V???4???[q?$?\1+8? +???Z?l\cU?Y??d%k?*y?`?9^bp$X???x 0~P????'K??.v??(?G?? +??????m?j??\'???%)??O???????(w0??????VF?E?????u.W?P?Y?JV???????$r???T_?f?vIQ$*???? ????? +???r???Gv???!6=R6??? ??*?Nu????R??h. +u?"????C??r????J?kLP? ???S??FN??]0?FB? +e??$????=/???d +?+?? ???FG???UV L??D??>V?????[?W+lK>F +?V??h?9=@01C???j?PG-?L???q??7?x????>?_??????kG?x?6?u??H????????Y??K/q? ??*?-:????Z?=M??O ? 3#??4r???s??Fb???(??Y T?????/?????? +?\?0?]u???>??R??-??M?o?H +??v???N??!????F?7o?????U???????? +?\[[i?u???L?}q?=7d?m???l??u=??6??5>??W??8Z?????u'???????F??X?????A? ? ? ??n''???B?,;?/|?;KL?? ???D??0?????p??4W$? +vN?2?s???l)?-]?R ?2)??? %%H??"f???S?Z??4cK~[$aU??B-?V??|h-G????a?????^??1????"?l???+???`???Fk?F??0?5m?Q????4?DQ?r???@GR??? +????????!??%????????)???u????o?l????:U??(???c?eI|nA?"?????g?oO??Hb??x?K57????[7k???E'? ?????V?e?Oe<^[??r??(????Alv?T3?k??Im??=?C???*???$S???m?[???N????w'?5D??a??? *??R.?`?"?Z D???"? 9.?N +?s?????v?7+\??d}?y/r????G;?????_h??t?????E??%????;???=FM,??Dd?7?"????Q%?2h??P +?? u?C?jM???}?r? ???????O??Z?{?>??U1=1???!?M??5(??rx?L4???+??C???p?ix^??u:????4&?`?????v??`6FA?Hq???K~???????????cH?\?1Q???c?1nX?vt??1t??????????4????p????Ih;?u_??a?$G?+????????Ua??g?>?????p??h6{???}$?SZ?A??V?N??~??:?d",y???????????`xR??y?>(???k???Z6?%>Q??Q|Y?0? W{d??!9h?@???M?i??E'?w???????y?C?]???o1??Y ??d?r*?UA????????[\?????????S?\?sk9?????z?<^ ?????L????B???j_?uHWJXS?_?M?&??!??q?!?A???|???o?t?X???v????????????????+?~?"|,?MV?i*?H?@?Ze?O?Dgm??W?{?v??_b;?r#g1??Ac(?,?:y??,?J??? /n???4?x>???Lh?8??+?=4_3 +???Czo?u??;?"?V???????-?n????!?TMe3?P?98?tH?O+??0? r???$?&k?????y?+M????A???W?8 ?a???p%?|??.?7a?Yc??? "?W????? +?,[m]???G?W)?'???????pX"????+???h??jB????`Kj?S??0] ??????-????H?(~??@ l?L??K?g???I???? +W????6|?m|??\?y?]/9?????7U7)???/????~#3vhT??@?l(U*?w;??X??Ki??S?9iG}?q^???S?Vj?W" +[?S?j at 3Vy?>?M?1?T7??uU?????I?/?4??9??v???~?C3Z_?????(OE??|?|????=fA%???K}n????Wj?Q???^???4R?????(???-9e,????0??? +????B????SR??z +?6?n???s????y??Y???(?Y?t?h> endobj +327 0 obj << +/Length1 1166 +/Length2 6977 +/Length3 0 +/Length 7752 +/Filter /FlateDecode +>> +stream +x?uWe\U???AZJ? +Hw?tJI7(?????aS???%??t?H?4R?F?)?zx?;??{?}??a?9??c?1?,Z +mi+?P +q???????-\???!?Z@?#(`????r??~$da at sg"g????????a^n?(?????????@(L??C=@g ??0=??]?g? ?????????X?,?@??c?;?# ??s?f? ?ssrs????Z?>?v?;\???2R??V?b????????>????p? + <:?1????3?K??t??0?o???| ??D??Q??Fr??? `???,???uY?[??[???5?/??j??????YC? ?C??????_`??F#M??Z??%%?P?????????ig???????aQ?F??Q??CO???????p?4?;4?: ?>?1? +?J???s????4a:??*?????>?PmB??I? ?L p?6?y??~???.???o'"????? +!???".+?f/?j{L??????]????s?|??\P???????AIqF?+S??w?p??ER?[ g??lk_? +3???waB??)??t1?<0???0??* +b?b???\???~h????S3?[?G?#/?()?N?E^??k/????N/??r????s???+I???+$?|???I ?a=X?~????_%?3?U?\ ???(??(?HWVG?c?N????R{a/????????*d?9???D??-K2???????@[K N'???????8n???~? +\?tw#3??Pir?????ow^U??????0???%~m??H?t????U?????~?M6?M?3???m?5?Z?y]??H?_?v?|??>:!?|J????=??A=y????;?k.??c?2??:~?m????~?Q5k??)???!xMy??Ee?G'?#??E??H??F??g?????|3?U??E??x???6kx?jS4?$6?W[<2? ?_??*?sm? ?H2?? +?Imv????W?X6Mh??)?<(?????bG??h???"r??.?Xz?I??T$vT~??ef?/?z???C???nE6-??4~?0????"zN?\_x0i?z?f?$??]?'4?Cy?w??R?,p.?????k??M??'???Bm?OK?T?4E?Qk?E?????=?-?S?j? ????!?i??q?S%A5?>?i??{?+??7?TN?%??? ?3SR??m2 +???? ??6??~ W~?????4?(sS??>??K??bA?e???=|O%??HK>?==AMyh?!?z?c??? ???g?????x?2??'4???J??[>QIw??d? )??? /???O????!{)M?#?? +?%??????9?'??1??????k????J??<6??j?l|o?u2??Z????>? +?6?2su? +yX???????"??n????v?G(??@?? ?BU????!??!.?X?????[ ?C?u??2:>WS??U??9jzAs?O?Zu??9????N?? +Kh???T?? +??u??? +j??K???&??>n!U?gE?2???? +TK?w6?.?P? `,??? 90?????????O????U?wz??=?:?vd??8??k?"??m?2?m??/? +r???'???e????L???w?O,a?C/???_??}Dlfy?d??4??*?_::,m?Y?]?^a?????0 G?]??E???v:??-6;xI?/zv?vG?O0f?7?\?????dhS-8???^??wY??P????)t????.?L? K?o? +?x????%<$#q??D?( ???????>???@??zy%?f?????Z{?%?2T????Ve??%??9 +(????sT??B0?m??k?wE?????m-? +Q??"z[????2R?j??V????o?????`??1?&??mBK?????7?np??N ?0?"?????w??j???H +? ?????g?Z?y?T?Hm?M??? ???.???????q????I??6???l????V??)?A ?N%02?{c?????`?k52?????V?|W???Y????~???W? +???B????/????2fd?P; +??M???????+??S??Fu??E ? +??.???V#?q=/?????3????4 ??s]T?????n?)/ ???#?|{?e?[pk5??|FC?}T)'??eV?->4??G?2???t? Q?6O;(??rwhR?!??[?2???????< ?N]*???g?lud??d`=??w[_aX????r? ??L|?kD?M?\?nu?z?.? ???a??s?{ayBi?? 3?????<;H?s??Vi???cojco_??6v'???x???9?[V??4?f^?(??MLSq???2???r??h? T??*????I<.?,??9? ?????d? v?u??U)?'?9?Q?b?y?I}???X?????#????Eb??Qr?V,???????`M?tq?&e5???]?T9???)? ?:??????Y???;6?2?L?k&{3??r?/??/1??B7E?A +??k7?@??VA3N% +$????#%/?L??7???to??R~?My`i???a?5????,??????a???-@??O,????? ???V?x???^??CRGX?+??D)1??????d??Q???Y{:r ?V2?T OT??j??????#)8????{7?? +?????"#????Z?A??>J?$???"?Qe????????W????,wJ?9????H?p%?k>?2??????M? ?:6?lS?1?W?f?? +y?|B"??R;3????????aT?F??Y[??m???Q?C-?5?pK???????y??T?X??+??Zb_a??U?\??.}!?o]/:?.?5??&1t?oq`?0??v???8???6$?@?`?S? R??:lXf?;?o???u???.p-?|?????mqtSk4+Y????:/B???????=??????4?\=h#?h?@0??G?????/??~?=??\R?[?.??Hw??xU??2?U0??JhI??L???????VMm.?-:v??{??????+????N???l?.?S??????O?1??????ex? +??w"i???O?T??>???NF??rR?!?>??|!!??}?"?,S?U=n1~?JV????????Y???s?5?t????k??PQ?????S>qo1?Y???c???C?O]C?VV ?k??;???7?9xz???(P*g???`??j????`.????}?#$?yg????0?l?~b at VsePY?.?Q 6f???u???3}?h +? ??3o?$p*??S?)????g#a?)H??a?^?YG7vP]?h>?m??????;??*?un?2IFG?e!&?HU??????\?G\?E`??y?D?'O?.?????c??N?e???^???i?1??t?z?#'!?3{q??????)?9?2B????i?+?????b??G2?a????F32hra?iOy?<)a???Leh??Z?E?7?E??&??O?]1u:?eL?M?H??Z-?:?~?"N???????]qf}???XjY ??P?d???AV?b]???x?E?@?C????4?.???*eKaTaRhw?????n? +?3??S????]EJuxF??A??T????r?O}?x?????a(Aiy?????y???b??)T??^?T?1?"y??????_???i$?w??~4A??z???S???~????MB?o?1 +??!?z; ++? +?}n????? ???~??G\?C? ?????o?J  ?\????&J?????`on??7???~9?'?x???b?q?Md?Wd~?6.??8~O?7<=1???R??????M?]6????(EQ18?;??LG????!???3???DTF=??c???5???e??>?U??T???[ ??O????? kL??13 +M???m? +?]ZYm??l??????t{?\t????^Dsj4 ?\???ei?????iA?&?X?H???Z?)??n +???I??~?w3?lbK???1?????A???$f?Q7p^??d???G6u(?R??]? +O? ???,??DQ3?2eb???,?~?????L`;??,????? 2??>v?Q??^? +??.z??30?]??????h???\?K?G????${???q'??O???VjU?b????a?1??????tt??1?A???`lB?_???e2,?*tn??E&??8?????>1x?q???wv-???L?s??U????F???V??Tk7?X?Gm?q?">i? >??[?|b?l=??,rqq??h8??g?7y?? R???4Y???H???RU:6??R??>???w|>?Ja??????F?????+?%?^8???b??Z?Twx???pJOnQ?^???Z??]A????/??O??#??w??????:o?'???????cY`5????{r???gy?l??)?=?z??<&?G???)G???T?u??.1?vN?5h??C? N??)~l?\???nx?CpL?5z???Mj?VD??,???C? +????k?&J?? +?;~???%? +endstream +endobj +328 0 obj << +/Type /FontDescriptor +/FontName /ZMBSGR+NimbusSanL-Regu +/Flags 4 +/FontBBox [-174 -285 1001 953] +/Ascent 712 +/CapHeight 712 +/Descent -213 +/ItalicAngle 0 +/StemV 85 +/XHeight 523 +/CharSet (/A/B/C/D/F/H/I/M/N/P/S/T/a/b/c/comma/d/e/f/five/four/g/h/hyphen/i/j/k/l/m/n/o/one/p/parenleft/parenright/period/quotedbl/r/s/six/slash/t/three/two/u/v/w/x/y) +/FontFile 327 0 R +>> endobj +329 0 obj << +/Length1 1626 +/Length2 7736 +/Length3 0 +/Length 8565 +/Filter /FlateDecode +>> +stream +x??TeX????ST:?tw?tw??????????.i)??n? )Q?;?;A???3?73f?????g?????? ??,?C??????o??r????(??2?j??,????'P?q ?:?Gn???*???o))?;????_?????x? ?s??%?q???jw????????~?:?? +F????6?psG???????m????(????????vrYb?MC,E?mS?S?5???2F??\?!??z???J??????s?D?@?()??"M??????N(M?NQ ???Q?????v_G???~????????AU???if ????E`{?R?????S??/?sA@??/???+????????]Da??B?(?i??'C?,?? +?D1N_F?6?????1???d ???{2?,Y ? ???I\???3}2xW?j!L}??^?? +A???????~???hf????%?cd?Y??????H /L???u7??\??Q? +?2????3,D???df??????d??m??3????????uwKile?TI?y???????oL??M??d?oc????I???iF?????C??2????6t|??? +???s?o;?z?a???wLP?????oi???$TwR]7-?:?"Io??W\Oe?@??E??^=l#?f?[??{Z>?w?IO???}s5y????v?9? +^?[??l?b/D????N?"e????oB??x?#??g>??~?c??Er/6Z?=?_??yN? +???N????????5p[3???97?]?yM`??4??:?s? +??[???I??h|???T vg<Ug?g@?????=?[?B??!'s?I????@>3??? X? +*??X?~c?VB????E????D?,us???Rl??L;v?rz? ~+??J??q?{UZ?{_|_??????f???n?b????]?8?????i????Rv??n??5??????U.+b??I?????!?H?}?????u?????s?TN????Z???,?7B??v????I?$?B?H?UP??5j?C??j/????r?S?5Gb +?W~?Ua??B?j?\????H:j-\ah?&????mZE??C???FmR?H?Xe?d?????mM?'? ?l?G??&,??/?????>?j?4???E(V?|l.??(x\???'#?qY???[/;J???D?8:?[????f???oh*????????Q?]}?? +|0?n???????l ?Kx??YpBX??Z7??V?x=?W.;???#?? ?=?Ayy????;??+?????6???0?w???wzD?????>OU,?3????????G?r??EU%w?q??&n?n??I ??I +Ao(?b,???[????&????_??&?-?@?5?????%?*??tf???-?P0??s|!kl?F:??+?n?0+??_?cn?T?W2w+??????O??>NT8???K???'??1?;??fui???e??N????u????FHW?*??\A`??&Rhk??P?)~2?2Z??Q|E[???-??????=[]#:???0# +?"{??dSq????H???????G?*?? ??z+??x.??'6?3%????]?????Z????[???????"??}%{?J~fV??r???/1?b?q???2!"??MwS???*>K??h0??F???3e???f?? 7?y&??i#??? ??7??;?H??Qk +?????t??????6< d?m??m?#8????N?????E??idw?9?0cpxv???a???B????????4????3)?"?%4{ +?E?2?;?|????@q6???@???r at A)0 +???H?k?[?UV T??f??_?;l??Z?u????M??Kxns<5G??Q??l?77?g?Z+x\?B??I?^?}r??o? +?$??6>??b6?.??D>Sp??a? +r?[??T +?!]??q??4??{??zlk?CWo??>?:%??W????`?????A-??0.????t?????z '?uu???U?)?I?$??j ?JW ?????nk??s???+?|(n?n??k??????N????7?L?It)Q?j???+)?? ?(??* ?}4???? ????? ??pk??Y?#??Es?'?????o?>?k??????B@??-????0E"ZO?G&???z?.[??W#??+????Y????V????I9B??2??Fm??,2C???? ?eqh????ZE?F1?????.?~?3:;?*? ??<1-2X[???u???1?)???G.?H????M?R????n&? ???'#?? ?????>????B??.??oM???(0??,???yM???<,??E?f?^???Z4??21w@??s????@??o??R????p80*(T?|?+0 $?6+fb~??&??e?XBv?D?s?Q1Jd?xL???K???B??????jm???8?????e?\?R??a|????xbC%t? ???bN??L???U?KJ&? ?_ +8?1???????rQ?j2????j????a|ES!??R?6Ti?HD???*?[??Y??:^kF?????Lc????|?????=?i-?Q??Z?)b??2?????V'u%??????L, +?'=?Kf[???v??OuDV?q????????(??O??g???A??/??S\L?|*?n?cg????????;X?2-? ??&???~?D?o?9?:???|?????@?md?.????#?R72??4u?A?!? ????eBI?"[??????XO?N???N?Np?P[M?TJE?k???g/??e?Bz??O? ?9C?????????a)??b`??q??e??F????y???&&\????>2]?}xt?<#?Cd?Z??}?z?? ?^T???I??`$m??%^????zG?X?T?)?????-??}^?V?1Q???NS?y?>? ???1???.O?Ex?Ws? +?a[L!?;"?t???@?c7?Z??A?.???9h?7??? +??????&??v??g?|??n?? C???R\Y ??j:?H???kxDa? +w?0?9G?ah??zL,???6f}U/???J??S?k&L?C?W?zi???`????#/??Qr??M???????I??????,???Y??h ?X??Q?*???"i??? +!????z9?=?ZI???x????&??a??O??2???|J????????N???P??$?`57?A.??A?$ z??*???1|?????}?]?{N???#?5?Yx?El??3????!????qI??kI: *;?f5H?0?P:????n??0??????/?$??S??8???#?!W?D??5?f??????G?]???]???#?.?o +,V?&O?#D???q??>'I?R??5;e?rd;C?}y???G??9i?:[?{??7 ???KB???L??e?????????/ +??DU??IR?)B? +~????it?7?HN?-?C?9j_Q???<=jx??x??!I? +??0]???+f????6??-????{??3??D7?F????Y???? ????1wU???$}??c?o6[c?H?{Y??k?~2?X?.????z???/i???%?LX? K??1)?Z?miq?????H@?",???R?}b?X?v-?zs?Z???}??X?WJ?:?fmA?Lp~?? <?^GXjy??[!?$????UY&dzND +?PO???qm?><?????%\45?To??y?k???{?????O??qo??u52???'Ns?a?{????N?)?9??u?c??8??$??g??_?? +?^h/!f??s??????^X%?A?+??P?j????XS????#?AH???b??b??p??W??7[Z?nZ?'?d? ++???????`O,?3O?F|???~U??En?b +???%????6!Y?????D????>????????=??O?q5?WK??>'??d??g?>?ed0I?[/????oV????E???y??@/?{9eZY.u?vG??zd8?@???????????Y?% +??5?J? +q?J???????? + ???????3??????v?-??<:?? )?????>?ec_St?? ??'?Mx????#?u[C???g????[2? yH?@?y?r?N4??????FY?9X???e?????G??#?i?e6?M???>?^???NN6?[O$"???0pn?????@??G????|(,xv???8P???lv +|?? +?'?0F:??????IO??????Z??????Q?@??:?G5v+??$}?,??4y?BqmR??? ?FL????`???{??*????T~U???4????3s??9~??????|~?9????????ats??.Bu??@??#p??L??Wv??an ??2???????J?!6?Tl???q???? ? ??O?;?????i??????~?s???_?S?????}??W?/????T?]???UW^Wt~?=???$??fIz~??5Q?ki,G????Ep]????#??c??^B?????M?{P???M??'???-??2>,\?????????+?xr?'??C???S?&?$?????UX??|: +V???u???.??6?? +?aj?!!8??????Q1?u??.,????O?DF?c?7_??D?_??~ +?*8??"g?>',s???o +?hw|???d`?L=3??vY?i?Dd{I?~? ??4?T+D??&??t1?k?L???;%N?t??????d F2V?Q??iw|r[d q?,?_????T?-???=?Z????U?>?K??k3?(IO)S??E6????)?$b63E? ????)?G??^???u???l?N??5???C???????{??a???X??]{?`?V."??v?)??om?'?l?????} +?T???u?;5??!? +l???N??*???z#??Q?;?r?X1N:??E19 ???????+eg^f?M?/Q +r??/?,???c??? ????U Wt?j[> endobj +331 0 obj << +/Length1 1630 +/Length2 15197 +/Length3 0 +/Length 16037 +/Filter /FlateDecode +>> +stream +x???ct???&??X+?m???b?6+?mWP?SA?????|????O??u??>????5q?{.rb%Uza3????+=3@?????E??N??[?^h???g?#'u?Z9???y?@3????`????#?:8z9[YX???U4?ii??S?? ????,#]?,??????v@{??????@ ??0??D???$T? +?I?=?????fbke +??2?????? S{3?Zsa??%?0?8M???=M??????@g;+???+????????:??Mm???)?????_9:;????k? ?????b?l?? +??UIL??u?Z????????`??????????e? ???jle?pz????0?rq?5????/??????ps????? +??@ cg3[???_????L????/?;:?z?+??_^??+W??93?????s[X??1??+???f???????t????????E?9??z???p? +?S???Xf??#???????[??#??r????\z.????oA?,l~????b?OY????????o&?u??~?)??q{S?VG????????O??fS7g??$????????=? 4?[]r0? +????tm?????c s,oV+) +?s? +?????6z?ch?????Z??$I?????o5???%?????&? ???x+????%? ???OT +*!???l??D3) +&.?Lem????l?????H1B +??U)?B?q?]?a?{@j?2s???G???????2Z0????i?6x??`??7=F???%?????Om@???i??T{lt8?P?;?????g/~/??? ??&\?u?k?I???-?sl?t???????????f???@3 +]mJ?[?U??3??S?f?Q.Gy?(G??+?K?[+iFZ?5 ?T*?+V?n?b^a?????????????H?UD ???^ E ?N??D???2?? +?L?04oOY +??@a?????1I????E?????????? +?m7V??6a?B???V?B????kw??P?^?t\A??T.L???P?(?v?2%\gA??Zi>?/?@F?????~???????lC+` v~???zKz dS???A??l?2??x??/WC? ???=>?'??[I3l??X/?????????A?D?t??\????r?C???ZC" +??4u??vI???Tur-?:3'o???????W???V?)Pj?>V ???3?&?,p??(k|?????vZv?? ?UcN?o??F???b?{?|??B???P???\I???c??d???s??C??%K ?*{??+? ??Q?p?<? ?????Q????;??v?i?w???-y?? a???U??,?J5V????'???{?? ???_?3`yI??????$???a?^??F??z3A?*[???Rit?r?m= Q??gOT3TG+?Q??8?%Ju?N?Wj-[???)?2???,b?6?i?? F?s??c-|??_?t????+5X +d??????????F?S=p??_6?Am?TCG???mM??t???Z???l??BP?3:7??;*Y6Hj+??MI??????????/?2???l???^Q??c(?2 ?N??2E?-?B??z.A7?qHt??? +C?'???Q?+?J????b???! +???QSk? ;??6c?#??-?xj??????????????ryU?????O*?U?(8U3????'????[PNK?Lk???C????/?i? n\^????????_.??????+M???S}/?$??AU>/?!#?#???? +???}?(b?>v>RS,?\@??S????zf??y????@I???w??p??{??~r< }???#???L??B ????F?? +?Ef?+??u???????"??? Gx???E???7?????\??f??n?o??D?????A?5!5w??0%0?3???K????? +D$??W!???xz?,???ma???Cpv?: `???.?>?-??,?{?905F??z8\?J????R?+????L????ps at z?Ir????o?qrzV???D:??QM????????EP5?!???WN???? +??j?? ?\ a????7?D6O?c?_?}?1?>???e?2??X??!???9???~d??VW?9?QNL????!?!??????@*Ds??#?Y5???@d?3O??{=|?)???R???(oWv???4?G?8???6??)?8? ??X?z??????r???'???`+?%$?p?K5d?<:A??x ??2??b?gakU,????p??3???-YA?q(H?????$2??h??j:??%?\fN??&?+?;??d J?_D?C=6Wo?? I?\?s?????l??rs???RV?.??B?:????? +?????????`?]%?A????2??l{"???????^????(?????t?? ????%?.9?n?n?"SN?3?3??,??)???? Z0????s(AS?f?6\?'????K?????<?p-k??Y??Hw7,????? $ye??J????~v=?u?~g??p??7?/??9??????? +?;?f +???r???YK??Q??NW???Mi5??i.R??_?Y????9?#R~)? ?V\??8????C?B?x????(?!$???K.??eM ????t?{?M?]\[4????'????H.???{ ?cf??O?S???>???P3m?4?n?D!e??c?^?G??| ????6?5????!m?k$s??,?? +?Lf?(#B?*?Ucv?+s???a?p?&oYr{~>R ?7?R&????A????q????????$??hK?hk????T?Sk*B?[s]]???wD??=|?Y??ogO????????? +?FdU?K&?t?v/???DL/?F?0???????-?[???{?4o??UC?Z???wO?;???Q???????$?)H?"?"???@~ n??v?????M(??+?&?d?V?R?????m ??"???? E???=;}(?hI???X]T??\f?????x^?s?{#??W??B?y$???p8???????h???'X??]?i;?X??N??Qc(?K?DG???L?+???C?k??2???? +??????(??0???m+???o?????B??c??9?Si?E +??r?{)R?(LH3?r?($?'v?U?9????J??)????????h?O?xU????y???????W??f#o}?Qj5J????eK??0?i?M??C,?`?MD?;??&o?Of???B?:?8????y%??Qe????????a( +-?%E?U~[~n?u?%?7h\8?n??bk??!?r+BQ?vvw???Y??5q}?? ????'0qj?@Sh7?f????;?q?????i??'L? ?D?xH@?L??;?p?~2|?nAU???TpaN!T?~-gv?Z???-v????,?N????%??!?m?? +Q?\?*}??m??f,??C^.?Uf?e??(;8W????? [??????k??1?U????m?? ????R???1??wH???2O?cR???]M2?wC ?????qa?? {]??m+I+?s5???$??,?nX??>??`I??\?lnZw"Y?:b???:?R?%C?X?&)fn%?_E?U?????y?]e???5??k8RM?Aob??#8 c?WB? X?? ?,? +,w?????9P?{?^:%???????`qe???|]?V#?????zJ??!?]^?~5 I???????????y?-'?,?z???T? ?? ?O?M-???"?9??7?p?Y?n?&k???1?V(?v?6,.d?=????R-??`r?F +?Z??9)??,K-?x at qC???g?M??z?V?0>F??|???Vwr???!i4???????cG\??P?7d???RPbRKx???C:?^?~a???f???????Y=Q???\????????R??n`c?D???1?Iq???????@???d?`??Qv/7?8?M?o????????????Q-l*?2n??ox?Av?^w]???J??U?t?????zz????8??J??p?v7}?s~7>?z??8k???d?ULZW1NvYRo?????????h8d?`P?@??? +??n_??? ^S^?eW?_V?????V??0????j????k?MC'b???i?u???? ????????!?jY=??j???F$A?Y???L?!3?1?m??? ?IcG^?#?C????s E?mH??ii?????Wl????n?K!?v?^?f4l??(??? +?M???Vk?~?G?h?? D5?? ?????A?"??.????Wl?Y?!??? ??? +???_5????_;?v???R??Hk_v??kNj*r?0?- +?)??  +K*??f?|?????????j??>E2y?d?6?b?$??m?h>Jm?} ?>???8"???????????z??!????2?????^&)'???*??x?m???fLS????-v????s +ik??wC?Y?)OP?j3??T???_????xe=? h???=e?by:b,??p?W00"???Bk~-??e|?Sj???&??<? +W?B~?-I +?x'??S??Z???hD7?Q?G????????f3?????4t??ZK???S?ob?T??="???????????mX?Y{??qp?2s?~/?,??????5;[v??g????7?QE????Z??u?Jx?5??{????v>???'k??*??^??*?OR? Z$???=??Y?9??J?K?(fHS;[Y6^<+??c74D0gw?????:d8???[O??d?)a??%??RG?&??Et?r[??r8??&??x?y?????T*zy?N??????s$??9wP[v?l???~yua???9??E?!??+?wo???_0qcf??Z0^?Z??Lr?b??Z??i?J????zL???V??c?Wi?y?zBj?q?h??Jv_=?????J?x?VXOt???6???"? ?Abg?BH??{??H8?r;?XQ?X?{&?8o???$??j'k??t?m??z+D2i???HC+/ ?m???:4?1$v??? ??X|.???D???=?P???+?]4?????4? ?H??Lx]??????y?p?m??f??r???? ???F?:?W??DNk???bU?*??N?P??"?j???Vq?????????82=??h[?O?W??Ra(?I???????/???#*?DRd?iu2aW?S?U??F??H>???L?c? ZC/g? +???( E????[???}2(??N?Q????L???A?|?][?8??5???7?Cu?R?Q?:?3w*?/?MW?p?<>?Q!?u???4F?]?????\^?????f?k0PM?[??`C?%?? ???\?W:f?zE?TF-??s?]????3?[?2d?#a??2n?34??R???{?????7??@?????B]?@??~K??4??b??m?+????.h?????!??7???j?>jo/m???????????????O??c?b[5>>??8E????U?5>?????k4??^1?va&?z????????4cfWN?????t?dJ)?N?d?????D{?sVu.[?d-?f??????TV??^??&?{:pV??5?jIyo???]??????!????+?;????( ?L????,???S?0>B???!?u #?i??LF ????;0z??v????-?d$ /,y?? ??z+?'J??0=????o)?.M??e?Xa?oX????1????6???x?p???SYc?|lA) +X?,?????qy????R+???M,??=???/?;?)?76?E??? +G?? ?|?(?Q_??? +?;? +??54???u?? +Y4r??8v?[??8)?g;????0???B??Z??mE?y??{9????????KEk?W???};(?Z???f(?C?7?????V;GV??????e???F?3!??04V????eh8?q??_-{?z???>?3??Q3???4X??q?!???\??y???&?a?r+rt ?]??@?,???l???@??X??}??i?,%???A?F?hc??,????_0?]7? AaaA6f?-#?}??s????U~H??Y +?Fr??\ +1?r???C??+??????????9???F????x 1 ??q?7?x, +???j+??,?G7hhr???+??7}?,m?|??g????????N?\?W1?q?Z?5"; ?$h?????_??{+?O^=Z??=e[???P?8???Y7???]a??q50?*?ju???QV??[???A??S?,(??k?h?l"?u>??;??Of??k?`Bh???#???N?/????obk?'?8H?H?H~#????=%xe?c??"!?E??F:?????%Eigo~????l ??U?g?~q?1,?= 3???_#?? ??v??`??7O?o~u?????i??"o????O?%?!???eA???e???8=!???K?sP*??(>??? ????i???TB?????T??_~#*?h?x(L*UK??8?????Y???,m??nE?Z?mu??1?&H]s?*???N?H??k5?@UJA??8^W?5r??????C?+???%s??7???Y j????????f?|~???b????s?C?Vl??**?'-&O!y???Oz???PQ8R???l?]Q??4A???,??yp??O??F???kmsL# +?A{?.Iy?Sp???5????B?W_?Y?I?Q?]????sY)???w9???#7?1mvf( +?n +?Uh^B??'?'ld?aC?X-=e?2??Z?8*?/l???}??C????|???56S???q?????p??U}?oC?,?'=?????m???4l???^????Q?NQ????PPF??????-5????6?(=I??Y?U?(%?D@????Er??z ???Cj??R?C>??6??)??D????????'?4?z'?v?9??rn?6??A?[q?? +?6g?S9?b??z??J???????_??!wY ?????P:??????Kq?!?i?j??????w???&$-?????2??zGD???&?????r???wTK?????,Q?j??u????W??X??Q?@??=??????~?NS???????Tq??~???`?2?g??h???????Z??.T???m?C???'????K?X??nu??~?#V???N?N???&n??Sg?4h???O8?????????c?h\?:W?N +L?QZ))?g~???l0e?S??|r?????w????? ??d??D?#aO?O????[????????.??X +L??s#?[??6J-x????]d?@???o????H??`?j????S??? )?DuS??D?Hz?b?T?q?????;?}????{?6?H,?3?wd3(>?-???%f?v,E? +zq +7??F??v}?%?`??[(??n????3'Rzb??F`S?^4? ?\?4?P???$&(?\??q?????;? T??%?c%l0_ EY???w??????Br'&l14\#?GU Ne?????H?"~?D??2??}??T4 +??#?????~E|?6t3 ?G???~??MN????cq???<?+??+S??`???8?=???nf?/?V>?zP?? ?I??k?????????U??????l\0?fFt~?P??Ppug{???`y???8S?J??????f?#??S2J,?????m???lDs?[P?.?)?"'6?????t?????z????Ko?a??m? ?j?|?aA??? +?(?zB1f%V?Y?????????????m??#???????????????*??"?r<?????fx?" ????????S l|o9???&???^??????Q??u??1q?PS??(???[????l.PO?a?c?Sj?N;.w??]?}??Q ??n?`}O6(?xc????,???1)??_ ???????????2??p?fm????#??0?K????b+?) ??h??.???i?w??H%,?D??? T?g?&?`x?S +"f^?F!r?(?????bC0>v?J???Q(?Tw??^ '?HBW??MZ?tT?u?v?O????,?#???@??????`?????????x{r??n?t_????4f?+,b??y#+?????? +?*?hu??m?=??;??.??$?U?L[??[?? ?d?B0h???)m?T?????bM??|????U??*v?X?^p?ri \???p +??? ??x????????&?0?-'^4 ?????&????M??????SW???oxf?8?F??Y?O???[??q??5,w??Z?"!????5(l????b??`???C3?x?(aso;??? +???7o??}hg??z??L??Q?? +???????????#D~W),?W:?r??? ?}?$?='L[?`????????94??h?f?^???????????#xZ??u??A???????r??????y|??C???G]?9G?B?hh??????J at X???? +????V9"??t?N!?}NV+??N?6]?+?f?ud????,gG4s?mI&<{? +C???9N?u??^ 7mO?3?O!?4J?tn??5??j?????^G4D7^???\??~[????`?)?TB?????????&^?e?M5???.?KCw???q?n? m?q +?N???_J?????D????*b??dNtU?[l7B?8%?Mv{MT??o?4????7?q ??{&?????9Ke?`~????d??y????M?n?1ua?a?LuB8???T?????,???W???pW??@?#?Sq??|^J?????????? -bF??I +y?w&?E??????????????v?a??* =S??#V??g???cN??P?O?PK?n'!?|?>5????'??????????It??'?x?3????k???|6??%???h>???o?? 6???"???????????]oH9S?qo????Sq?{I?> endobj +317 0 obj << +/Type /Encoding +/Differences [2/fi/fl 34/quotedbl 39/quoteright/parenleft/parenright 44/comma/hyphen/period/slash/zero/one/two/three/four/five/six/seven/eight/nine 59/semicolon 65/A/B/C/D/E/F/G/H/I/J 77/M/N/O/P 83/S/T 87/W 91/bracketleft 93/bracketright 95/underscore 97/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/braceleft 125/braceright] +>> endobj +191 0 obj << +/Type /Font +/Subtype /Type1 +/BaseFont /TZLUSU+NimbusMonL-Regu +/FontDescriptor 324 0 R +/FirstChar 40 +/LastChar 125 +/Widths 318 0 R +/Encoding 317 0 R +>> endobj +141 0 obj << +/Type /Font +/Subtype /Type1 +/BaseFont /CRAVFF+NimbusSanL-Bold +/FontDescriptor 326 0 R +/FirstChar 46 +/LastChar 121 +/Widths 320 0 R +/Encoding 317 0 R +>> endobj +139 0 obj << +/Type /Font +/Subtype /Type1 +/BaseFont /ZMBSGR+NimbusSanL-Regu +/FontDescriptor 328 0 R +/FirstChar 34 +/LastChar 121 +/Widths 321 0 R +/Encoding 317 0 R +>> endobj +180 0 obj << +/Type /Font +/Subtype /Type1 +/BaseFont /DIXNGO+NimbusRomNo9L-Medi +/FontDescriptor 330 0 R +/FirstChar 49 +/LastChar 119 +/Widths 319 0 R +/Encoding 317 0 R +>> endobj +138 0 obj << +/Type /Font +/Subtype /Type1 +/BaseFont /SIGNJG+NimbusRomNo9L-Regu +/FontDescriptor 332 0 R +/FirstChar 2 +/LastChar 122 +/Widths 322 0 R +/Encoding 317 0 R +>> endobj +142 0 obj << +/Type /Pages +/Count 6 +/Parent 333 0 R +/Kids [134 0 R 177 0 R 182 0 R 205 0 R 235 0 R 260 0 R] +>> endobj +303 0 obj << +/Type /Pages +/Count 2 +/Parent 333 0 R +/Kids [283 0 R 308 0 R] +>> endobj +333 0 obj << +/Type /Pages +/Count 8 +/Kids [142 0 R 303 0 R] +>> endobj +334 0 obj << +/Type /Outlines +/First 3 0 R +/Last 7 0 R +/Count 2 +>> endobj +131 0 obj << +/Title 132 0 R +/A 129 0 R +/Parent 111 0 R +/Prev 127 0 R +>> endobj +127 0 obj << +/Title 128 0 R +/A 125 0 R +/Parent 111 0 R +/Prev 123 0 R +/Next 131 0 R +>> endobj +123 0 obj << +/Title 124 0 R +/A 121 0 R +/Parent 111 0 R +/Prev 119 0 R +/Next 127 0 R +>> endobj +119 0 obj << +/Title 120 0 R +/A 117 0 R +/Parent 111 0 R +/Prev 115 0 R +/Next 123 0 R +>> endobj +115 0 obj << +/Title 116 0 R +/A 113 0 R +/Parent 111 0 R +/Next 119 0 R +>> endobj +111 0 obj << +/Title 112 0 R +/A 109 0 R +/Parent 7 0 R +/Prev 43 0 R +/First 115 0 R +/Last 131 0 R +/Count -5 +>> endobj +107 0 obj << +/Title 108 0 R +/A 105 0 R +/Parent 43 0 R +/Prev 103 0 R +>> endobj +103 0 obj << +/Title 104 0 R +/A 101 0 R +/Parent 43 0 R +/Prev 99 0 R +/Next 107 0 R +>> endobj +99 0 obj << +/Title 100 0 R +/A 97 0 R +/Parent 43 0 R +/Prev 95 0 R +/Next 103 0 R +>> endobj +95 0 obj << +/Title 96 0 R +/A 93 0 R +/Parent 43 0 R +/Prev 91 0 R +/Next 99 0 R +>> endobj +91 0 obj << +/Title 92 0 R +/A 89 0 R +/Parent 43 0 R +/Prev 87 0 R +/Next 95 0 R +>> endobj +87 0 obj << +/Title 88 0 R +/A 85 0 R +/Parent 43 0 R +/Prev 83 0 R +/Next 91 0 R +>> endobj +83 0 obj << +/Title 84 0 R +/A 81 0 R +/Parent 43 0 R +/Prev 79 0 R +/Next 87 0 R +>> endobj +79 0 obj << +/Title 80 0 R +/A 77 0 R +/Parent 43 0 R +/Prev 75 0 R +/Next 83 0 R +>> endobj +75 0 obj << +/Title 76 0 R +/A 73 0 R +/Parent 43 0 R +/Prev 71 0 R +/Next 79 0 R +>> endobj +71 0 obj << +/Title 72 0 R +/A 69 0 R +/Parent 43 0 R +/Prev 67 0 R +/Next 75 0 R +>> endobj +67 0 obj << +/Title 68 0 R +/A 65 0 R +/Parent 43 0 R +/Prev 63 0 R +/Next 71 0 R +>> endobj +63 0 obj << +/Title 64 0 R +/A 61 0 R +/Parent 43 0 R +/Prev 59 0 R +/Next 67 0 R +>> endobj +59 0 obj << +/Title 60 0 R +/A 57 0 R +/Parent 43 0 R +/Prev 55 0 R +/Next 63 0 R +>> endobj +55 0 obj << +/Title 56 0 R +/A 53 0 R +/Parent 43 0 R +/Prev 51 0 R +/Next 59 0 R +>> endobj +51 0 obj << +/Title 52 0 R +/A 49 0 R +/Parent 43 0 R +/Prev 47 0 R +/Next 55 0 R +>> endobj +47 0 obj << +/Title 48 0 R +/A 45 0 R +/Parent 43 0 R +/Next 51 0 R +>> endobj +43 0 obj << +/Title 44 0 R +/A 41 0 R +/Parent 7 0 R +/Prev 11 0 R +/Next 111 0 R +/First 47 0 R +/Last 107 0 R +/Count -16 +>> endobj +39 0 obj << +/Title 40 0 R +/A 37 0 R +/Parent 11 0 R +/Prev 35 0 R +>> endobj +35 0 obj << +/Title 36 0 R +/A 33 0 R +/Parent 11 0 R +/Prev 31 0 R +/Next 39 0 R +>> endobj +31 0 obj << +/Title 32 0 R +/A 29 0 R +/Parent 11 0 R +/Prev 27 0 R +/Next 35 0 R +>> endobj +27 0 obj << +/Title 28 0 R +/A 25 0 R +/Parent 11 0 R +/Prev 23 0 R +/Next 31 0 R +>> endobj +23 0 obj << +/Title 24 0 R +/A 21 0 R +/Parent 11 0 R +/Prev 19 0 R +/Next 27 0 R +>> endobj +19 0 obj << +/Title 20 0 R +/A 17 0 R +/Parent 11 0 R +/Prev 15 0 R +/Next 23 0 R +>> endobj +15 0 obj << +/Title 16 0 R +/A 13 0 R +/Parent 11 0 R +/Next 19 0 R +>> endobj +11 0 obj << +/Title 12 0 R +/A 9 0 R +/Parent 7 0 R +/Next 43 0 R +/First 15 0 R +/Last 39 0 R +/Count -7 +>> endobj +7 0 obj << +/Title 8 0 R +/A 5 0 R +/Parent 334 0 R +/Prev 3 0 R +/First 11 0 R +/Last 111 0 R +/Count -3 +>> endobj +3 0 obj << +/Title 4 0 R +/A 1 0 R +/Parent 334 0 R +/Next 7 0 R +>> endobj +335 0 obj << +/Names [(Doc-Start) 140 0 R (_app_procedures) 227 0 R (_backgound_list) 278 0 R (_backgroundstruct) 208 0 R (_batch_wrappers) 289 0 R (_create_status_table) 286 0 R] +/Limits [(Doc-Start) (_create_status_table)] +>> endobj +336 0 obj << +/Names [(_diffstruct) 217 0 R (_header) 192 0 R (_image) 188 0 R (_jpeg) 198 0 R (_madd) 228 0 R (_mbackground) 231 0 R] +/Limits [(_diffstruct) (_mbackground)] +>> endobj +337 0 obj << +/Names [(_mbackgroundbatch) 290 0 R (_mbgmodel) 238 0 R (_mconcatfit) 241 0 R (_mdiff) 244 0 R (_mdiffbatch) 294 0 R (_mdifffit) 247 0 R] +/Limits [(_mbackgroundbatch) (_mdifffit)] +>> endobj +338 0 obj << +/Names [(_mdifffitbatch) 298 0 R (_mfitbatch) 311 0 R (_mfitplane) 250 0 R (_mimgtbl) 253 0 R (_mjpeg) 263 0 R (_mmakehdr) 256 0 R] +/Limits [(_mdifffitbatch) (_mmakehdr)] +>> endobj +339 0 obj << +/Names [(_moverlaps) 266 0 R (_mproject) 269 0 R (_mprojectbatch) 314 0 R (_mprojectpp) 272 0 R (_mshrink) 275 0 R (_overview) 185 0 R] +/Limits [(_moverlaps) (_overview)] +>> endobj +340 0 obj << +/Names [(_status) 201 0 R (_swiftmontage_api) 186 0 R (_table) 195 0 R (_types) 187 0 R (lstlisting.-1) 189 0 R (lstlisting.-10) 239 0 R] +/Limits [(_status) (lstlisting.-10)] +>> endobj +341 0 obj << +/Names [(lstlisting.-11) 242 0 R (lstlisting.-12) 245 0 R (lstlisting.-13) 248 0 R (lstlisting.-14) 251 0 R (lstlisting.-15) 254 0 R (lstlisting.-16) 257 0 R] +/Limits [(lstlisting.-11) (lstlisting.-16)] +>> endobj +342 0 obj << +/Names [(lstlisting.-17) 264 0 R (lstlisting.-18) 267 0 R (lstlisting.-19) 270 0 R (lstlisting.-2) 193 0 R (lstlisting.-20) 273 0 R (lstlisting.-21) 276 0 R] +/Limits [(lstlisting.-17) (lstlisting.-21)] +>> endobj +343 0 obj << +/Names [(lstlisting.-22) 279 0 R (lstlisting.-23) 287 0 R (lstlisting.-24) 291 0 R (lstlisting.-25) 295 0 R (lstlisting.-26) 299 0 R (lstlisting.-27) 312 0 R] +/Limits [(lstlisting.-22) (lstlisting.-27)] +>> endobj +344 0 obj << +/Names [(lstlisting.-28) 315 0 R (lstlisting.-3) 196 0 R (lstlisting.-4) 199 0 R (lstlisting.-5) 202 0 R (lstlisting.-6) 209 0 R (lstlisting.-7) 218 0 R] +/Limits [(lstlisting.-28) (lstlisting.-7)] +>> endobj +345 0 obj << +/Names [(lstlisting.-8) 229 0 R (lstlisting.-9) 232 0 R (lstnumber.-1.1) 190 0 R (lstnumber.-10.1) 240 0 R (lstnumber.-11.1) 243 0 R (lstnumber.-12.1) 246 0 R] +/Limits [(lstlisting.-8) (lstnumber.-12.1)] +>> endobj +346 0 obj << +/Names [(lstnumber.-13.1) 249 0 R (lstnumber.-14.1) 252 0 R (lstnumber.-15.1) 255 0 R (lstnumber.-16.1) 258 0 R (lstnumber.-17.1) 265 0 R (lstnumber.-18.1) 268 0 R] +/Limits [(lstnumber.-13.1) (lstnumber.-18.1)] +>> endobj +347 0 obj << +/Names [(lstnumber.-19.1) 271 0 R (lstnumber.-2.1) 194 0 R (lstnumber.-20.1) 274 0 R (lstnumber.-21.1) 277 0 R (lstnumber.-22.1) 280 0 R (lstnumber.-23.1) 288 0 R] +/Limits [(lstnumber.-19.1) (lstnumber.-23.1)] +>> endobj +348 0 obj << +/Names [(lstnumber.-24.1) 292 0 R (lstnumber.-24.2) 293 0 R (lstnumber.-25.1) 296 0 R (lstnumber.-25.2) 297 0 R (lstnumber.-26.1) 300 0 R (lstnumber.-26.2) 301 0 R] +/Limits [(lstnumber.-24.1) (lstnumber.-26.2)] +>> endobj +349 0 obj << +/Names [(lstnumber.-26.3) 302 0 R (lstnumber.-27.1) 313 0 R (lstnumber.-28.1) 316 0 R (lstnumber.-3.1) 197 0 R (lstnumber.-4.1) 200 0 R (lstnumber.-5.1) 203 0 R] +/Limits [(lstnumber.-26.3) (lstnumber.-5.1)] +>> endobj +350 0 obj << +/Names [(lstnumber.-6.1) 210 0 R (lstnumber.-6.2) 211 0 R (lstnumber.-6.3) 212 0 R (lstnumber.-6.4) 213 0 R (lstnumber.-6.5) 214 0 R (lstnumber.-6.6) 215 0 R] +/Limits [(lstnumber.-6.1) (lstnumber.-6.6)] +>> endobj +351 0 obj << +/Names [(lstnumber.-6.7) 216 0 R (lstnumber.-7.1) 219 0 R (lstnumber.-7.2) 220 0 R (lstnumber.-7.3) 221 0 R (lstnumber.-7.4) 222 0 R (lstnumber.-7.5) 223 0 R] +/Limits [(lstnumber.-6.7) (lstnumber.-7.5)] +>> endobj +352 0 obj << +/Names [(lstnumber.-7.6) 224 0 R (lstnumber.-7.7) 225 0 R (lstnumber.-7.8) 226 0 R (lstnumber.-8.1) 230 0 R (lstnumber.-9.1) 233 0 R (page.1) 184 0 R] +/Limits [(lstnumber.-7.6) (page.1)] +>> endobj +353 0 obj << +/Names [(page.2) 207 0 R (page.3) 237 0 R (page.4) 262 0 R (page.5) 285 0 R (page.6) 310 0 R (page.i) 137 0 R] +/Limits [(page.2) (page.i)] +>> endobj +354 0 obj << +/Names [(page.ii) 179 0 R (section.1) 2 0 R (section.2) 6 0 R (subsection.2.1) 10 0 R (subsection.2.2) 42 0 R (subsection.2.3) 110 0 R] +/Limits [(page.ii) (subsection.2.3)] +>> endobj +355 0 obj << +/Names [(subsubsection.2.1.1) 14 0 R (subsubsection.2.1.2) 18 0 R (subsubsection.2.1.3) 22 0 R (subsubsection.2.1.4) 26 0 R (subsubsection.2.1.5) 30 0 R (subsubsection.2.1.6) 34 0 R] +/Limits [(subsubsection.2.1.1) (subsubsection.2.1.6)] +>> endobj +356 0 obj << +/Names [(subsubsection.2.1.7) 38 0 R (subsubsection.2.2.1) 46 0 R (subsubsection.2.2.10) 82 0 R (subsubsection.2.2.11) 86 0 R (subsubsection.2.2.12) 90 0 R (subsubsection.2.2.13) 94 0 R] +/Limits [(subsubsection.2.1.7) (subsubsection.2.2.13)] +>> endobj +357 0 obj << +/Names [(subsubsection.2.2.14) 98 0 R (subsubsection.2.2.15) 102 0 R (subsubsection.2.2.16) 106 0 R (subsubsection.2.2.2) 50 0 R (subsubsection.2.2.3) 54 0 R (subsubsection.2.2.4) 58 0 R] +/Limits [(subsubsection.2.2.14) (subsubsection.2.2.4)] +>> endobj +358 0 obj << +/Names [(subsubsection.2.2.5) 62 0 R (subsubsection.2.2.6) 66 0 R (subsubsection.2.2.7) 70 0 R (subsubsection.2.2.8) 74 0 R (subsubsection.2.2.9) 78 0 R (subsubsection.2.3.1) 114 0 R] +/Limits [(subsubsection.2.2.5) (subsubsection.2.3.1)] +>> endobj +359 0 obj << +/Names [(subsubsection.2.3.2) 118 0 R (subsubsection.2.3.3) 122 0 R (subsubsection.2.3.4) 126 0 R (subsubsection.2.3.5) 130 0 R] +/Limits [(subsubsection.2.3.2) (subsubsection.2.3.5)] +>> endobj +360 0 obj << +/Kids [335 0 R 336 0 R 337 0 R 338 0 R 339 0 R 340 0 R] +/Limits [(Doc-Start) (lstlisting.-10)] +>> endobj +361 0 obj << +/Kids [341 0 R 342 0 R 343 0 R 344 0 R 345 0 R 346 0 R] +/Limits [(lstlisting.-11) (lstnumber.-18.1)] +>> endobj +362 0 obj << +/Kids [347 0 R 348 0 R 349 0 R 350 0 R 351 0 R 352 0 R] +/Limits [(lstnumber.-19.1) (page.1)] +>> endobj +363 0 obj << +/Kids [353 0 R 354 0 R 355 0 R 356 0 R 357 0 R 358 0 R] +/Limits [(page.2) (subsubsection.2.3.1)] +>> endobj +364 0 obj << +/Kids [359 0 R] +/Limits [(subsubsection.2.3.2) (subsubsection.2.3.5)] +>> endobj +365 0 obj << +/Kids [360 0 R 361 0 R 362 0 R 363 0 R 364 0 R] +/Limits [(Doc-Start) (subsubsection.2.3.5)] +>> endobj +366 0 obj << +/Dests 365 0 R +>> endobj +367 0 obj << +/Type /Catalog +/Pages 333 0 R +/Outlines 334 0 R +/Names 366 0 R +/PageMode/UseOutlines/PageLabels<>2<>]>> +/OpenAction 133 0 R +>> endobj +368 0 obj << +/Author()/Title(SwiftMontage API)/Subject()/Creator(DBLaTeX-0.3)/Producer(pdfTeX-1.40.10)/Keywords() +/CreationDate (D:20110620095433-05'00') +/ModDate (D:20110620095433-05'00') +/Trapped /False +/PTEX.Fullbanner (This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0) +>> endobj +xref +0 369 +0000000000 65535 f +0000000015 00000 n +0000012360 00000 n +0000100164 00000 n +0000000060 00000 n +0000000086 00000 n +0000012480 00000 n +0000100055 00000 n +0000000131 00000 n +0000000165 00000 n +0000012599 00000 n +0000099946 00000 n +0000000215 00000 n +0000000239 00000 n +0000012719 00000 n +0000099872 00000 n +0000000295 00000 n +0000000319 00000 n +0000012961 00000 n +0000099785 00000 n +0000000375 00000 n +0000000400 00000 n +0000013204 00000 n +0000099698 00000 n +0000000456 00000 n +0000000480 00000 n +0000013446 00000 n +0000099611 00000 n +0000000536 00000 n +0000000559 00000 n +0000013689 00000 n +0000099524 00000 n +0000000615 00000 n +0000000640 00000 n +0000016326 00000 n +0000099437 00000 n +0000000696 00000 n +0000000731 00000 n +0000016934 00000 n +0000099363 00000 n +0000000787 00000 n +0000000816 00000 n +0000017603 00000 n +0000099237 00000 n +0000000867 00000 n +0000000900 00000 n +0000017724 00000 n +0000099163 00000 n +0000000956 00000 n +0000000979 00000 n +0000017964 00000 n +0000099076 00000 n +0000001035 00000 n +0000001065 00000 n +0000020749 00000 n +0000098989 00000 n +0000001121 00000 n +0000001148 00000 n +0000020992 00000 n +0000098902 00000 n +0000001204 00000 n +0000001233 00000 n +0000021235 00000 n +0000098815 00000 n +0000001289 00000 n +0000001313 00000 n +0000021478 00000 n +0000098728 00000 n +0000001369 00000 n +0000001396 00000 n +0000021721 00000 n +0000098641 00000 n +0000001452 00000 n +0000001480 00000 n +0000021963 00000 n +0000098554 00000 n +0000001536 00000 n +0000001562 00000 n +0000022206 00000 n +0000098467 00000 n +0000001618 00000 n +0000001645 00000 n +0000025039 00000 n +0000098380 00000 n +0000001702 00000 n +0000001726 00000 n +0000025282 00000 n +0000098293 00000 n +0000001783 00000 n +0000001811 00000 n +0000025523 00000 n +0000098206 00000 n +0000001868 00000 n +0000001895 00000 n +0000025766 00000 n +0000098119 00000 n +0000001952 00000 n +0000001981 00000 n +0000026008 00000 n +0000098030 00000 n +0000002038 00000 n +0000002065 00000 n +0000026251 00000 n +0000097939 00000 n +0000002123 00000 n +0000002160 00000 n +0000030187 00000 n +0000097861 00000 n +0000002218 00000 n +0000002263 00000 n +0000030431 00000 n +0000097746 00000 n +0000002315 00000 n +0000002349 00000 n +0000030553 00000 n +0000097667 00000 n +0000002406 00000 n +0000002442 00000 n +0000030857 00000 n +0000097574 00000 n +0000002499 00000 n +0000002529 00000 n +0000031162 00000 n +0000097481 00000 n +0000002586 00000 n +0000002619 00000 n +0000033734 00000 n +0000097388 00000 n +0000002676 00000 n +0000002705 00000 n +0000033978 00000 n +0000097309 00000 n +0000002762 00000 n +0000002795 00000 n +0000003139 00000 n +0000003381 00000 n +0000002848 00000 n +0000003258 00000 n +0000096792 00000 n +0000096447 00000 n +0000003320 00000 n +0000096276 00000 n +0000096965 00000 n +0000004856 00000 n +0000005006 00000 n +0000005157 00000 n +0000005312 00000 n +0000005473 00000 n +0000005633 00000 n +0000005794 00000 n +0000005955 00000 n +0000006115 00000 n +0000006276 00000 n +0000006437 00000 n +0000006593 00000 n +0000006754 00000 n +0000006915 00000 n +0000007075 00000 n +0000007236 00000 n +0000007397 00000 n +0000007558 00000 n +0000007719 00000 n +0000007879 00000 n +0000008040 00000 n +0000008202 00000 n +0000008364 00000 n +0000008526 00000 n +0000008688 00000 n +0000008850 00000 n +0000009012 00000 n +0000009174 00000 n +0000009330 00000 n +0000009491 00000 n +0000009651 00000 n +0000009812 00000 n +0000009973 00000 n +0000010196 00000 n +0000004461 00000 n +0000003479 00000 n +0000010134 00000 n +0000096618 00000 n +0000013932 00000 n +0000012179 00000 n +0000010307 00000 n +0000012298 00000 n +0000012419 00000 n +0000012539 00000 n +0000012658 00000 n +0000012778 00000 n +0000012839 00000 n +0000012900 00000 n +0000096105 00000 n +0000013021 00000 n +0000013082 00000 n +0000013143 00000 n +0000013264 00000 n +0000013324 00000 n +0000013385 00000 n +0000013506 00000 n +0000013567 00000 n +0000013628 00000 n +0000013749 00000 n +0000013810 00000 n +0000013871 00000 n +0000018207 00000 n +0000016145 00000 n +0000014043 00000 n +0000016264 00000 n +0000016386 00000 n +0000016447 00000 n +0000016508 00000 n +0000016569 00000 n +0000016630 00000 n +0000016690 00000 n +0000016751 00000 n +0000016812 00000 n +0000016873 00000 n +0000016994 00000 n +0000017055 00000 n +0000017116 00000 n +0000017177 00000 n +0000017238 00000 n +0000017299 00000 n +0000017360 00000 n +0000017421 00000 n +0000017481 00000 n +0000017542 00000 n +0000017663 00000 n +0000017782 00000 n +0000017843 00000 n +0000017903 00000 n +0000018024 00000 n +0000018085 00000 n +0000018146 00000 n +0000022449 00000 n +0000020568 00000 n +0000018318 00000 n +0000020687 00000 n +0000020809 00000 n +0000020870 00000 n +0000020931 00000 n +0000021052 00000 n +0000021113 00000 n +0000021174 00000 n +0000021295 00000 n +0000021356 00000 n +0000021417 00000 n +0000021538 00000 n +0000021599 00000 n +0000021660 00000 n +0000021781 00000 n +0000021842 00000 n +0000021903 00000 n +0000022023 00000 n +0000022084 00000 n +0000022145 00000 n +0000022266 00000 n +0000022327 00000 n +0000022388 00000 n +0000026495 00000 n +0000024858 00000 n +0000022560 00000 n +0000024977 00000 n +0000025099 00000 n +0000025160 00000 n +0000025221 00000 n +0000025342 00000 n +0000025402 00000 n +0000025462 00000 n +0000025583 00000 n +0000025644 00000 n +0000025705 00000 n +0000025825 00000 n +0000025886 00000 n +0000025947 00000 n +0000026068 00000 n +0000026129 00000 n +0000026190 00000 n +0000026312 00000 n +0000026373 00000 n +0000026434 00000 n +0000028982 00000 n +0000031527 00000 n +0000028863 00000 n +0000026606 00000 n +0000030125 00000 n +0000030248 00000 n +0000030309 00000 n +0000030370 00000 n +0000030492 00000 n +0000030614 00000 n +0000030675 00000 n +0000030736 00000 n +0000030796 00000 n +0000030918 00000 n +0000030979 00000 n +0000031040 00000 n +0000031101 00000 n +0000031223 00000 n +0000031284 00000 n +0000031345 00000 n +0000031406 00000 n +0000031467 00000 n +0000097082 00000 n +0000029885 00000 n +0000030020 00000 n +0000030069 00000 n +0000034221 00000 n +0000033553 00000 n +0000031666 00000 n +0000033672 00000 n +0000033795 00000 n +0000033856 00000 n +0000033917 00000 n +0000034039 00000 n +0000034099 00000 n +0000034160 00000 n +0000095733 00000 n +0000034360 00000 n +0000034723 00000 n +0000035027 00000 n +0000035350 00000 n +0000035722 00000 n +0000036197 00000 n +0000050053 00000 n +0000050457 00000 n +0000061570 00000 n +0000061947 00000 n +0000069819 00000 n +0000070203 00000 n +0000078888 00000 n +0000079162 00000 n +0000095320 00000 n +0000097167 00000 n +0000097236 00000 n +0000100235 00000 n +0000100469 00000 n +0000100652 00000 n +0000100855 00000 n +0000101049 00000 n +0000101243 00000 n +0000101441 00000 n +0000101667 00000 n +0000101892 00000 n +0000102118 00000 n +0000102338 00000 n +0000102565 00000 n +0000102799 00000 n +0000103032 00000 n +0000103266 00000 n +0000103496 00000 n +0000103722 00000 n +0000103948 00000 n +0000104158 00000 n +0000104320 00000 n +0000104516 00000 n +0000104776 00000 n +0000105041 00000 n +0000105307 00000 n +0000105568 00000 n +0000105774 00000 n +0000105892 00000 n +0000106016 00000 n +0000106132 00000 n +0000106252 00000 n +0000106345 00000 n +0000106460 00000 n +0000106498 00000 n +0000106666 00000 n +trailer +<< /Size 369 +/Root 367 0 R +/Info 368 0 R +/ID [<1CB1ABA80FC8BDD482BDD5F3C66391C3> <1CB1ABA80FC8BDD482BDD5F3C66391C3>] >> +startxref +106985 +%%EOF Copied: SwiftApps/Montage/docs/SwiftMontageAPI.txt (from rev 4633, SwiftApps/Montage/docs/API.txt) =================================================================== --- SwiftApps/Montage/docs/SwiftMontageAPI.txt (rev 0) +++ SwiftApps/Montage/docs/SwiftMontageAPI.txt 2011-06-20 14:56:13 UTC (rev 4634) @@ -0,0 +1,366 @@ +SwiftMontage API +================= +:toc: +:icons: +:numbered: + +Overview +-------- + +This is the API for the SwiftMontage wrappers. Montage is a toolkit for +generating science grade astronomical mosaics. The image file format for +Montage is Flexible Image Transport System or FITS. + +Swift is a dataflow parallel scripting language. The language allows the user +to parallelize a workflow that has been represented as a swiftscript. Swift +implements the site execution model to allow for efficient use of available +resources for the user's application. + +NOTE: Both the Montage binaries as well as the Swift binaries must be included +in your PATH environment variable for the wrappers to function properly. + + +SwiftMontage API +----------------- + +Types +~~~~~ +These are all the Types that are declared for Swift. They are located in the +file Swift_Montage_types.swift. + +Image +^^^^^ +---- +type Image; +---- +This is the Image type. It is used to declare the raw images, projected +images, difference images, rectified images, and the mosaic. + +Header +^^^^^^ +---- +type Header; +---- +This is the Header type. It is used to declare and map to the FITS header +file. + +Table +^^^^^ +---- +type Table; +---- +This is the Table type. During the execution of the workflow several files of +metadata is generated. These are tables that the Montage functions use to read +for the next stage of the workflow. + +JPEG +^^^^ +---- +type JPEG +---- +This is the JPEG type. This is used to map to the jpeg version of the mosaic. + +Status +^^^^^^ +---- +type Status; +---- +This is the status type. During the difference stage of the workflow status +file are generated that have the information about the coefficients that will +be used to rectify the image. + +BackgroundStruct +^^^^^^^^^^^^^^^^ +---- +type BackgroundStruct +{ + string fname; + float a; + float b; + float c; +}; +---- +This is a struct type. The entries are a string for the name of the image and +three coefficients to rectify this portion of the mosaic of all floating point +types. + +DiffStruct +^^^^^^^^^^ +---- +type DiffStruct +{ + int cntr1; + int cntr2; + Image plus; + Image minus; + Image diff; +}; +---- +This is a struct type. The entries are two control integers that make this +entry unique, the two images that overlapped which are name plus and minus, +and the name of the difference image that they produced. + +App Procedures +~~~~~~~~~~~~~~ +These are all the app procedures for SwiftMontage. They are located in the +file Swift_Montage_Apps.swift + +NOTE: Currently the options to the Montage functions are hard coded and the +user cannot choose which options to run. + +mAdd +^^^^ +---- +app ( Image mos ) mAdd( Image imgs[], Table img_tbl, Header hdr ) +---- +This app procedure will call the mAdd fucntion from the Montage toolkit. This +procedure takes +in a list of images to be added together, the img_tbl for these images, and +the FITS header file for the mosaic being created. The procedure then outputs +a single FITS file that represents the mosaic. All the images that will be +part of this mosaic must reside in the same directory. + +mBackground +^^^^^^^^^^^ +---- +app ( Image bg_img ) mBackground( Image img, float a, float b, float c ) +---- +This app procedure will call the mBackground function from the Montage +toolkit. This procedure takes in a single image along with the +three coefficients. The procedure then output the background rectified image +after the coefficients have been applied. + +mBgModel +^^^^^^^^ +---- +app ( Table rect_tbl ) mBgModel( Table img_tbl, Table fits_tbl ) +---- +This app procedure will call the mBgModel function from the Montage +toolkit. This procedure takes in an image table that represents the list of images that +will be added into a mosaic and a table of the information that is required to +fit them together. The procedure will then output a rectification table of the +coefficients that must be applied to the images. + +mConcatFit +^^^^^^^^^^ +---- +app ( Table fits_tbl ) mConcatFit( Table status_tbl, Status stats[] ) +---- +This app procedure will call the mConcatFit function from the Montage +toolkit. This procedure takes in a table representing the status files that were generated +from either mFitplane or mDiffFit and a list of these status files as +input. The procedure will then output a table of all the status files +together. The status files must all reside in the same directory. + +mDiff +^^^^^ +---- +app ( Image diff_img ) mDiff( Image proj_img_1, Image proj_img_2, Header hdr ) +---- +This app procedure will call the mDiff function from the Montage toolkit. This +procedure takes in two images and the FITS header file for the mosaic. The procedure will then output a +difference image representing the information of where the two images overlap. + +mDiffFit +^^^^^^^^ +---- +app ( Image diff_img, Status stat ) mDiffFit( Image img_1, Image img_2, Header hdr ) +---- +This app procedure will call the mDiffFit function from the Montage +toolkit. The mDiffFit function in Montage is the combination of the mDiff and +mFitplane functions. + +mFitplane +^^^^^^^^^ +---- +app ( Status stat ) mFitplane( Image diff_img ) +---- +This app procedure will call the mFitplane function from the Montage +toolkit. This procedure takes in as input the difference image that was the output from +the mDiff procedure. The procedure will then output a status file that +contains the information on how to fit these two images together. + +mImgtbl +^^^^^^^ +---- +app ( Table img_tbl ) mImgtbl( Image imgs[] ) +---- +This app procedure will call the mImgtbl function from the Montage +toolkit. This procedure takes in as input a list of images to create a table +from. The output is an image table that represents these images. All the +images that will be part of this table must reside in the same directory. + +mMakeHdr +^^^^^^^^ +---- +app ( Header hdr ) mMakeHdr( Table img_tbl ) +---- +This app procedure will call the mMakeHdr function from the Montage +toolkit. This procedure will take in as input an image table representing the +images that will be combined into a single mosaic. The procedure will then output the +FITS header file for the mosaic. + +mJPEG +^^^^^ +---- +app ( JPEG mos_img_jpg ) mJPEG( Image mos_img ) +---- +This app procedure will call the mJPEG function from the Montage toolkit. This +procedure will take in as input as input a FITS image. The procedure will +then ouput the same image in jpeg format. + +mOverlaps +^^^^^^^^^ +---- +app ( Table diff_tbl ) mOverlaps( Table img_tbl ) +---- +This app procedure will call the mOverlaps function from the Montage +toolkit. This procedure takes in as input an image table of the images that +will be combined into a single mosaic. The procedure will then output a table +of all the images that overlap with each other in the mosaic. + +mProject +^^^^^^^^ +---- +app ( Image proj_img ) mProject( Image raw_img, Header hdr ) +---- +This app procedure will call the mProject function from the Montage +toolkit. This procedure takes in as input a FITS image file and the FITS header file +that for the mosaic. The output is the projected image. + +NOTE: The mProject app procedure is for general projection. There are some cases in +which the faster mProjectPP procedure should be used. + +mProjectPP +^^^^^^^^^^ +---- +app ( Image proj_img ) mProjectPP( Image raw_img, Header hdr ) +---- +This app procedure will call the mProjectPP function from the Montage +toolkit. This procedure takes in as input a FITS image file and the FITS header file +that for the mosaic. The output is the projected image. + +NOTE: The mProjectPP app procedure is a "special case" version of mProject +and can be used only where the input and output images have tangent-plane +projections (e.g. TAN, SIN) or where they can be approximated with acceptable +error. + + +mShrink +^^^^^^^ +---- +app ( Image shrunk ) mShrink( Image original, int factor ) +---- +This app procedure will call the mShrink function in the Montage toolkit. This +procedure takes in as input a single image and an re-sizing factor represented +as an integer. The procedure will then output the re-sized image. + +Backgound_list +^^^^^^^^^^^^^^ +---- +app ( Table back_tbl ) Background_list( Table imgs_tbl, Table rect_tbl ) +---- +This app procedure will call the Background_list python script that is included in +the scripts directory for the SwiftMontage wrappers. This procedure takes in as input an image table of the +images that are being combined into a single mosaic and the table of +coefficients to rectify the mosaic. The procedure will then output a file in a +format that can be read in by the Swift readData2 function into the +Background_struct declared type. + +create_status_table +^^^^^^^^^^^^^^^^^^^ +---- +app ( Table stat_tbl ) create_status_table( Table diff_tbl ) +---- +This app procedure will call the create_status_table python script that is +included in the scripts directory for the SwiftMontage wrappers. This +procedure takes in as input the difference table that has been generated by +the mOverlaps procedure. The procedure will the output a table that can be +used as input to the mConcatFit app procedure. + +Batch Wrappers +~~~~~~~~~~~~~~ +These are the Batch scripts. These scripts do most of the file mapping +and is where the parallelization is taking place. They are located in the file +Swift_Montage_Batch.swift + +mBackgroundBatch +^^^^^^^^^^^^^^^^ +---- +( Image rect_imgs[] ) mBackgroundBatch( string dest, Image imgs[], Table img_tbl, + Table rect_tbl ) +---- +This batch swift script takes in as input a destination directory for the +rectified images, a list of images that will be combined into a +mosaic, an image table representing the images for the mosaic, and a table of +the coefficients that must be applied to each image. The script will then +output a list of the images after the coefficients have been applied. The +application of the coefficients to each image is done in parallel. + +NOTE: mBackgroundBatch calls the mBackground app procedure. + +mDiffBatch +^^^^^^^^^^ +---- +( Image diff_imgs[] ) mDiffBatch( string src, string dest, string filenames[], + Table diff_tbl, Header hdr ) +---- +This batch script takes in as input a source directory of where the images to calculate +overlaps are located, a destination directory of where to store these +difference images, a list of the file names for the images that will be +combined into the mosaic, a difference table that contains which images overlap with +each other, and the FITS header file for the mosaic. This script will then +output the difference images. The calculation each difference image are +done in parallel. + +WARNING: The images that are in the source directory must be projected images. + +NOTE: mDiffBatch calls the mDiff app procedure. + +mDiffFitBatch +^^^^^^^^^^^^^ +---- +( Image diff_imgs[], Table fits_tbl ) mDiffFitBatch( string src, string dest, string stat, + string filenames[], + Table diff_tbl, Header hdr ) +---- +This batch script takes in as input a source directory of where the images to +calculate overlaps are located, a destination directory of where to store +these difference images, a status directory of where to store the status files +for each image, a list of the file names for the images that will be +combined into the mosaic, a difference table that contains which images overlap +with each other and the FITS header file for the mosaic. This script will then +output a list of difference images and a table of information on how to fit +the images together. The calculation of each difference image and the fitting +table is done in parallel. + +WARNING: The images that are in the source directory must be projected images. + +NOTE: mDiffFitBatch calls the mDiffFit app procedure. + +mFitBatch +^^^^^^^^^ +---- +( Table fits_tbl ) mFitBatch( string stat, Image diff_imgs[], Table diff_tbl ) +---- +This batch script takes in as input a directory for which the status files +will be put in, the list of difference images that has +been generated and the table that contains which images overlap with each +other. The script then generates a table containing describing how to fit the +two overalpping images together. + +NOTE: mFitBatch calls the mFitplane app procedure. + +mProjectBatch +^^^^^^^^^^^^^ +---- +( Image proj_imgs[] ) mProjectBatch( string dest, Image raw_imgs[], Header hdr ) +---- +This batch script takes in as input the destination directory for the +projected images, a list of raw image files and the FITS header file +and projects each image. When projecting each image the function will decide +if it is possible to use the fast image projetion algorithm or to just use +standard projection. + +WARNING: mProjectBatch currently only calls the general mProject app +procedure. It does not check to see if the faster projection mProjectPP can be used. Modified: SwiftApps/Montage/docs/updateAPI.sh =================================================================== --- SwiftApps/Montage/docs/updateAPI.sh 2011-06-20 14:44:45 UTC (rev 4633) +++ SwiftApps/Montage/docs/updateAPI.sh 2011-06-20 14:56:13 UTC (rev 4634) @@ -1,5 +1,5 @@ #!/bin/bash -echo "Generating Swift_Montage API html file" -asciidoc -a toc -a toclevels=3 -a numbered -a max-width=750px -a icons API.txt -echo "Generating Swift_Montage API pdf file" -a2x --format=pdf --icons --no-xmllint --dblatex-opts "-P doc.publisher.show=0 -P latex.output.revhistory=0" API.txt +echo "Generating SwiftMontageAPI html file" +asciidoc -a toc -a toclevels=3 -a numbered -a max-width=750px -a icons SwiftMontageAPI.txt +echo "Generating SwiftMontageAPI pdf file" +a2x --format=pdf --icons --no-xmllint --dblatex-opts "-P doc.publisher.show=0 -P latex.output.revhistory=0" SwiftMontageAPI.txt From jonmon at ci.uchicago.edu Mon Jun 20 10:00:06 2011 From: jonmon at ci.uchicago.edu (jonmon at ci.uchicago.edu) Date: Mon, 20 Jun 2011 15:00:06 -0000 Subject: [Swift-commit] r4635 - SwiftApps/Montage/docs Message-ID: <20110620145948.5BBFF9CFF1@svn.ci.uchicago.edu> Author: jonmon Date: 2011-06-20 09:59:48 -0500 (Mon, 20 Jun 2011) New Revision: 4635 Removed: SwiftApps/Montage/docs/SwiftMontageAPI.html SwiftApps/Montage/docs/SwiftMontageAPI.pdf Log: o Removed files. Updates to these files are too large and commit message fails. Do not need these anyways if the update script is always there. Deleted: SwiftApps/Montage/docs/SwiftMontageAPI.html =================================================================== --- SwiftApps/Montage/docs/SwiftMontageAPI.html 2011-06-20 14:56:13 UTC (rev 4634) +++ SwiftApps/Montage/docs/SwiftMontageAPI.html 2011-06-20 14:59:48 UTC (rev 4635) @@ -1,1185 +0,0 @@ - - - - - -SwiftMontage API - - - - - -
    -
    -

    1. Overview

    -
    -

    This is the API for the SwiftMontage wrappers. Montage is a toolkit for -generating science grade astronomical mosaics. The image file format for -Montage is Flexible Image Transport System or FITS.

    -

    Swift is a dataflow parallel scripting language. The language allows the user -to parallelize a workflow that has been represented as a swiftscript. Swift -implements the site execution model to allow for efficient use of available -resources for the user’s application.

    -
    - - - -
    -Note -Both the Montage binaries as well as the Swift binaries must be included -in your PATH environment variable for the wrappers to function properly.
    -
    -
    -
    -
    -

    2. SwiftMontage API

    -
    -
    -

    2.1. Types

    -

    These are all the Types that are declared for Swift. They are located in the -file Swift_Montage_types.swift.

    -
    -

    2.1.1. Image

    -
    -
    -
    type Image;
    -
    -

    This is the Image type. It is used to declare the raw images, projected -images, difference images, rectified images, and the mosaic.

    -
    -
    -

    2.1.2. Header

    -
    -
    -
    type Header;
    -
    -

    This is the Header type. It is used to declare and map to the FITS header -file.

    -
    -
    -

    2.1.3. Table

    -
    -
    -
    type Table;
    -
    -

    This is the Table type. During the execution of the workflow several files of -metadata is generated. These are tables that the Montage functions use to read -for the next stage of the workflow.

    -
    -
    -

    2.1.4. JPEG

    -
    -
    -
    type JPEG
    -
    -

    This is the JPEG type. This is used to map to the jpeg version of the mosaic.

    -
    -
    -

    2.1.5. Status

    -
    -
    -
    type Status;
    -
    -

    This is the status type. During the difference stage of the workflow status -file are generated that have the information about the coefficients that will -be used to rectify the image.

    -
    -
    -

    2.1.6. BackgroundStruct

    -
    -
    -
    type BackgroundStruct
    -{
    -    string fname;
    -    float a;
    -    float b;
    -    float c;
    -};
    -
    -

    This is a struct type. The entries are a string for the name of the image and -three coefficients to rectify this portion of the mosaic of all floating point -types.

    -
    -
    -

    2.1.7. DiffStruct

    -
    -
    -
    type DiffStruct
    -{
    -    int cntr1;
    -    int cntr2;
    -    Image plus;
    -    Image minus;
    -    Image diff;
    -};
    -
    -

    This is a struct type. The entries are two control integers that make this -entry unique, the two images that overlapped which are name plus and minus, -and the name of the difference image that they produced.

    -
    -
    -
    -

    2.2. App Procedures

    -

    These are all the app procedures for SwiftMontage. They are located in the -file Swift_Montage_Apps.swift

    -
    - - - -
    -Note -Currently the options to the Montage functions are hard coded and the -user cannot choose which options to run.
    -
    -
    -

    2.2.1. mAdd

    -
    -
    -
    app ( Image mos ) mAdd( Image imgs[], Table img_tbl, Header hdr )
    -
    -

    This app procedure will call the mAdd fucntion from the Montage toolkit. This -procedure takes -in a list of images to be added together, the img_tbl for these images, and -the FITS header file for the mosaic being created. The procedure then outputs -a single FITS file that represents the mosaic. All the images that will be -part of this mosaic must reside in the same directory.

    -
    -
    -

    2.2.2. mBackground

    -
    -
    -
    app ( Image bg_img ) mBackground( Image img, float a, float b, float c )
    -
    -

    This app procedure will call the mBackground function from the Montage -toolkit. This procedure takes in a single image along with the -three coefficients. The procedure then output the background rectified image -after the coefficients have been applied.

    -
    -
    -

    2.2.3. mBgModel

    -
    -
    -
    app ( Table rect_tbl ) mBgModel( Table img_tbl, Table fits_tbl )
    -
    -

    This app procedure will call the mBgModel function from the Montage -toolkit. This procedure takes in an image table that represents the list of images that -will be added into a mosaic and a table of the information that is required to -fit them together. The procedure will then output a rectification table of the -coefficients that must be applied to the images.

    -
    -
    -

    2.2.4. mConcatFit

    -
    -
    -
    app ( Table fits_tbl ) mConcatFit( Table status_tbl, Status stats[] )
    -
    -

    This app procedure will call the mConcatFit function from the Montage -toolkit. This procedure takes in a table representing the status files that were generated -from either mFitplane or mDiffFit and a list of these status files as -input. The procedure will then output a table of all the status files -together. The status files must all reside in the same directory.

    -
    -
    -

    2.2.5. mDiff

    -
    -
    -
    app ( Image diff_img ) mDiff( Image proj_img_1, Image proj_img_2, Header hdr )
    -
    -

    This app procedure will call the mDiff function from the Montage toolkit. This -procedure takes in two images and the FITS header file for the mosaic. The procedure will then output a -difference image representing the information of where the two images overlap.

    -
    -
    -

    2.2.6. mDiffFit

    -
    -
    -
    app ( Image diff_img, Status stat ) mDiffFit( Image img_1, Image img_2, Header hdr )
    -
    -

    This app procedure will call the mDiffFit function from the Montage -toolkit. The mDiffFit function in Montage is the combination of the mDiff and -mFitplane functions.

    -
    -
    -

    2.2.7. mFitplane

    -
    -
    -
    app ( Status stat ) mFitplane( Image diff_img )
    -
    -

    This app procedure will call the mFitplane function from the Montage -toolkit. This procedure takes in as input the difference image that was the output from -the mDiff procedure. The procedure will then output a status file that -contains the information on how to fit these two images together.

    -
    -
    -

    2.2.8. mImgtbl

    -
    -
    -
    app ( Table img_tbl ) mImgtbl( Image imgs[] )
    -
    -

    This app procedure will call the mImgtbl function from the Montage -toolkit. This procedure takes in as input a list of images to create a table -from. The output is an image table that represents these images. All the -images that will be part of this table must reside in the same directory.

    -
    -
    -

    2.2.9. mMakeHdr

    -
    -
    -
    app ( Header hdr ) mMakeHdr( Table img_tbl )
    -
    -

    This app procedure will call the mMakeHdr function from the Montage -toolkit. This procedure will take in as input an image table representing the -images that will be combined into a single mosaic. The procedure will then output the -FITS header file for the mosaic.

    -
    -
    -

    2.2.10. mJPEG

    -
    -
    -
    app ( JPEG mos_img_jpg ) mJPEG( Image mos_img )
    -
    -

    This app procedure will call the mJPEG function from the Montage toolkit. This -procedure will take in as input as input a FITS image. The procedure will -then ouput the same image in jpeg format.

    -
    -
    -

    2.2.11. mOverlaps

    -
    -
    -
    app ( Table diff_tbl ) mOverlaps( Table img_tbl )
    -
    -

    This app procedure will call the mOverlaps function from the Montage -toolkit. This procedure takes in as input an image table of the images that -will be combined into a single mosaic. The procedure will then output a table -of all the images that overlap with each other in the mosaic.

    -
    -
    -

    2.2.12. mProject

    -
    -
    -
    app ( Image proj_img ) mProject( Image raw_img, Header hdr )
    -
    -

    This app procedure will call the mProject function from the Montage -toolkit. This procedure takes in as input a FITS image file and the FITS header file -that for the mosaic. The output is the projected image.

    -
    - - - -
    -Note -The mProject app procedure is for general projection. There are some cases in -which the faster mProjectPP procedure should be used.
    -
    -
    -
    -

    2.2.13. mProjectPP

    -
    -
    -
    app ( Image proj_img ) mProjectPP( Image raw_img, Header hdr )
    -
    -

    This app procedure will call the mProjectPP function from the Montage -toolkit. This procedure takes in as input a FITS image file and the FITS header file -that for the mosaic. The output is the projected image.

    -
    - - - -
    -Note -The mProjectPP app procedure is a "special case" version of mProject -and can be used only where the input and output images have tangent-plane -projections (e.g. TAN, SIN) or where they can be approximated with acceptable -error.
    -
    -
    -
    -

    2.2.14. mShrink

    -
    -
    -
    app ( Image shrunk ) mShrink( Image original, int factor )
    -
    -

    This app procedure will call the mShrink function in the Montage toolkit. This -procedure takes in as input a single image and an re-sizing factor represented -as an integer. The procedure will then output the re-sized image.

    -
    -
    -

    2.2.15. Backgound_list

    -
    -
    -
    app ( Table back_tbl ) Background_list( Table imgs_tbl, Table rect_tbl )
    -
    -

    This app procedure will call the Background_list python script that is included in -the scripts directory for the SwiftMontage wrappers. This procedure takes in as input an image table of the -images that are being combined into a single mosaic and the table of -coefficients to rectify the mosaic. The procedure will then output a file in a -format that can be read in by the Swift readData2 function into the -Background_struct declared type.

    -
    -
    -

    2.2.16. create_status_table

    -
    -
    -
    app ( Table stat_tbl ) create_status_table( Table diff_tbl )
    -
    -

    This app procedure will call the create_status_table python script that is -included in the scripts directory for the SwiftMontage wrappers. This -procedure takes in as input the difference table that has been generated by -the mOverlaps procedure. The procedure will the output a table that can be -used as input to the mConcatFit app procedure.

    -
    -
    -
    -

    2.3. Batch Wrappers

    -

    These are the Batch scripts. These scripts do most of the file mapping -and is where the parallelization is taking place. They are located in the file -Swift_Montage_Batch.swift

    -
    -

    2.3.1. mBackgroundBatch

    -
    -
    -
    ( Image rect_imgs[] ) mBackgroundBatch( string dest, Image imgs[], Table img_tbl,
    -                                        Table rect_tbl )
    -
    -

    This batch swift script takes in as input a destination directory for the -rectified images, a list of images that will be combined into a -mosaic, an image table representing the images for the mosaic, and a table of -the coefficients that must be applied to each image. The script will then -output a list of the images after the coefficients have been applied. The -application of the coefficients to each image is done in parallel.

    -
    - - - -
    -Note -mBackgroundBatch calls the mBackground app procedure.
    -
    -
    -
    -

    2.3.2. mDiffBatch

    -
    -
    -
    ( Image diff_imgs[] ) mDiffBatch( string src, string dest, string filenames[],
    -                                  Table diff_tbl, Header hdr )
    -
    -

    This batch script takes in as input a source directory of where the images to calculate -overlaps are located, a destination directory of where to store these -difference images, a list of the file names for the images that will be -combined into the mosaic, a difference table that contains which images overlap with -each other, and the FITS header file for the mosaic. This script will then -output the difference images. The calculation each difference image are -done in parallel.

    -
    - - - -
    -Warning -The images that are in the source directory must be projected images.
    -
    -
    - - - -
    -Note -mDiffBatch calls the mDiff app procedure.
    -
    -
    -
    -

    2.3.3. mDiffFitBatch

    -
    -
    -
    ( Image diff_imgs[], Table fits_tbl ) mDiffFitBatch( string src, string dest, string stat,
    -                                                     string filenames[],
    -                                                     Table diff_tbl, Header hdr )
    -
    -

    This batch script takes in as input a source directory of where the images to -calculate overlaps are located, a destination directory of where to store -these difference images, a status directory of where to store the status files -for each image, a list of the file names for the images that will be -combined into the mosaic, a difference table that contains which images overlap -with each other and the FITS header file for the mosaic. This script will then -output a list of difference images and a table of information on how to fit -the images together. The calculation of each difference image and the fitting -table is done in parallel.

    -
    - - - -
    -Warning -The images that are in the source directory must be projected images.
    -
    -
    - - - -
    -Note -mDiffFitBatch calls the mDiffFit app procedure.
    -
    -
    -
    -

    2.3.4. mFitBatch

    -
    -
    -
    ( Table fits_tbl ) mFitBatch( string stat, Image diff_imgs[], Table diff_tbl )
    -
    -

    This batch script takes in as input a directory for which the status files -will be put in, the list of difference images that has -been generated and the table that contains which images overlap with each -other. The script then generates a table containing describing how to fit the -two overalpping images together.

    -
    - - - -
    -Note -mFitBatch calls the mFitplane app procedure.
    -
    -
    -
    -

    2.3.5. mProjectBatch

    -
    -
    -
    ( Image proj_imgs[] ) mProjectBatch( string dest, Image raw_imgs[], Header hdr )
    -
    -

    This batch script takes in as input the destination directory for the -projected images, a list of raw image files and the FITS header file -and projects each image. When projecting each image the function will decide -if it is possible to use the fast image projetion algorithm or to just use -standard projection.

    -
    - - - -
    -Warning -mProjectBatch currently only calls the general mProject app -procedure. It does not check to see if the faster projection mProjectPP can be used.
    -
    -
    -
    -
    -
    -
    -

    - - - Deleted: SwiftApps/Montage/docs/SwiftMontageAPI.pdf =================================================================== --- SwiftApps/Montage/docs/SwiftMontageAPI.pdf 2011-06-20 14:56:13 UTC (rev 4634) +++ SwiftApps/Montage/docs/SwiftMontageAPI.pdf 2011-06-20 14:59:48 UTC (rev 4635) @@ -1,2596 +0,0 @@ -%PDF-1.4 -%???? -1 0 obj -<< /S /GoTo /D (section.1) >> -endobj -4 0 obj -(Overview) -endobj -5 0 obj -<< /S /GoTo /D (section.2) >> -endobj -8 0 obj -(SwiftMontage API) -endobj -9 0 obj -<< /S /GoTo /D (subsection.2.1) >> -endobj -12 0 obj -(Types) -endobj -13 0 obj -<< /S /GoTo /D (subsubsection.2.1.1) >> -endobj -16 0 obj -(Image) -endobj -17 0 obj -<< /S /GoTo /D (subsubsection.2.1.2) >> -endobj -20 0 obj -(Header) -endobj -21 0 obj -<< /S /GoTo /D (subsubsection.2.1.3) >> -endobj -24 0 obj -(Table) -endobj -25 0 obj -<< /S /GoTo /D (subsubsection.2.1.4) >> -endobj -28 0 obj -(JPEG) -endobj -29 0 obj -<< /S /GoTo /D (subsubsection.2.1.5) >> -endobj -32 0 obj -(Status) -endobj -33 0 obj -<< /S /GoTo /D (subsubsection.2.1.6) >> -endobj -36 0 obj -(BackgroundStruct) -endobj -37 0 obj -<< /S /GoTo /D (subsubsection.2.1.7) >> -endobj -40 0 obj -(DiffStruct) -endobj -41 0 obj -<< /S /GoTo /D (subsection.2.2) >> -endobj -44 0 obj -(App Procedures) -endobj -45 0 obj -<< /S /GoTo /D (subsubsection.2.2.1) >> -endobj -48 0 obj -(mAdd) -endobj -49 0 obj -<< /S /GoTo /D (subsubsection.2.2.2) >> -endobj -52 0 obj -(mBackground) -endobj -53 0 obj -<< /S /GoTo /D (subsubsection.2.2.3) >> -endobj -56 0 obj -(mBgModel) -endobj -57 0 obj -<< /S /GoTo /D (subsubsection.2.2.4) >> -endobj -60 0 obj -(mConcatFit) -endobj -61 0 obj -<< /S /GoTo /D (subsubsection.2.2.5) >> -endobj -64 0 obj -(mDiff) -endobj -65 0 obj -<< /S /GoTo /D (subsubsection.2.2.6) >> -endobj -68 0 obj -(mDiffFit) -endobj -69 0 obj -<< /S /GoTo /D (subsubsection.2.2.7) >> -endobj -72 0 obj -(mFitplane) -endobj -73 0 obj -<< /S /GoTo /D (subsubsection.2.2.8) >> -endobj -76 0 obj -(mImgtbl) -endobj -77 0 obj -<< /S /GoTo /D (subsubsection.2.2.9) >> -endobj -80 0 obj -(mMakeHdr) -endobj -81 0 obj -<< /S /GoTo /D (subsubsection.2.2.10) >> -endobj -84 0 obj -(mJPEG) -endobj -85 0 obj -<< /S /GoTo /D (subsubsection.2.2.11) >> -endobj -88 0 obj -(mOverlaps) -endobj -89 0 obj -<< /S /GoTo /D (subsubsection.2.2.12) >> -endobj -92 0 obj -(mProject) -endobj -93 0 obj -<< /S /GoTo /D (subsubsection.2.2.13) >> -endobj -96 0 obj -(mProjectPP) -endobj -97 0 obj -<< /S /GoTo /D (subsubsection.2.2.14) >> -endobj -100 0 obj -(mShrink) -endobj -101 0 obj -<< /S /GoTo /D (subsubsection.2.2.15) >> -endobj -104 0 obj -(Backgound\137list) -endobj -105 0 obj -<< /S /GoTo /D (subsubsection.2.2.16) >> -endobj -108 0 obj -(create\137status\137table) -endobj -109 0 obj -<< /S /GoTo /D (subsection.2.3) >> -endobj -112 0 obj -(Batch Wrappers) -endobj -113 0 obj -<< /S /GoTo /D (subsubsection.2.3.1) >> -endobj -116 0 obj -(mBackgroundBatch) -endobj -117 0 obj -<< /S /GoTo /D (subsubsection.2.3.2) >> -endobj -120 0 obj -(mDiffBatch) -endobj -121 0 obj -<< /S /GoTo /D (subsubsection.2.3.3) >> -endobj -124 0 obj -(mDiffFitBatch) -endobj -125 0 obj -<< /S /GoTo /D (subsubsection.2.3.4) >> -endobj -128 0 obj -(mFitBatch) -endobj -129 0 obj -<< /S /GoTo /D (subsubsection.2.3.5) >> -endobj -132 0 obj -(mProjectBatch) -endobj -133 0 obj -<< /S /GoTo /D [134 0 R /FitH ] >> -endobj -136 0 obj << -/Length 210 -/Filter /FlateDecode ->> -stream -x???OkA ???)?q??1????c mQ(X??x??P+???wV?E??KH^??1z0>?k1??????*?jI#Gr???1of??????=.?????????]?I? -R???>'/?D(?po?C?V??H?d????1 )[?vf?`??n?????A???:?`f? ?b??+??$ -Yec?#???S???n???u ????_?G>?w???g??S -endstream -endobj -134 0 obj << -/Type /Page -/Contents 136 0 R -/Resources 135 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 142 0 R ->> endobj -137 0 obj << -/D [134 0 R /XYZ -16.307 900.716 null] ->> endobj -140 0 obj << -/D [134 0 R /XYZ 56.693 759.068 null] ->> endobj -135 0 obj << -/Font << /F50 138 0 R /F51 139 0 R /F52 141 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -178 0 obj << -/Length 901 -/Filter /FlateDecode ->> -stream -x???Ko?0??? -???o?c??S?6??????h )??d i??~y?=4?*h} ?3C>???1??????v?PP "?d??y?* -&?????,?^-S:.??>]:???l(2*h>?)qv??*???Q?_i?N???t"?Pd?=??@Lc??? ?? - ?????1?ABE?}??O ???L?????+?L@?E??$3:\????Rw2?F?:?Ex{???KD?????b??????????) -??????$?YT -?V??B?xP*m ?:^???????e -A?s(TT%???L??????7/???? -:?????R}??3!?'???2<??JC???z?/[\???9???y?????"?q,??????X??/?V?Lp??????z9??v???M?Q/`????g????a???? -*?IV?O?h??d?'l???4??^??????,G#S??K2?q??D??????????D??z^\?[D??n'1 {O???I??????:r?vm? t?????]?C????~:}(??????J?I?k????w?]3z??,i7?n?????60???w?bJ??;J?? -??)?0?z?ow??????Z??9Lq?3?-g??w;"???+?]?V2?P??Y??A? -endstream -endobj -177 0 obj << -/Type /Page -/Contents 178 0 R -/Resources 176 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 142 0 R -/Annots [ 143 0 R 144 0 R 145 0 R 146 0 R 147 0 R 148 0 R 149 0 R 150 0 R 151 0 R 152 0 R 153 0 R 154 0 R 155 0 R 156 0 R 157 0 R 158 0 R 159 0 R 160 0 R 161 0 R 162 0 R 163 0 R 164 0 R 165 0 R 166 0 R 167 0 R 168 0 R 169 0 R 170 0 R 171 0 R 172 0 R 173 0 R 174 0 R 175 0 R ] ->> endobj -143 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [55.697 706.356 113.38 715.332] -/A << /S /GoTo /D (section.1) >> ->> endobj -144 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [55.697 676.558 152.045 687.437] -/A << /S /GoTo /D (section.2) >> ->> endobj -145 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [70.641 658.49 119.099 669.394] -/A << /S /GoTo /D (subsection.2.1) >> ->> endobj -146 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 640.558 152.324 651.461] -/A << /S /GoTo /D (subsubsection.2.1.1) >> ->> endobj -147 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 624.682 156.19 633.529] -/A << /S /GoTo /D (subsubsection.2.1.2) >> ->> endobj -148 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 606.749 149.315 615.596] -/A << /S /GoTo /D (subsubsection.2.1.3) >> ->> endobj -149 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 588.817 150.122 597.663] -/A << /S /GoTo /D (subsubsection.2.1.4) >> ->> endobj -150 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 570.884 151.786 579.73] -/A << /S /GoTo /D (subsubsection.2.1.5) >> ->> endobj -151 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 550.894 199.925 561.798] -/A << /S /GoTo /D (subsubsection.2.1.6) >> ->> endobj -152 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 535.018 167.576 543.865] -/A << /S /GoTo /D (subsubsection.2.1.7) >> ->> endobj -153 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [70.641 515.028 159.457 525.932] -/A << /S /GoTo /D (subsection.2.2) >> ->> endobj -154 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 499.153 152.334 507.999] -/A << /S /GoTo /D (subsubsection.2.2.1) >> ->> endobj -155 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 479.163 183.876 490.067] -/A << /S /GoTo /D (subsubsection.2.2.2) >> ->> endobj -156 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 461.23 172.817 472.134] -/A << /S /GoTo /D (subsubsection.2.2.3) >> ->> endobj -157 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 445.355 174.481 454.201] -/A << /S /GoTo /D (subsubsection.2.2.4) >> ->> endobj -158 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 427.422 151.527 436.268] -/A << /S /GoTo /D (subsubsection.2.2.5) >> ->> endobj -159 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 409.489 162.605 418.336] -/A << /S /GoTo /D (subsubsection.2.2.6) >> ->> endobj -160 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 389.499 167.836 400.403] -/A << /S /GoTo /D (subsubsection.2.2.7) >> ->> endobj -161 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 371.566 161.748 382.47] -/A << /S /GoTo /D (subsubsection.2.2.8) >> ->> endobj -162 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 355.571 173.255 364.537] -/A << /S /GoTo /D (subsubsection.2.2.9) >> ->> endobj -163 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 337.758 157.873 346.605] -/A << /S /GoTo /D (subsubsection.2.2.10) >> ->> endobj -164 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 317.768 170.994 328.672] -/A << /S /GoTo /D (subsubsection.2.2.11) >> ->> endobj -165 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 299.835 163.402 310.739] -/A << /S /GoTo /D (subsubsection.2.2.12) >> ->> endobj -166 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 281.903 174.481 292.806] -/A << /S /GoTo /D (subsubsection.2.2.13) >> ->> endobj -167 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 266.027 161.749 274.874] -/A << /S /GoTo /D (subsubsection.2.2.14) >> ->> endobj -168 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 246.037 189.972 256.941] -/A << /S /GoTo /D (subsubsection.2.2.15) >> ->> endobj -169 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 229.081 203.232 239.008] -/A << /S /GoTo /D (subsubsection.2.2.16) >> ->> endobj -170 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [70.641 210.172 160.005 221.075] -/A << /S /GoTo /D (subsection.2.3) >> ->> endobj -171 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 192.239 207.118 203.143] -/A << /S /GoTo /D (subsubsection.2.3.1) >> ->> endobj -172 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 176.363 174.769 185.21] -/A << /S /GoTo /D (subsubsection.2.3.2) >> ->> endobj -173 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 158.431 185.848 167.277] -/A << /S /GoTo /D (subsubsection.2.3.3) >> ->> endobj -174 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 140.498 169.499 149.344] -/A << /S /GoTo /D (subsubsection.2.3.4) >> ->> endobj -175 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [93.555 120.508 186.645 131.412] -/A << /S /GoTo /D (subsubsection.2.3.5) >> ->> endobj -179 0 obj << -/D [177 0 R /XYZ -11.232 900.716 null] ->> endobj -176 0 obj << -/Font << /F50 138 0 R /F51 139 0 R /F52 141 0 R /F57 180 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -183 0 obj << -/Length 1791 -/Filter /FlateDecode ->> -stream -x??Y?s?6 ?_???w KR%???[???m?????Sl?Q+K?$7???)K???u??C? ???????W???7?R?*????S???Kx??4?+??}???_???6z~!#?????\?V?%??d -?MB?B?F1 ???5 -?f???f???"????).??v??#?V????Y?&????z??L -??w=?}??&?`3???BD??* ?4B???Bp?????z]?k??"????g?? ??$&9????_f U??>ze? ]a?k?????*??N????????e??0??Q?F??m'???H????#??pO???o61N????????????F6?4?X2??o+???W?6k???? ?? '??=\???????D????8!??NE\???'|y&??9??B????bE`?mV????c?~Il???; V??\??Zl???????????=sA??w?t)?)k^????}&G> endobj -184 0 obj << -/D [182 0 R /XYZ -16.307 900.716 null] ->> endobj -2 0 obj << -/D [182 0 R /XYZ 56.693 759.068 null] ->> endobj -185 0 obj << -/D [182 0 R /XYZ 56.693 731.272 null] ->> endobj -6 0 obj << -/D [182 0 R /XYZ 56.693 596.031 null] ->> endobj -186 0 obj << -/D [182 0 R /XYZ 56.693 556.98 null] ->> endobj -10 0 obj << -/D [182 0 R /XYZ 56.693 556.98 null] ->> endobj -187 0 obj << -/D [182 0 R /XYZ 56.693 529.727 null] ->> endobj -14 0 obj << -/D [182 0 R /XYZ 56.693 500.03 null] ->> endobj -188 0 obj << -/D [182 0 R /XYZ 56.693 474.337 null] ->> endobj -189 0 obj << -/D [182 0 R /XYZ 56.693 468.461 null] ->> endobj -190 0 obj << -/D [182 0 R /XYZ 56.693 471.351 null] ->> endobj -18 0 obj << -/D [182 0 R /XYZ 56.693 417.347 null] ->> endobj -192 0 obj << -/D [182 0 R /XYZ 56.693 391.654 null] ->> endobj -193 0 obj << -/D [182 0 R /XYZ 56.693 385.778 null] ->> endobj -194 0 obj << -/D [182 0 R /XYZ 56.693 388.667 null] ->> endobj -22 0 obj << -/D [182 0 R /XYZ 56.693 334.664 null] ->> endobj -195 0 obj << -/D [182 0 R /XYZ 56.693 308.97 null] ->> endobj -196 0 obj << -/D [182 0 R /XYZ 56.693 303.095 null] ->> endobj -197 0 obj << -/D [182 0 R /XYZ 56.693 305.984 null] ->> endobj -26 0 obj << -/D [182 0 R /XYZ 56.693 240.025 null] ->> endobj -198 0 obj << -/D [182 0 R /XYZ 56.693 214.332 null] ->> endobj -199 0 obj << -/D [182 0 R /XYZ 56.693 208.456 null] ->> endobj -200 0 obj << -/D [182 0 R /XYZ 56.693 211.345 null] ->> endobj -30 0 obj << -/D [182 0 R /XYZ 56.693 157.342 null] ->> endobj -201 0 obj << -/D [182 0 R /XYZ 56.693 131.648 null] ->> endobj -202 0 obj << -/D [182 0 R /XYZ 56.693 125.773 null] ->> endobj -203 0 obj << -/D [182 0 R /XYZ 56.693 128.662 null] ->> endobj -181 0 obj << -/Font << /F50 138 0 R /F51 139 0 R /F52 141 0 R /F90 191 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -206 0 obj << -/Length 2021 -/Filter /FlateDecode ->> -stream -x??Z]??6}???G{&Q$??>%m??3???}K2w0`? p?????w?$????b??t??#????x?{s?????k???? -?~? ???,???}?}X????e?D?t??r?x?????????xt????0?9!(?\w??C??O?nw???}?#????0? ?z????'?%P??? ??m??8?????????;l&?{???,6 ??(?`?V -?????`???xI????R??H?7?!ntc??j??? f?#??'}?$QPbN??y?A?U???j??,=??IN???????J}|k?1#t? -i??m??? zC??e]z)G?5???>??{| M7P=???R???H}6:???t?*{???!h??;?Ma???f????????e??$??D[?n????[??"???Mm??X:???GG??ge??!Bp?x?u^F?86?????D??D?? ge'0D?@S?X????$??1??wd?Y? LH????L?73?9 -! -???>?#??^?????&??o??|?q??^ ???U?_?H?~????p?????Z?ZmY?jh???!?O?,-????Oe????#?u??2(?k???r=??v:uQ?Eb+??T?e?^R???1?3P??????J?&[??~vJ??j???????bW?Q??z?[/%j?B??.??>?Hzn??/???Ee????A??>?x?n?????l????p ?B???p5x?7{???f?+;>???!?? ????? ??8d?|D???pU???????r?NH??]??v???8??J??~6.L????*p ??wB2?w??Y? \???Ix?f.?DX?w<2?w??Y? \P?|???m??Qd??C}3X B?;o?;r???.p?????e??l??#??;n??????x6X ???l$??LF?C?????;?????????????2?Gd? ??c?k?K!uv)D? ??1????.6?%?N???Si??$xQ????6en??dQ4????&????62C???????Zm?0OZx(?/?????"&7??(trz?]?A?Q?i?G?}?????,??&j???X????? ?j?Y/7;???P??SW????%S)?:??"62?V??????~2*Ter???B -??$x(l?C?ImK/??/?{}??N????Jks?]5H????Ik??f??}???Zi ?>??(toB??"zm??{D??8jRc????????`@`?5??h?????[(8b?y??(8?9?;7?jg -???????Z,x??}??,???5??4??CK???45z?P(??p?6?rP{?N?????;??????D??2IMQ??.??N+?,*??1?mY????^d??\? ??C??o??m|?B???y3?c????e?????{?? -#?/??????P)'??|7??????`dR^?? ?T??G???_ g???e}e ??1`A%????j??6g??O????????*??~K???Q#l??????k(?????????&2&< -??h=y4-?Z??v?? -N@???V?>??9???*w???]\I?2??5??%c7&h?5D????1??F ?D5??Q;??? V?(?p???)7)hY-^?h???y??K?}?? -? ?jD?M??|??_???K[??????@u?\??U???W???Kb?Tw-?Q -]*????N?C??j@??KF0???S?V?{q?uG7?G??,I?M?18M2u#SB?-?b?????rw??????@????$Db??|?$|7_???x_K$????mW??;nt???????}??w-?z5t?????M??;t??\?O9|??E?1??l?Pa?8???????fY??x?n??7W??7?9???S???9?f=???7?"{X?????????z???`????P> endobj -207 0 obj << -/D [205 0 R /XYZ -11.232 900.716 null] ->> endobj -34 0 obj << -/D [205 0 R /XYZ 56.693 759.068 null] ->> endobj -208 0 obj << -/D [205 0 R /XYZ 56.693 739.087 null] ->> endobj -209 0 obj << -/D [205 0 R /XYZ 56.693 733.109 null] ->> endobj -210 0 obj << -/D [205 0 R /XYZ 56.693 735.998 null] ->> endobj -211 0 obj << -/D [205 0 R /XYZ 56.693 725.039 null] ->> endobj -212 0 obj << -/D [205 0 R /XYZ 56.693 714.08 null] ->> endobj -213 0 obj << -/D [205 0 R /XYZ 56.693 703.121 null] ->> endobj -214 0 obj << -/D [205 0 R /XYZ 56.693 692.163 null] ->> endobj -215 0 obj << -/D [205 0 R /XYZ 56.693 681.204 null] ->> endobj -216 0 obj << -/D [205 0 R /XYZ 56.693 670.245 null] ->> endobj -38 0 obj << -/D [205 0 R /XYZ 56.693 604.038 null] ->> endobj -217 0 obj << -/D [205 0 R /XYZ 56.693 578.243 null] ->> endobj -218 0 obj << -/D [205 0 R /XYZ 56.693 572.266 null] ->> endobj -219 0 obj << -/D [205 0 R /XYZ 56.693 575.155 null] ->> endobj -220 0 obj << -/D [205 0 R /XYZ 56.693 564.196 null] ->> endobj -221 0 obj << -/D [205 0 R /XYZ 56.693 553.237 null] ->> endobj -222 0 obj << -/D [205 0 R /XYZ 56.693 542.278 null] ->> endobj -223 0 obj << -/D [205 0 R /XYZ 56.693 531.319 null] ->> endobj -224 0 obj << -/D [205 0 R /XYZ 56.693 520.36 null] ->> endobj -225 0 obj << -/D [205 0 R /XYZ 56.693 509.402 null] ->> endobj -226 0 obj << -/D [205 0 R /XYZ 56.693 498.443 null] ->> endobj -42 0 obj << -/D [205 0 R /XYZ 56.693 432.236 null] ->> endobj -227 0 obj << -/D [205 0 R /XYZ 56.693 403.851 null] ->> endobj -46 0 obj << -/D [205 0 R /XYZ 56.693 322.8 null] ->> endobj -228 0 obj << -/D [205 0 R /XYZ 56.693 294.848 null] ->> endobj -229 0 obj << -/D [205 0 R /XYZ 56.693 288.87 null] ->> endobj -230 0 obj << -/D [205 0 R /XYZ 56.693 291.759 null] ->> endobj -50 0 obj << -/D [205 0 R /XYZ 56.693 213.598 null] ->> endobj -231 0 obj << -/D [205 0 R /XYZ 56.693 187.803 null] ->> endobj -232 0 obj << -/D [205 0 R /XYZ 56.693 181.825 null] ->> endobj -233 0 obj << -/D [205 0 R /XYZ 56.693 184.714 null] ->> endobj -204 0 obj << -/Font << /F50 138 0 R /F51 139 0 R /F52 141 0 R /F90 191 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -236 0 obj << -/Length 2169 -/Filter /FlateDecode ->> -stream -x??ZKs?6??W?(U? -?????? b?/??z??c??Gs???b_{+j?Vb?feo?vR??{??M?????[Z??=?????f=Co??? ???m?J;??5??U]?Q{??b?-X???`w"???MRn???? -???-?*cd?????7A?8((U??S>??gy?}?PH?-??a8}z$v??fj:&?l??m?????=L!?? -X???????`5????fl?<`iSk?m?????%???e?? ?=???@??r????X????o???w?t???]J?g?{sv>)?o`W|N?J?6?9?w????G?????y??????SUn &?d?~??d??5Ev -DMUN -?"F?2JS9?%<@F %? -???V.??j???%??Y?{ObJ??\?5j????E!?>3?Y??w?W????.1???????b???j?????S?,8?v????L???&?????2??f??!???? ?"??~???X??:l?]v?31n??5^.Y??????}?p.?????\,????!R?r?)v1D???H??=?RNI???9"?5??x??yg???????R?I?5?N(Ih???1s?1??[??c??c??????$d??g???%`?i?y????j-??te?:1tn???????=n???? ???o?BzU???Wu?48x??m! -?? ?s??????y?0????A??\?r???? E????[??$??r?T???>?x???i????.?i???>?????}?O?????> -O?i?OF??}??}?/?6WH?h3:P?w??`?|?B??9??)?????T 1?+2A?L8??%8?u'e???R>)???????mR??]? -?zJ?f?u? ????[??S??q?'? G ??^ -???????????]??????O???!???a?????= ?.??r7?_?? fc?/}??? -?_?(~ -D?T??dt*? O?2]??.?A?l??? ipr?G%n?}?&???;??+??q??Z~(?]?????+???????24P?h???Z??h??/Y?k,`pVc?r?????????? ?HZ??X????A???????@?8? -| -`T????P????? Gf3??.??0?'?< -??p? ????S???+??Lytu???A???q?s??(#/???B}???W?`.?P????2?$?uG?y??_?bq???O+?#??????r?O??Is -.????G at Y'6??????n????SJ?T????/??4 -endstream -endobj -235 0 obj << -/Type /Page -/Contents 236 0 R -/Resources 234 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 142 0 R ->> endobj -237 0 obj << -/D [235 0 R /XYZ -16.307 900.716 null] ->> endobj -54 0 obj << -/D [235 0 R /XYZ 56.693 759.068 null] ->> endobj -238 0 obj << -/D [235 0 R /XYZ 56.693 739.087 null] ->> endobj -239 0 obj << -/D [235 0 R /XYZ 56.693 734.297 null] ->> endobj -240 0 obj << -/D [235 0 R /XYZ 56.693 737.186 null] ->> endobj -58 0 obj << -/D [235 0 R /XYZ 56.693 661.911 null] ->> endobj -241 0 obj << -/D [235 0 R /XYZ 56.693 637.304 null] ->> endobj -242 0 obj << -/D [235 0 R /XYZ 56.693 632.514 null] ->> endobj -243 0 obj << -/D [235 0 R /XYZ 56.693 635.403 null] ->> endobj -62 0 obj << -/D [235 0 R /XYZ 56.693 560.129 null] ->> endobj -244 0 obj << -/D [235 0 R /XYZ 56.693 535.521 null] ->> endobj -245 0 obj << -/D [235 0 R /XYZ 56.693 530.731 null] ->> endobj -246 0 obj << -/D [235 0 R /XYZ 56.693 533.621 null] ->> endobj -66 0 obj << -/D [235 0 R /XYZ 56.693 458.346 null] ->> endobj -247 0 obj << -/D [235 0 R /XYZ 56.693 433.739 null] ->> endobj -248 0 obj << -/D [235 0 R /XYZ 56.693 428.949 null] ->> endobj -249 0 obj << -/D [235 0 R /XYZ 56.693 431.838 null] ->> endobj -70 0 obj << -/D [235 0 R /XYZ 56.693 368.518 null] ->> endobj -250 0 obj << -/D [235 0 R /XYZ 56.693 343.911 null] ->> endobj -251 0 obj << -/D [235 0 R /XYZ 56.693 339.121 null] ->> endobj -252 0 obj << -/D [235 0 R /XYZ 56.693 342.01 null] ->> endobj -74 0 obj << -/D [235 0 R /XYZ 56.693 266.736 null] ->> endobj -253 0 obj << -/D [235 0 R /XYZ 56.693 242.128 null] ->> endobj -254 0 obj << -/D [235 0 R /XYZ 56.693 237.339 null] ->> endobj -255 0 obj << -/D [235 0 R /XYZ 56.693 240.228 null] ->> endobj -78 0 obj << -/D [235 0 R /XYZ 56.693 164.953 null] ->> endobj -256 0 obj << -/D [235 0 R /XYZ 56.693 140.346 null] ->> endobj -257 0 obj << -/D [235 0 R /XYZ 56.693 135.556 null] ->> endobj -258 0 obj << -/D [235 0 R /XYZ 56.693 138.445 null] ->> endobj -234 0 obj << -/Font << /F50 138 0 R /F51 139 0 R /F52 141 0 R /F90 191 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -261 0 obj << -/Length 2217 -/Filter /FlateDecode ->> -stream -x??ZK???????d?\>$J:?"?? ?N???b@???iYr$y;?_?"??)?z??X?$>??d???H?`????/???~?h??Tr,???D?ABc"R,V????c???VW????[???w???/>?T$0U -=5L`n???4?pr3?d?~??v?????7 ? "I$h?SF$?A????; -V??!?$L??????? ?2???? -?????p?"';L ? -??C???&?n?t??p??;???N?y7?W???A,?+m?n??$??'i?M?}??[?+??$4u -P0??/?o7e(?m?)|Y?? -?DI???>km ?_l-? ??!T???R}??[$??jgKF?-? _???E? -??u?S????  ??(???M??????R???M??????RpR~5?? A/7?t?"????P??DxZ???nY~#|??=?F??????O?????o???C????W[ ??0?=?C? -!?`?5*?m6}??????#???#??????Am?%ms_G4?MV??03?f?6???0 I?iP0???Dc???????v\V??E??pdQu5?+??E?)?P`XUd???K????/5???????T:\?Q4???u?????qMm?c?m?s??R -b?!???w& -?i?k??}????_M^?"??|w???.7?t? ??R8#J?_?????i???|?J?t?',???u?? -~\'i??? 9&?1?????M??Hj9F#TI=?????pFzGhj????????#?h!G? i??c|?????}?X7??D?F???O??i?Q?j?N-??)[ v???x??F?=ch?nGS????? ?????;??0 -?% -????g?=K?&$???gy~??dI??0???Xw????h?p?1?}j6j???????? ???l? -??K??kw|???@r'A?B[???g???\?@??q[??? -p?Tmg??????????n?C???????m?"?/??f??p??s0?^|??8?8[??????pH?`0???[?)q|5?????/7?t???UF6?v????"?D$?[p??b%l??iG?K?.?tL ?!??????hK?q?????0?Lh:LS ??2-9Rw?I|,????'?????=u ?H?????K O?gn -???QP???f??????<+ eCMs?X?c?u.???A???=EV?9>3??[ZE?W???|??????9?????qA???m?=?I[?mE:?T?Hw?/U???6?7???+???$?-? ????Gp????S?'?????????{-?B -????q??r?+=???e??SK-??s???Y3|9?I????d??B????mST'b*??)??C??$?z#???!?{z?%???B?m?-?B|??RR7???TyfRT?i??*??KC?I?x??C?A???  #&{?nC(?? xC?;?S??c"h???-?}???b???>?A??|??a?????J\r?up4????L????>T??e??z)????z???$!????#?????????L??A????*{???A???M3r????????ghh ~??Lr?(?D?,?Q^?Q^y?R??i??Gj??????VG???? 9?2???u?????Jk??h????b????n?cR%??n??]?[Z3j-??~?M.??et?? ???d(;??W?i?;? -? -???+??S??s??:?-?{?M?????`????9d??WyV?Y?????????KRBe?-??%q?? -endstream -endobj -260 0 obj << -/Type /Page -/Contents 261 0 R -/Resources 259 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 142 0 R ->> endobj -262 0 obj << -/D [260 0 R /XYZ -11.232 900.716 null] ->> endobj -82 0 obj << -/D [260 0 R /XYZ 56.693 759.068 null] ->> endobj -263 0 obj << -/D [260 0 R /XYZ 56.693 739.087 null] ->> endobj -264 0 obj << -/D [260 0 R /XYZ 56.693 734.166 null] ->> endobj -265 0 obj << -/D [260 0 R /XYZ 56.693 737.055 null] ->> endobj -86 0 obj << -/D [260 0 R /XYZ 56.693 673.418 null] ->> endobj -266 0 obj << -/D [260 0 R /XYZ 56.693 648.68 null] ->> endobj -267 0 obj << -/D [260 0 R /XYZ 56.693 643.76 null] ->> endobj -268 0 obj << -/D [260 0 R /XYZ 56.693 646.649 null] ->> endobj -90 0 obj << -/D [260 0 R /XYZ 56.693 573.114 null] ->> endobj -269 0 obj << -/D [260 0 R /XYZ 56.693 546.319 null] ->> endobj -270 0 obj << -/D [260 0 R /XYZ 56.693 541.398 null] ->> endobj -271 0 obj << -/D [260 0 R /XYZ 56.693 544.287 null] ->> endobj -94 0 obj << -/D [260 0 R /XYZ 56.693 422.55 null] ->> endobj -272 0 obj << -/D [260 0 R /XYZ 56.693 395.655 null] ->> endobj -273 0 obj << -/D [260 0 R /XYZ 56.693 390.734 null] ->> endobj -274 0 obj << -/D [260 0 R /XYZ 56.693 393.624 null] ->> endobj -98 0 obj << -/D [260 0 R /XYZ 56.693 269.994 null] ->> endobj -275 0 obj << -/D [260 0 R /XYZ 56.693 243.099 null] ->> endobj -276 0 obj << -/D [260 0 R /XYZ 56.693 238.179 null] ->> endobj -277 0 obj << -/D [260 0 R /XYZ 56.693 241.068 null] ->> endobj -102 0 obj << -/D [260 0 R /XYZ 56.693 177.431 null] ->> endobj -278 0 obj << -/D [260 0 R /XYZ 56.693 152.693 null] ->> endobj -279 0 obj << -/D [260 0 R /XYZ 56.693 147.772 null] ->> endobj -280 0 obj << -/D [260 0 R /XYZ 56.693 150.662 null] ->> endobj -259 0 obj << -/Font << /F50 138 0 R /F51 139 0 R /F52 141 0 R /F90 191 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -284 0 obj << -/Length 2176 -/Filter /FlateDecode ->> -stream -x???K??8???+|??*??%?g?g{"??D?????eD???lE????R2?@??{B??TJ??? 4z?h????????F)I?D?E?p??HSED*?????~?(?S????H2J?H???>?????I?????EAw?F4?N?:F??t??&k?c?f??yl??)?????0%??~?4?? ????(f'`??%??8?$?iT?h??xO?q??~???< ???m=V?_?}?a????+!)O?`?SX?GX??woJ??q??\*Rto?? }??k??z?P?o1????O???? -??>?N ??=??. ?????b?x????7?D????????????????Cg????#e??P??M]?f?? -?_?? -Ky?%:i????j???=?_?eUb?&??M?u?2?%?N?2_m?f??ehg??????6y[?_??????.TX}X??;??????!?Xu?B'????m???????*??u?7???\?.??\N?6e??q???2?c?<??>?????s_?u?{???L???z?m?wS9:??C?y????P?????-g????5?|]??Xx?U??9?vk??/??W -?Y?P?y?~(?Pn?I??H????5%S??a^B??????????????*???????w?*@)??Hd8???*0??X?? (??D???????^? -?0?P???%??Q'T?J)_y?k??(??"+?(u?/KS?A?MV??4???Y[????;??l??r?????W?N}t???w#zu???j????q?n?Hce??????%#Zu?$??3???|??????~T?r???yw???=??d????a?;?6?$)??????kA??????X?7???????\`??????CA???4?G?i?#?_m9???????A?0???\?v????????a??g?4Wp?i -?%D?5?/??q???? ?N?????U??@?u????%????????????H -$????c-?t?&??5?????yU4~(?h????=??@?nz%y?~*JP?]-J?"???,dE~o??G?n$,v$???M -?Q???????uh??L????1??`??????6??CZ?\y#7?2!??m|????Y??&k2?s???m??&?K?Hw???W?F?X??*H3??????cU?4???55?}?>>Gh??,q ucK?u??? W?p/??u?|{?#?????????Ui??,? \+??w%$?Dp>c8?1??AbH?Cq????!1t? -??,????????b -???;{?{??#wp6X????? - &?? w?q?0%???$????? -Z)w? ?????b???b???I};? #,Mo?l??{?G{?bE??P7?X?*I?a???_?:?_oL???_+Sfks??_?l6??v_???0??s?U?Q;?2????$?kN?????Z?5?r^??c?+??{??? b/+X?c[????ro?@"???0ug;W?:7X?gK?8??T?)???$??!\?7???????????t??^?OY????|?oR|??G?@?;?'H5?'?|? -?????.?s?83???C??!p?P?rYP???#ES?k????v?J=S????E&???y?Q -?r? C?]vY??+??(??, ?????????E??z?? -??z??=B9F ??'??????'-??:i??P?I?^?.?2 at b??C??Y at v?4??P?A??J?L????r?ppf?e???????????k 7W?0?8? ?C -???????*RJ?}?+???? ?}\??? -??4>x?=??x ?Jb?"K?b??b7IV??]>?I?VG:????z??-?????~w?)??vc???????!??x1?745??A?p? S8>T??w????????j???)??m?O?&W -??? G?]%NP????1I?HnC1????q?9?6?d ??&4??o u????h?????9??}?o??!D3}?c??~?)m?????\E?"????;G??-o?> endobj -281 0 obj << -/Type /XObject -/Subtype /Form -/FormType 1 -/PTEX.FileName (/usr/local/share/dblatex/latex/contrib/db2latex/graphics/warning.pdf) -/PTEX.PageNumber 1 -/PTEX.InfoDict 304 0 R -/BBox [0 0 29 29] -/Resources << -/ProcSet [ /PDF ] -/ExtGState << -/R8 305 0 R -/R7 306 0 R ->>>> -/Length 566 -/Filter /FlateDecode ->> -stream -x?]TI?T1 ??Y?0?9b?$@?{?Xp}????[?(??~???O???6?t -???>??j?????4'?W5??3??/?%H?K*???J,?.?H????&>?=o??&)?d?$+?]K????7??]?:(mm???? ?'??<(_?OU'?K 2?????X????~?op/????_???H ???]&?????2??%??d?w^?%bT??XE!x??8j?$?4????3?x??7?"?89?? ?2?m???F6?,? ?a;?,???w??8?]50&??}?)???0Hc?3p ha?> -endobj -305 0 obj -<< -/Type /ExtGState -/op true ->> -endobj -306 0 obj -<< -/Type /ExtGState -/OPM 1 -/SA true ->> -endobj -285 0 obj << -/D [283 0 R /XYZ -16.307 900.716 null] ->> endobj -106 0 obj << -/D [283 0 R /XYZ 56.693 759.068 null] ->> endobj -286 0 obj << -/D [283 0 R /XYZ 56.693 739.087 null] ->> endobj -287 0 obj << -/D [283 0 R /XYZ 56.693 733.109 null] ->> endobj -288 0 obj << -/D [283 0 R /XYZ 56.693 735.998 null] ->> endobj -110 0 obj << -/D [283 0 R /XYZ 56.693 657.837 null] ->> endobj -289 0 obj << -/D [283 0 R /XYZ 56.693 629.451 null] ->> endobj -114 0 obj << -/D [283 0 R /XYZ 56.693 587.653 null] ->> endobj -290 0 obj << -/D [283 0 R /XYZ 56.693 561.858 null] ->> endobj -291 0 obj << -/D [283 0 R /XYZ 56.693 555.881 null] ->> endobj -292 0 obj << -/D [283 0 R /XYZ 56.693 558.77 null] ->> endobj -293 0 obj << -/D [283 0 R /XYZ 56.693 547.811 null] ->> endobj -118 0 obj << -/D [283 0 R /XYZ 56.693 406.486 null] ->> endobj -294 0 obj << -/D [283 0 R /XYZ 56.693 378.534 null] ->> endobj -295 0 obj << -/D [283 0 R /XYZ 56.693 372.556 null] ->> endobj -296 0 obj << -/D [283 0 R /XYZ 56.693 375.445 null] ->> endobj -297 0 obj << -/D [283 0 R /XYZ 56.693 364.487 null] ->> endobj -122 0 obj << -/D [283 0 R /XYZ 56.693 150.064 null] ->> endobj -298 0 obj << -/D [283 0 R /XYZ 56.693 122.112 null] ->> endobj -299 0 obj << -/D [283 0 R /XYZ 56.693 116.134 null] ->> endobj -300 0 obj << -/D [283 0 R /XYZ 56.693 119.023 null] ->> endobj -301 0 obj << -/D [283 0 R /XYZ 56.693 108.064 null] ->> endobj -302 0 obj << -/D [283 0 R /XYZ 56.693 97.105 null] ->> endobj -282 0 obj << -/Font << /F50 138 0 R /F51 139 0 R /F52 141 0 R /F90 191 0 R >> -/XObject << /Im1 281 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -309 0 obj << -/Length 1806 -/Filter /FlateDecode ->> -stream -x??YK??8 ??W??W?,?>n??????6@??P?H?:vj;????(?v&??k1???(?"???0g?0???????;?????/?e?H??????1w??s;?p(??????:[\?????^|^?????T?qj??(p????x???Ka????N???~fN -c??q????s}.?.??f???.??b?c?8??-8???Ju???m??i6??????I?iU???IR??z?$???????n~?n????????oH??Bcn?B H=d?????s???????T^ -t?????b????c?b?a??i?????? \???K1?L?8?`..7M?y^<`???C??????EF6i?D??f&??????(?8???j?r\? ??)??k????I]Q?K?!}?3???|P%?*??? -?J?????{ ???????????????3<}?U? ?ITp[w?6???????Q??W???9?? -endstream -endobj -308 0 obj << -/Type /Page -/Contents 309 0 R -/Resources 307 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 303 0 R ->> endobj -310 0 obj << -/D [308 0 R /XYZ -11.232 900.716 null] ->> endobj -126 0 obj << -/D [308 0 R /XYZ 56.693 560.885 null] ->> endobj -311 0 obj << -/D [308 0 R /XYZ 56.693 532.933 null] ->> endobj -312 0 obj << -/D [308 0 R /XYZ 56.693 526.955 null] ->> endobj -313 0 obj << -/D [308 0 R /XYZ 56.693 529.844 null] ->> endobj -130 0 obj << -/D [308 0 R /XYZ 56.693 400.582 null] ->> endobj -314 0 obj << -/D [308 0 R /XYZ 56.693 372.63 null] ->> endobj -315 0 obj << -/D [308 0 R /XYZ 56.693 366.652 null] ->> endobj -316 0 obj << -/D [308 0 R /XYZ 56.693 369.541 null] ->> endobj -307 0 obj << -/Font << /F50 138 0 R /F51 139 0 R /F52 141 0 R /F90 191 0 R >> -/XObject << /Im1 281 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -318 0 obj -[600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600] -endobj -319 0 obj -[500 500 500 500 500 500 500 500 500 333 333 570 570 570 500 930 722 667 722 722 667 611 778 778 389 500 778 667 944 722 778 611 778 722 556 667 722 722 1000 722 722 667 333 278 333 581 500 333 500 556 444 556 444 333 500 556 278 333 556 278 833 556 500 556 556 444 389 333 556 500 722] -endobj -320 0 obj -[278 278 556 556 556 556 556 556 556 556 556 556 333 333 584 584 584 611 975 722 722 722 722 667 611 778 722 278 556 722 611 833 722 778 667 778 722 667 611 722 667 944 667 667 611 333 278 333 584 556 278 556 611 556 611 556 333 611 611 278 278 556 278 889 611 611 611 611 389 556 333 611 556 778 556 556] -endobj -321 0 obj -[355 556 556 889 667 222 333 333 389 584 278 333 278 278 556 556 556 556 556 556 556 556 556 556 278 278 584 584 584 556 1015 667 667 722 722 667 611 778 722 278 500 667 556 833 722 778 667 778 722 667 611 722 667 944 667 667 611 278 278 278 469 556 222 556 556 500 556 556 278 556 556 222 222 500 222 833 556 556 556 556 333 500 278 556 500 722 500 500] -endobj -322 0 obj -[556 556 167 333 611 278 333 333 0 333 564 0 611 444 333 278 0 0 0 0 0 0 0 0 0 0 0 0 333 180 250 333 408 500 500 833 778 333 333 333 500 564 250 333 250 278 500 500 500 500 500 500 500 500 500 500 278 278 564 564 564 444 921 722 667 667 722 611 556 722 722 333 389 722 611 889 722 722 556 722 667 556 611 722 722 944 722 722 611 333 278 333 469 500 333 444 500 444 500 444 333 500 500 278 278 500 278 778 500 500 500 500 333 389 278 500 500 722 500 500 444] -endobj -323 0 obj << -/Length1 1612 -/Length2 12917 -/Length3 0 -/Length 13735 -/Filter /FlateDecode ->> -stream -x??yeT??-??N??$???n?id7????????????]?? 3l? -??$+L?7??a*???y?>  ???y"fC?^??U???$??????&??FKc2??x^?)??lc?1a????LKQ6?[??T?N?T??G*???]-:???????P?{^???eL?s5 -?c?????x(???X???1q????1??X??~?c???a?????????O ??????#?e???????V?~96?j at n??T???}?n:?g6}????d????~?????VD -{u??Qdr"??Y??*??~?jc2D?=?6??jb?N?~5 ?&???3??L??a -X?*lY????*???????]??o??x?8x????8????B[?2?v????l??A,?? ???A???D???ci?n5?]?@7?K?'???.??$/???b?????:l??I??WpYW??M???? l\eo?'M?3?sE???????3??6zI?:?b6?,??cI???{?'n???????T ????,??=q??u%#c&ik -????V?%T?M?@:??$??w??'r?=? ?4??/???)???7U?HT?`E? ??e?????`????.-?;??? ~6?5L*?s?O? -O?~l8t_^f?.~??h? *F ??????(???8=???::q???s?t?Zr?[?+ 8??u???8????i(fQfc??n2k?wq?=*?p??9?N??L??[)L?_?$es????2w?w1!?o/??p? -???G????$?}??}?p?oJ?({??????qU??u??i?A?j?{R??I'?=??oy*?k??R;-?~???,r????5gMs?)_'5??`]?9?O?1(????1?d????]D?T?Z??k?3?V?|??"?uZ???4VOt?e??C6lj?D]??#$?????#D?/?P?s?^W?F??;?2l???'?????4??W)!????ZGW?S???l??t&??? -?fB7?59m-??/x"1{HR^b??((?? -t??? -???!???_?Gnb%??????L!zu??+?n?a??d?^'?V??,D??Z??JQ7B73???s(?{???cGX!?r??????t?0?3??4Y???lQ US?R??."?!??q?C?? -??@?f?????? -}E[. yPhM??l?^?+Ls??B/?{???"?eb?d??V??u???????????-?&?Lb???H?[dt???G?j?????s!? ?z5??u_ ??"?X?`D????D?Y?????V~?????O??u??????5f???E?!???%???cT???^#Vt??Y -??f??k??[?8a?v??>??|!w???l????????7!????&?7Xj?J?jPOa{ pp???j?r????f&?]??S?zmH???.G?????c(??v?|!?2???F?S?_??o? -C??f?X??B?(? w??;?-??????!??????uKY??l?? ?M?????????P%n???G??St?????=?&??????Z?Z&r??l5??z!??????9?q??????}??e??\?P??!$?7 +??@#?7iq??F?g???.?y?N???X1zori?Ou?Y,A(?D?6E ??}c???Q:O?R?"??lp?????>??Cn u??A?v?]??????5?l??6&??r?~;?J???{R?Q?* -?w?!/d%d???k9??a?4?l??r???????p2F?????H5?7?-??|???6???T??[?????j|?o??& ( iGw,ew=?]??Y?sc?y>A???`$?? -!R?i?????ng??Qi??????slK3?l?m??y??g0I?`??_???+??P?7?b??#??b?pU????Jr?? -AS!??i3?????Iz=Ut?SL'????,?k??}?vJ?????jW??b?????k?A??)$.???X?T#??39?????g??J?G?Em{????o?????\??Vm?????:? -??? L/?_G????CS+????)?I:?J>??I9-??$?Y?m??d?W???#?D???3?3?:i?!???R??@@D?????v??x!Qd??Y~???6$t ?????-0?????;????E???HE??o[Q?????????f????????????T??J????y?K`qB?X?K(?????+???#`?z?/?? h???????J?S???3?K??!?????????(}G?=????m^ou????P?? ???/?|?>lO???l?????y?6%??G?UG?@?z?$??z?`PP|10pw@???,???????????K???? \$ ?:??[?m??]???-?<{'x???? ??GL???8??F??z??y?F(? -k)???????C ???$?p|?i??h - at -?dq?C??d`????/)S0?SEg??9F? s=??1???y?g?=???wOm -?r? ?v???)6*?YF?k?\E???????b>???????}??)??/?/??L"??h,,???Z??$????x9?? -?\k???W8??L?????0m???"b???P???A1?R?? ~?td?He3y?R?????????f??????????eY?cm?b? -=?x6?o??z42/????d$?Na?cd?N ?q??_?????PR??????~0??8?FN?=0D?-g]z?????????*?H?"w?\??5e8rw??j????al?o%?c?2)7?wZ8h$-??L?Bh?k????Mu?V??????0?2?v?5??u???q???t??~??hZ??S?O??_?zj?? -! ???k8U#Wg? -?i?5?F27R??,#??? &>??? -??Z/?A?x???G8?30?S:????6Q@?*L??Fc???yh?N?????!?aUK?q??E-???icC??_?}?????F??I})f???6 -??#??F????? ?N?g:???j{?4 ??Z??N?g???'????BA??"????~a<??@?_! -?O?'???L?tu^x9???v??????{?c%???~??1!?^5}?.??W???;????????u??`r???k??U??jZ????e???? -??????A????MW??????T`?_7???????E8?f-1???WU?0 ?E??67a??m?p)'?n???:????p??*?L??5A?q#b|Jf?w?? M???wm7????????f????s?????Q/?d??????S??Q????Y?|?9?"8/?7??8/?sD? K?bQ?51?Q C????5`Qa?K??0??. ?)J??bI??0 ??N?4B?\]??D???t??? -i?h ceC#?6??>?>J?3? ???B?0??GT?*:???R6O????? ?r=???????d??!Uk ????)?s???AV*9V?(y?? ??S???|??U?????????s????W???$?@????????Y??}?? -1R?K4K?I"P????k?#nDM?~-}?3????b??T?FPo?arV??*???????Y?t?%['?}?T0?[D???L?W?P??y???? -??W?d?;%:?????>??K?T???iW?@"3?_?(???*S8C?_?svR??????????-o??????6?=X?????(?O???3Ll?????6???rT?????k??D?k?nP#T??*$?v???Z??]????y???Yj?e?`?b?>??';ph?:??_??1B??'???8n?"?????l?t??g*2???x7?E5????T??X?U????Z??Wl????2?????hG??e?~q?$????#?}??~?K???h?????????s>??? -?ik?wwm~%?)%?;Q???o'?;??Q?????? ":???\ -?<??h$^GE?l?s?,??M???F???)~T??????U?R???)?????9???kk???&?/9&J?M%c??xE??W0????~ ????-TO?R?tz??????????e)(?-4N'????a????????p?:?-?`?K!??P ????+??????G?L`?\?????d???h8n"????y??? ?n????l????*??1??=K_?????T??Y??????=???K???)???gw ??A????8 b?K????H????t?+O?Gm?f)uu????????mA??????;?^????K"?5.?t?o ?????G?v=GpF?)?_??D???>m)??6?/a??.?????>??`Wh9V????N??y9t??!??E9?{???F????????n?X8?????????zg?]+?g?$?i???D??@?T?Kjj?*????"M3K???????%?->??4'??t?!?w?(??? -?0H?m?????????lj??????? ???mn???}ZF?????Hc?U"#??<>??x2~?@?f????o???j??D?Y??@??i????TS?!??? 7?LQ??`7????QJ+???qJ?:):?tsj???B?^?"21E?????rs??Y#{%?E???d?,C/ $???4 -???zq?@?'??M??i????$P#???+;??3????.??E`?[6?!u???'3N????(?r[??Q?k?|???????z?|[????FS ???(???C??????????w????_????????>:???%/??????l??(?{??'?R>M?!????O,S??2|???????$Kf????Bg??1?=?-b.????!m?Y?G?VK4?Y???????1x"?A?Hf ????? Y7?????!U[???0??<?a??????????;?7? :??? -?E ?I???>?????pV???K??! -???gY?=#T?e?f?@?[????;?? Z??v>???x?Z? ?O???O??  -$?'n?c???????s?s?R?~5?C??F{??HN???h&Y???????"I?-NE?4?Zyer??q???n?tZ2?;]?????? ?z#?x?pl?L???_???P???????_ ????????{@? ?D??O?????}?d?S????>O;?S? ??-2??)?pOM??K??;????3????"??T?u?X1??????? -;??U?BP)?6g&?vI??=}?>iK?b^!`?????????????|??V?B????lY7?CWW????+_-??p?????????? -?%????=????! ?{?a?L ?????_?N??z??????6?}:??4?P?'[u???C?R?m?U?^y?????????6?A??|*?=????Sj????5)V?Au??4?y -???$???L?K??FH??????_c??Q???p???????A??#?q??????? -?'qME2?~%?? &|;Q1X?C]???a?#[L?/l}~#????M?i??U?? "r?V?S???p?CFw?.???(^[/???5 -?jk? -??-NJ?5~Yg?8????9 7??=????#F?????I=6g?EO5?G???N?/??gF??"?YX?`?e??]?k??1??:????Vz??~???4?????|J??V???9RdU~??&????M9??0???$? M_??1 ????D?i???)i??KE??J?g.E;-k??XTP???????????6%Nv??l?e?Nl^dc:3? ??G??Y?Z|:?%??4#pC?0~??V?7?'?QD??}1?u?2???r?"3?7?3?????l?#n????{Q?U???2????????????h? -? ?????w#?Z4%????ZG????u?a???????d?2?R??j?:.???BcE??/??????D&?F???????x?%C??Z` k????6 4??F?e?50?????W??w????G???????`??8???????x??+?????4??LT?????????\?V?[??r2??6J?????Foke???@?????, ?7?????l{_?K7?|??????#F??'+??v??7??Sn n???T^?O???b`1?o????A???J???\???????jA???R??B1?wO?:? ?^???r?m????C?c?w??(??]+?+ ??pk??^u??S#???35???g]{Ue??:ix?+k???B?&V???? -?VF[??IR???%???T?Of?'?i??? ?X ???)???LG???A??6?F"g6????3???C???w??&?"Xm*?s?;?wp\????^"e??,^?W??xh???/8_??t???????e?UP???b?f???????>??g??4E%n???9?mTNcB?????-c I??#][B???k?????????????g?????y;1????0???B????^v?"?R&?i???z??}????D*?7????{???8??!?????|?G?q???U?-?b.d?(? ???/??u?#??p&???? ??-K?[?@Z?x??U????tI???y??e?&??'U? -#???????9.?8?X?sh?Le???L??#?Q???&q[U?}e3?'P??????.??K ?hv????????|?Z"?y&??D?w?G??_??}e]?y'???z????^cQ? f?fP+?)ji??do????<`N*"? ?????.??b?4??+r????1? i[?v???G?_[?:?Z5f?$???M?L??????%,?cW???%??8????b?i?????^?9{?b?]v???@??.??11???W?$?M??2nM?YR?}U???o]?\?9??? !?h?????I? o?? B??????\?O{S?yWd? ?n????q??/??,?W??U????Ep??Oz2?F?????!??A?T???? ??????????8???????l?]b?/?`?!???T??s??N????????f???????f???~5???Z???`?@>z??]???b? -p??D3???|?Vt?t?f??? ?'?3?????????dH}?Ow?L ?? ?? ??L?w?@L?OiD???*4?k? a??sr????Y?x-?n???n???bG??9???x??c???d@??S??~J??r?:???f??%M?IH?Aqy??~l??tE?\$H?N_??e??f?@?????.??.?f#??a??,?z?{k?~?l????(?????B??=?g\????nWX???u?? ???3??????M??i? -?K m5dfB1/:?y??d}U^m??????~~??8U????6?'?6??????44L?d??0i?????M?y?%????????9C???a???lm?U$??hw?6??]zL?Fexv?Id??S(?????mx???cAw??????Mu?p???"?w?N?{1???N??-m]b-m?D??nl ~??=?%??k;??Mm???*6.R?*z???+????+??i?Fg2-?5D?????????-zN_??: -J??_y?-??EC?E7???T???????????d?q????hW~?'>>X?_??Q???{2????@{`?=???0b ????(+??????J??????,??,??? -?9gQ?Z?:eIGt???>??[s????0i?3?????|???????#??6 ?/?c.?K??8? -?v8????W??7QpuQ??8??_?P?e??????>???Vu7w?(m?cO??9?8??:?4 ?@?????[%?u??6`i -]?#e?O??d???:yP??BC?_?bi??T??S?XL?????N????&???'?H?????@??????"??C??????l??5????|???PcE??e???????????h?i??wM??????OO=??SN??5?[[?J??q?-?? ????B????z??2?X???????4?3?I?&? ? ?k?P0??????u?I????y?m???.vS???^?W,l?b5Rp???|?c??5?1?h?????8???ha?? -C?q?p???? -??i?/7????X?Tu?Y????????V|?????}????G=??#?J?Ly{R=????6?W??V???? -mn?n??0;8;??;?ts????Cn???M?]v -??e?i?ut?'??'I??w?TT?Dh?d?Il?k????W%- -endstream -endobj -324 0 obj << -/Type /FontDescriptor -/FontName /TZLUSU+NimbusMonL-Regu -/Flags 4 -/FontBBox [-12 -237 650 811] -/Ascent 625 -/CapHeight 557 -/Descent -147 -/ItalicAngle 0 -/StemV 41 -/XHeight 426 -/CharSet (/A/B/C/D/E/F/G/H/I/J/M/O/P/S/T/a/b/braceleft/braceright/bracketleft/bracketright/c/comma/d/e/f/g/h/i/j/k/l/m/n/o/one/p/parenleft/parenright/r/s/semicolon/t/two/u/underscore/v/w/y) -/FontFile 323 0 R ->> endobj -325 0 obj << -/Length1 1608 -/Length2 10163 -/Length3 0 -/Length 10992 -/Filter /FlateDecode ->> -stream -x??veT???5?wk??C??\?C????;?? ??;$???????????u??5s?Z????kW?????RE?E? b????X8X?J [gGuc??8?? ?f?A???p;? `Ic'?@ h??89???(4 ?????? @????????O?_!?????tY??o.@??-???????,?s? - ???#?$??Q???@c???? -??2?? s????)l??4G?7,1G?1??h -z?t5???b?lA??o??#??????'6?q6??????7!;?[???? -L???h??s?eU???O'Kc??r;?????[???????????y??A`G?????\&@???????-????o?? ???0??f6 at G?7?7?????:??zc;;??oC???/ 'G??9+ -?[NS??? 0 -?_?"6?8??a7s??O? ?????53 o$?? `7???M ???@??S???'??A????y?o???F?m?????????66J??o?????8?1?_??-??????@-???O rN?om[?I????#?Q? -4S9?Z??m?z??]lt???oZ??F ???4,A????????? 6?W?o????MBM???4????G??????f?F???P?????/ qq?+????? ??????l?\~n~??!??@?<+;9?\zoE?s?]???y2?)?)???9Qw2?????r?:;8?)??????????t??,?BL?R??:Ud?K?u?s????h???????I Y?/??T?Z;*???6s`??%?????oC?; x?M?E?????L??????fX??z??q:?? -????y{}XU??? ?l?????????%???????iru4^+f-ve??!m??? -]?@_o??s??-??hdAc???'?/W5??_Y~ -d??P?v?#??WP??S?m????Y??s?????????%???%?2p???l`?l??U'*??~,2ak???L?M??0??VKC?? ?-y+jf?2k????:?M???m????E???J??l???S????C?????E1??b?5.???!?a lbvm?6?23????z-?l]??6?'??>?wj )???Vi-"??Q???D`L0?????V-#K}???vq?$?\??1i???[?9?}0????k?}:pr??hD??P?A??#?r[?v???,? ?M?Q?;EoJH???I??R^pr?H?^????&? -oso?L???\???c; -4?V???o ]?A??|???? -?9?j?[??^(???U? ??[???lYo?q????>? ???6?????K?,???,?? -?B???c??{??????? -?=?hV??????#R????%?@*?&M,?9*?0G? m????s_??IA??????G[??k?x?M??_????U??i=?@'????AGB?o?G?f`??f???J??d??9?wlAR_H&?9???x>?????!??g;?8??IU?O?m????n?e???/WE?yG ????=<.??[????r???)?s??qls,)E??FBR?KE#Xy???"N?(??m??X_??????A24??m.iR?????#?????[?4<^??$Q????x;?fg?_ha[(??k????1???????*?3v?UT?U?U?t??7i? ?8r????}IJU???1$X -P?[?? -Z??4E?j? ?Y? -E????A!_-D???/rC??H?B?]????g[6?y?M?*?S`?,;???! ?&????Z????l??h??1"?sj?uI??^?X? -<$&?&|x???????| Z?f?2??b?x?!?8??????_2???????????H??? ???'??Hm???+??cy??M?F6??????p|??????T?a????;?Q?z???????B???37?J?K?????>??O??\??EFU#?i????????????w???_?6N???u -spP???(??T?*?&??_%???/??J??????}6???????(?UC???dX*'Q?,??s???n? ?J?????>???????????u*?a??B???_?e,. ??a?P`??N??B??HS?e??K?PE?{?????????[y?i0m.?????b&?#??????]Y? -?j????? j?????????n{x?D???y5?F????Z+?;??&??\}Y?{52?*??6'?$??y?}????}?????2?+?F+?4??&8????|?p-? ?(?r????????????C??;?4??y??????????A{uN;???2????k???????].?wy??`???2?c!??s?5Vb? -? ??1???????xW?sh????w?)?E??K?wtZ?????) -y)????x??0_????/?*??z]iE?c????B?????Es?.??T??A?]=3ACw??6=?EX???i?XW??|h???va%?,????sL?????n? -???&,6????b??? -c?&3????J??A? FR?b?1z?? ???`?U?^td=?i?[??g?#r8?@-??, ??~?g?v_?/"??!????R8?? ?Q$?9?=~??\Y2?VW??????w2? 1?+??:?,??y??#\???8???????????????yS?Q?eEF"?m???NE?.?V3b??eJB -???I??????.l?^=?H???????J5?E??y? ????? ~^I?Gw?? ??? ?V(,??v.b]?????????g??%@????:?]??~???J???y??o`??C?"?|??SS]???zM??????;g[?x?f???&??8??????g????`K???L??;??$QY?qM??L ?/(e???H???|TH???P?r????K?[???%q?Au8???cj??V` ?eg?#?0??+e????"&X??DT^????(T -e?g?????v??*e??4J[??-??TL ??80f?|.???Z -|?*Qw?1c?? ?~?7~?z}??????? ??Ps?%?N??d?i??WE??AE(g??W>2a???w??=O?[?l?}kU????L??S3;??? -{??MRX?2?????}w6?????^?j?m1?'?4?????LWS#???d????:F`?qi????\?Y?#?Qd?43???T????l?????gp?????!]~?Y`?_??&eA????4???.???6????k? ?X????:???wby???Q?;???5z$C??i???????L?P??J?h?:0?V?3???W?{h? ?c??????????O??????I???'?3?E_j/?n?L:?jul?`?v?f????????D???D&????v??R??a?y0????-?o -? 34Q?Rg}l2?M?g~?9??????o???qf????/??Sv?{???h?w??P??|??????y!{??X^(???Sj?k????w?4???e?T???N??+?????i>?5???Z(} ??)En?[ ?>J??*m'?aJ@????N??!m??mMS?=}6?T?~?Q"?????J???#/nC? -???zh???qwZ?.???????AvF??J?.?|DP`n????q???}???\$?k7?b4B?*?YSY?????"???,?z -#??9??wh?P?w?????:9???l??w2Z?c ???*7?F##??6?D?~??e$????c^v?d??P<]?+??iu? -?.?q  ??.??[?\?{F?3g????J+??J?????g?k?3?sh????????? ?????/??????Hlu???P8????x,?@Q?z???L???`[~ 9R?j[J?"?e???e6/ ???uv??q??~DiJ??V??.?h4??????$??y -?5?r??9C???^?U?g?lu?.,?*???~??Q???c????R?F???J??\?L??Lx??t??cYb?>?J?`:?????"?:?V_[f3?? ???G????d??k0??[????t|???X?V??\MG?z)? ?($l??Q,?_??/??3??C ??e?;?$?f?nN???*?/???zq-9 '?DO?B$?T?x?/1?????{0?#?p????????$N!m??s?0*$???W????,?0wYg??MS??)?<4?&??wHH?=k?nx?f?5U??NUp?A??r??y?2??????t???-I'O??3?V -?????????n??S.????BG%???z?_?@?i??x'f?^ ?:?i??k?p??????P?)nO????x?H?? ZT?`v?>#?=????f? ~P%?e????[x??A -)?Oq??f????;z??lJ????j???f'[9?S?????Hx??=??wBA???~S=?!?'???%?A??w?l??f?~? -??T??a???0?pO8????+<??m???\?.???d68??-???A5Q?[~H=?=^??l?-??$?1+?????H?hq????????N_` B??`?5s?? ?5!?????"m2????K?N~Ys??#Z?BM?w~[S0R?????U&V?3???z$?l????7~?kD?+y???????0Q?(F???`y?????4???Ogx?@??V???s??8?f??D?eUy???k? l??g?[gZ???r?'?PD??????_*?u?PEN:y??????V???e????Z?(nXI??f -??g~??d[P4??+??qmQ?^.n?uK?Z?fa?}??j???6m?????????????F????S]??&o?t???hg?l*?=????k?=??8??S?~d ?qt?)?c???????(Nj???,0H2I??}+wX??????H?k<1??_?+?Z???>o<$*???????? f??#?????@/?:?~?|tC? ??5????}V??+??i??G??c???C?Z?|???^?u???r?6?'N ?Q?h?%???C? ???}BU{7?r,?W;???k??iy(?g?a??"'L?9?? ;bO??H?V7?H??]??5?j? (}??????"?3?K?b????>D???? -I ?????S??8Q[F5#?K6???j?????????-z?6???1?f"??:c??}m~??? C?:~"???;??? -X?l?c?r?Xx???.6?K???p?dck3???,??^?Z{2?V???4???[q?$?\1+8? -???Z?l\cU?Y??d%k?*y?`?9^bp$X???x 0~P????'K??.v??(?G?? -??????m?j??\'???%)??O???????(w0??????VF?E?????u.W?P?Y?JV???????$r???T_?f?vIQ$*???? ????? -???r???Gv???!6=R6??? ??*?Nu????R??h. -u?"????C??r????J?kLP? ???S??FN??]0?FB? -e??$????=/???d -?+?? ???FG???UV L??D??>V?????[?W+lK>F -?V??h?9=@01C???j?PG-?L???q??7?x????>?_??????kG?x?6?u??H????????Y??K/q? ??*?-:????Z?=M??O ? 3#??4r???s??Fb???(??Y T?????/?????? -?\?0?]u???>??R??-??M?o?H -??v???N??!????F?7o?????U???????? -?\[[i?u???L?}q?=7d?m???l??u=??6??5>??W??8Z?????u'???????F??X?????A? ? ? ??n''???B?,;?/|?;KL?? ???D??0?????p??4W$? -vN?2?s???l)?-]?R ?2)??? %%H??"f???S?Z??4cK~[$aU??B-?V??|h-G????a?????^??1????"?l???+???`???Fk?F??0?5m?Q????4?DQ?r???@GR??? -????????!??%????????)???u????o?l????:U??(???c?eI|nA?"?????g?oO??Hb??x?K57????[7k???E'? ?????V?e?Oe<^[??r??(????Alv?T3?k??Im??=?C???*???$S???m?[???N????w'?5D??a??? *??R.?`?"?Z D???"? 9.?N -?s?????v?7+\??d}?y/r????G;?????_h??t?????E??%????;???=FM,??Dd?7?"????Q%?2h??P -?? u?C?jM???}?r? ???????O??Z?{?>??U1=1???!?M??5(??rx?L4???+??C???p?ix^??u:????4&?`?????v??`6FA?Hq???K~???????????cH?\?1Q???c?1nX?vt??1t??????????4????p????Ih;?u_??a?$G?+????????Ua??g?>?????p??h6{???}$?SZ?A??V?N??~??:?d",y???????????`xR??y?>(???k???Z6?%>Q??Q|Y?0? W{d??!9h?@???M?i??E'?w???????y?C?]???o1??Y ??d?r*?UA????????[\?????????S?\?sk9?????z?<^ ?????L????B???j_?uHWJXS?_?M?&??!??q?!?A???|???o?t?X???v????????????????+?~?"|,?MV?i*?H?@?Ze?O?Dgm??W?{?v??_b;?r#g1??Ac(?,?:y??,?J??? /n???4?x>???Lh?8??+?=4_3 -???Czo?u??;?"?V???????-?n????!?TMe3?P?98?tH?O+??0? r???$?&k?????y?+M????A???W?8 ?a???p%?|??.?7a?Yc??? "?W????? -?,[m]???G?W)?'???????pX"????+???h??jB????`Kj?S??0] ??????-????H?(~??@ l?L??K?g???I???? -W????6|?m|??\?y?]/9?????7U7)???/????~#3vhT??@?l(U*?w;??X??Ki??S?9iG}?q^???S?Vj?W" -[?S?j at 3Vy?>?M?1?T7??uU?????I?/?4??9??v???~?C3Z_?????(OE??|?|????=fA%???K}n????Wj?Q???^???4R?????(???-9e,????0??? -????B????SR??z -?6?n???s????y??Y???(?Y?t?h> endobj -327 0 obj << -/Length1 1166 -/Length2 6977 -/Length3 0 -/Length 7752 -/Filter /FlateDecode ->> -stream -x?uWe\U???AZJ? -Hw?tJI7(?????aS???%??t?H?4R?F?)?zx?;??{?}??a?9??c?1?,Z -mi+?P -q???????-\???!?Z@?#(`????r??~$da at sg"g????????a^n?(?????????@(L??C=@g ??0=??]?g? ?????????X?,?@??c?;?# ??s?f? ?ssrs????Z?>?v?;\???2R??V?b????????>????p? - <:?1????3?K??t??0?o???| ??D??Q??Fr??? `???,???uY?[??[???5?/??j??????YC? ?C??????_`??F#M??Z??%%?P?????????ig???????aQ?F??Q??CO???????p?4?;4?: ?>?1? -?J???s????4a:??*?????>?PmB??I? ?L p?6?y??~???.???o'"????? -!???".+?f/?j{L??????]????s?|??\P???????AIqF?+S??w?p??ER?[ g??lk_? -3???waB??)??t1?<0???0??* -b?b???\???~h????S3?[?G?#/?()?N?E^??k/????N/??r????s???+I???+$?|???I ?a=X?~????_%?3?U?\ ???(??(?HWVG?c?N????R{a/????????*d?9???D??-K2???????@[K N'???????8n???~? -\?tw#3??Pir?????ow^U??????0???%~m??H?t????U?????~?M6?M?3???m?5?Z?y]??H?_?v?|??>:!?|J????=??A=y????;?k.??c?2??:~?m????~?Q5k??)???!xMy??Ee?G'?#??E??H??F??g?????|3?U??E??x???6kx?jS4?$6?W[<2? ?_??*?sm? ?H2?? -?Imv????W?X6Mh??)?<(?????bG??h???"r??.?Xz?I??T$vT~??ef?/?z???C???nE6-??4~?0????"zN?\_x0i?z?f?$??]?'4?Cy?w??R?,p.?????k??M??'???Bm?OK?T?4E?Qk?E?????=?-?S?j? ????!?i??q?S%A5?>?i??{?+??7?TN?%??? ?3SR??m2 -???? ??6??~ W~?????4?(sS??>??K??bA?e???=|O%??HK>?==AMyh?!?z?c??? ???g?????x?2??'4???J??[>QIw??d? )??? /???O????!{)M?#?? -?%??????9?'??1??????k????J??<6??j?l|o?u2??Z????>? -?6?2su? -yX???????"??n????v?G(??@?? ?BU????!??!.?X?????[ ?C?u??2:>WS??U??9jzAs?O?Zu??9????N?? -Kh???T?? -??u??? -j??K???&??>n!U?gE?2???? -TK?w6?.?P? `,??? 90?????????O????U?wz??=?:?vd??8??k?"??m?2?m??/? -r???'???e????L???w?O,a?C/???_??}Dlfy?d??4??*?_::,m?Y?]?^a?????0 G?]??E???v:??-6;xI?/zv?vG?O0f?7?\?????dhS-8???^??wY??P????)t????.?L? K?o? +?x????%<$#q??D?( ???????>???@??zy%?f?????Z{?%?2T????Ve??%??9 -(????sT??B0?m??k?wE?????m-? -Q??"z[????2R?j??V????o?????`??1?&??mBK?????7?np??N ?0?"?????w??j???H -? ?????g?Z?y?T?Hm?M??? ???.???????q????I??6???l????V??)?A ?N%02?{c?????`?k52?????V?|W???Y????~???W? -???B????/????2fd?P; -??M???????+??S??Fu??E ? -??.???V#?q=/?????3????4 ??s]T?????n?)/ ???#?|{?e?[pk5??|FC?}T)'??eV?->4??G?2???t? Q?6O;(??rwhR?!??[?2???????< ?N]*???g?lud??d`=??w[_aX????r? ??L|?kD?M?\?nu?z?.? ???a??s?{ayBi?? 3?????<;H?s??Vi???cojco_??6v'???x???9?[V??4?f^?(??MLSq???2???r??h? T??*????I<.?,??9? ?????d? v?u??U)?'?9?Q?b?y?I}???X?????#????Eb??Qr?V,???????`M?tq?&e5???]?T9???)? ?:??????Y???;6?2?L?k&{3??r?/??/1??B7E?A -??k7?@??VA3N% -$????#%/?L??7???to??R~?My`i???a?5????,??????a???-@??O,????? ???V?x???^??CRGX?+??D)1??????d??Q???Y{:r ?V2?T OT??j??????#)8????{7?? -?????"#????Z?A??>J?$???"?Qe????????W????,wJ?9????H?p%?k>?2??????M? ?:6?lS?1?W?f?? -y?|B"??R;3????????aT?F??Y[??m???Q?C-?5?pK???????y??T?X??+??Zb_a??U?\??.}!?o]/:?.?5??&1t?oq`?0??v???8???6$?@?`?S? R??:lXf?;?o???u???.p-?|?????mqtSk4+Y????:/B???????=??????4?\=h#?h?@0??G?????/??~?=??\R?[?.??Hw??xU??2?U0??JhI??L???????VMm.?-:v??{??????+????N???l?.?S??????O?1??????ex? -??w"i???O?T??>???NF??rR?!?>??|!!??}?"?,S?U=n1~?JV????????Y???s?5?t????k??PQ?????S>qo1?Y???c???C?O]C?VV ?k??;???7?9xz???(P*g???`??j????`.????}?#$?yg????0?l?~b at VsePY?.?Q 6f???u???3}?h -? ??3o?$p*??S?)????g#a?)H??a?^?YG7vP]?h>?m??????;??*?un?2IFG?e!&?HU??????\?G\?E`??y?D?'O?.?????c??N?e???^???i?1??t?z?#'!?3{q??????)?9?2B????i?+?????b??G2?a????F32hra?iOy?<)a???Leh??Z?E?7?E??&??O?]1u:?eL?M?H??Z-?:?~?"N???????]qf}???XjY ??P?d???AV?b]???x?E?@?C????4?.???*eKaTaRhw?????n? -?3??S????]EJuxF??A??T????r?O}?x?????a(Aiy?????y???b??)T??^?T?1?"y??????_???i$?w??~4A??z???S???~????MB?o?1 -??!?z; -+? -?}n????? ???~??G\?C? ?????o?J  ?\????&J?????`on??7???~9?'?x???b?q?Md?Wd~?6.??8~O?7<=1???R??????M?]6????(EQ18?;??LG????!???3???DTF=??c???5???e??>?U??T???[ ??O????? kL??13 -M???m? -?]ZYm??l??????t{?\t????^Dsj4 ?\???ei?????iA?&?X?H???Z?)??n -???I??~?w3?lbK???1?????A???$f?Q7p^??d???G6u(?R??]? -O? ???,??DQ3?2eb???,?~?????L`;??,????? 2??>v?Q??^? -??.z??30?]??????h???\?K?G????${???q'??O???VjU?b????a?1??????tt??1?A???`lB?_???e2,?*tn??E&??8?????>1x?q???wv-???L?s??U????F???V??Tk7?X?Gm?q?">i? >??[?|b?l=??,rqq??h8??g?7y?? R???4Y???H???RU:6??R??>???w|>?Ja??????F?????+?%?^8???b??Z?Twx???pJOnQ?^???Z??]A????/??O??#??w??????:o?'???????cY`5????{r???gy?l??)?=?z??<&?G???)G???T?u??.1?vN?5h??C? N??)~l?\???nx?CpL?5z???Mj?VD??,???C? -????k?&J?? -?;~???%? -endstream -endobj -328 0 obj << -/Type /FontDescriptor -/FontName /ZMBSGR+NimbusSanL-Regu -/Flags 4 -/FontBBox [-174 -285 1001 953] -/Ascent 712 -/CapHeight 712 -/Descent -213 -/ItalicAngle 0 -/StemV 85 -/XHeight 523 -/CharSet (/A/B/C/D/F/H/I/M/N/P/S/T/a/b/c/comma/d/e/f/five/four/g/h/hyphen/i/j/k/l/m/n/o/one/p/parenleft/parenright/period/quotedbl/r/s/six/slash/t/three/two/u/v/w/x/y) -/FontFile 327 0 R ->> endobj -329 0 obj << -/Length1 1626 -/Length2 7736 -/Length3 0 -/Length 8565 -/Filter /FlateDecode ->> -stream -x??TeX????ST:?tw?tw??????????.i)??n? )Q?;?;A???3?73f?????g?????? ??,?C??????o??r????(??2?j??,????'P?q ?:?Gn???*???o))?;????_?????x? ?s??%?q???jw????????~?:?? -F????6?psG???????m????(????????vrYb?MC,E?mS?S?5???2F??\?!??z???J??????s?D?@?()??"M??????N(M?NQ ???Q?????v_G???~????????AU???if ????E`{?R?????S??/?sA@??/???+????????]Da??B?(?i??'C?,?? -?D1N_F?6?????1???d ???{2?,Y ? ???I\???3}2xW?j!L}??^?? -A???????~???hf????%?cd?Y??????H /L???u7??\??Q? -?2????3,D???df??????d??m??3????????uwKile?TI?y???????oL??M??d?oc????I???iF?????C??2????6t|??? -???s?o;?z?a???wLP?????oi???$TwR]7-?:?"Io??W\Oe?@??E??^=l#?f?[??{Z>?w?IO???}s5y????v?9? -^?[??l?b/D????N?"e????oB??x?#??g>??~?c??Er/6Z?=?_??yN? -???N????????5p[3???97?]?yM`??4??:?s? -??[???I??h|???T vg<Ug?g@?????=?[?B??!'s?I????@>3??? X? -*??X?~c?VB????E????D?,us???Rl??L;v?rz? ~+??J??q?{UZ?{_|_??????f???n?b????]?8?????i????Rv??n??5??????U.+b??I?????!?H?}?????u?????s?TN????Z???,?7B??v????I?$?B?H?UP??5j?C??j/????r?S?5Gb -?W~?Ua??B?j?\????H:j-\ah?&????mZE??C???FmR?H?Xe?d?????mM?'? ?l?G??&,??/?????>?j?4???E(V?|l.??(x\???'#?qY???[/;J???D?8:?[????f???oh*????????Q?]}?? -|0?n???????l ?Kx??YpBX??Z7??V?x=?W.;???#?? ?=?Ayy????;??+?????6???0?w???wzD?????>OU,?3????????G?r??EU%w?q??&n?n??I ??I -Ao(?b,???[????&????_??&?-?@?5?????%?*??tf???-?P0??s|!kl?F:??+?n?0+??_?cn?T?W2w+??????O??>NT8???K???'??1?;??fui???e??N????u????FHW?*??\A`??&Rhk??P?)~2?2Z??Q|E[???-??????=[]#:???0# -?"{??dSq????H???????G?*?? ??z+??x.??'6?3%????]?????Z????[???????"??}%{?J~fV??r???/1?b?q???2!"??MwS???*>K??h0??F???3e???f?? 7?y&??i#??? ??7??;?H??Qk -?????t??????6< d?m??m?#8????N?????E??idw?9?0cpxv???a???B????????4????3)?"?%4{ -?E?2?;?|????@q6???@???r at A)0 -???H?k?[?UV T??f??_?;l??Z?u????M??Kxns<5G??Q??l?77?g?Z+x\?B??I?^?}r??o? -?$??6>??b6?.??D>Sp??a? -r?[??T -?!]??q??4??{??zlk?CWo??>?:%??W????`?????A-??0.????t?????z '?uu???U?)?I?$??j ?JW ?????nk??s???+?|(n?n??k??????N????7?L?It)Q?j???+)?? ?(??* ?}4???? ????? ??pk??Y?#??Es?'?????o?>?k??????B@??-????0E"ZO?G&???z?.[??W#??+????Y????V????I9B??2??Fm??,2C???? ?eqh????ZE?F1?????.?~?3:;?*? ??<1-2X[???u???1?)???G.?H????M?R????n&? ???'#?? ?????>????B??.??oM???(0??,???yM???<,??E?f?^???Z4??21w@??s????@??o??R????p80*(T?|?+0 $?6+fb~??&??e?XBv?D?s?Q1Jd?xL???K???B??????jm???8?????e?\?R??a|????xbC%t? ???bN??L???U?KJ&? ?_ -8?1???????rQ?j2????j????a|ES!??R?6Ti?HD???*?[??Y??:^kF?????Lc????|?????=?i-?Q??Z?)b??2?????V'u%??????L, -?'=?Kf[???v??OuDV?q????????(??O??g???A??/??S\L?|*?n?cg????????;X?2-? ??&???~?D?o?9?:???|?????@?md?.????#?R72??4u?A?!? ????eBI?"[??????XO?N???N?Np?P[M?TJE?k???g/??e?Bz??O? ?9C?????????a)??b`??q??e??F????y???&&\????>2]?}xt?<#?Cd?Z??}?z?? ?^T???I??`$m??%^????zG?X?T?)?????-??}^?V?1Q???NS?y?>? ???1???.O?Ex?Ws? +?a[L!?;"?t???@?c7?Z??A?.???9h?7??? -??????&??v??g?|??n?? C???R\Y ??j:?H???kxDa? -w?0?9G?ah??zL,???6f}U/???J??S?k&L?C?W?zi???`????#/??Qr??M???????I??????,???Y??h ?X??Q?*???"i??? -!????z9?=?ZI???x????&??a??O??2???|J????????N???P??$?`57?A.??A?$ z??*???1|?????}?]?{N???#?5?Yx?El??3????!????qI??kI: *;?f5H?0?P:????n??0??????/?$??S??8???#?!W?D??5?f??????G?]???]???#?.?o -,V?&O?#D???q??>'I?R??5;e?rd;C?}y???G??9i?:[?{??7 ???KB???L??e?????????/ -??DU??IR?)B? -~????it?7?HN?-?C?9j_Q???<=jx??x??!I? -??0]???+f????6??-????{??3??D7?F????Y???? ????1wU???$}??c?o6[c?H?{Y??k?~2?X?.????z???/i???%?LX? K??1)?Z?miq?????H@?",???R?}b?X?v-?zs?Z???}??X?WJ?:?fmA?Lp~?? <?^GXjy??[!?$????UY&dzND -?PO???qm?><?????%\45?To??y?k???{?????O??qo??u52???'Ns?a?{????N?)?9??u?c??8??$??g??_?? -?^h/!f??s??????^X%?A?+??P?j????XS????#?AH???b??b??p??W??7[Z?nZ?'?d? -+???????`O,?3O?F|???~U??En?b -???%????6!Y?????D????>????????=??O?q5?WK??>'??d??g?>?ed0I?[/????oV????E???y??@/?{9eZY.u?vG??zd8?@???????????Y?% -??5?J? -q?J???????? - ???????3??????v?-??<:?? )?????>?ec_St?? ??'?Mx????#?u[C???g????[2? yH?@?y?r?N4??????FY?9X???e?????G??#?i?e6?M???>?^???NN6?[O$"???0pn?????@??G????|(,xv???8P???lv -|?? -?'?0F:??????IO??????Z??????Q?@??:?G5v+??$}?,??4y?BqmR??? ?FL????`???{??*????T~U???4????3s??9~??????|~?9????????ats??.Bu??@??#p??L??Wv??an ??2???????J?!6?Tl???q???? ? ??O?;?????i??????~?s???_?S?????}??W?/????T?]???UW^Wt~?=???$??fIz~??5Q?ki,G????Ep]????#??c??^B?????M?{P???M??'???-??2>,\?????????+?xr?'??C???S?&?$?????UX??|: -V???u???.??6?? -?aj?!!8??????Q1?u??.,????O?DF?c?7_??D?_??~ -?*8??"g?>',s???o -?hw|???d`?L=3??vY?i?Dd{I?~? ??4?T+D??&??t1?k?L???;%N?t??????d F2V?Q??iw|r[d q?,?_????T?-???=?Z????U?>?K??k3?(IO)S??E6????)?$b63E? ????)?G??^???u???l?N??5???C???????{??a???X??]{?`?V."??v?)??om?'?l?????} -?T???u?;5??!? -l???N??*???z#??Q?;?r?X1N:??E19 ???????+eg^f?M?/Q -r??/?,???c??? ????U Wt?j[> endobj -331 0 obj << -/Length1 1630 -/Length2 15197 -/Length3 0 -/Length 16037 -/Filter /FlateDecode ->> -stream -x???ct???&??X+?m???b?6+?mWP?SA?????|????O??u??>????5q?{.rb%Uza3????+=3@?????E??N??[?^h???g?#'u?Z9???y?@3????`????#?:8z9[YX???U4?ii??S?? ????,#]?,??????v@{??????@ ??0??D???$T? -?I?=?????fbke -??2?????? S{3?Zsa??%?0?8M???=M??????@g;+???+????????:??Mm???)?????_9:;????k? ?????b?l?? -??UIL??u?Z????????`??????????e? ???jle?pz????0?rq?5????/??????ps????? -??@ cg3[???_????L????/?;:?z?+??_^??+W??93?????s[X??1??+???f???????t????????E?9??z???p? -?S???Xf??#???????[??#??r????\z.????oA?,l~????b?OY????????o&?u??~?)??q{S?VG????????O??fS7g??$????????=? 4?[]r0? -????tm?????c s,oV+) -?s? -?????6z?ch?????Z??$I?????o5???%?????&? ???x+????%? ???OT -*!???l??D3) -&.?Lem????l?????H1B -??U)?B?q?]?a?{@j?2s???G???????2Z0????i?6x??`??7=F???%?????Om@???i??T{lt8?P?;?????g/~/??? ??&\?u?k?I???-?sl?t???????????f???@3 -]mJ?[?U??3??S?f?Q.Gy?(G??+?K?[+iFZ?5 ?T*?+V?n?b^a?????????????H?UD ???^ E ?N??D???2?? -?L?04oOY -??@a?????1I????E?????????? -?m7V??6a?B???V?B????kw??P?^?t\A??T.L???P?(?v?2%\gA??Zi>?/?@F?????~???????lC+` v~???zKz dS???A??l?2??x??/WC? ???=>?'??[I3l??X/?????????A?D?t??\????r?C???ZC" -??4u??vI???Tur-?:3'o???????W???V?)Pj?>V ???3?&?,p??(k|?????vZv?? ?UcN?o??F???b?{?|??B???P???\I???c??d???s??C??%K ?*{??+? ??Q?p?<? ?????Q????;??v?i?w???-y?? a???U??,?J5V????'???{?? ???_?3`yI??????$???a?^??F??z3A?*[???Rit?r?m= Q??gOT3TG+?Q??8?%Ju?N?Wj-[???)?2???,b?6?i?? F?s??c-|??_?t????+5X -d??????????F?S=p??_6?Am?TCG???mM??t???Z???l??BP?3:7??;*Y6Hj+??MI??????????/?2???l???^Q??c(?2 ?N??2E?-?B??z.A7?qHt??? -C?'???Q?+?J????b???! -???QSk? ;??6c?#??-?xj??????????????ryU?????O*?U?(8U3????'????[PNK?Lk???C????/?i? n\^????????_.??????+M???S}/?$??AU>/?!#?#???? -???}?(b?>v>RS,?\@??S????zf??y????@I???w??p??{??~r< }???#???L??B ????F?? -?Ef?+??u???????"??? Gx???E???7?????\??f??n?o??D?????A?5!5w??0%0?3???K????? -D$??W!???xz?,???ma???Cpv?: `???.?>?-??,?{?905F??z8\?J????R?+????L????ps at z?Ir????o?qrzV???D:??QM????????EP5?!???WN???? -??j?? ?\ a????7?D6O?c?_?}?1?>???e?2??X??!???9???~d??VW?9?QNL????!?!??????@*Ds??#?Y5???@d?3O??{=|?)???R???(oWv???4?G?8???6??)?8? ??X?z??????r???'???`+?%$?p?K5d?<:A??x ??2??b?gakU,????p??3???-YA?q(H?????$2??h??j:??%?\fN??&?+?;??d J?_D?C=6Wo?? I?\?s?????l??rs???RV?.??B?:????? -?????????`?]%?A????2??l{"???????^????(?????t?? ????%?.9?n?n?"SN?3?3??,??)???? Z0????s(AS?f?6\?'????K?????<?p-k??Y??Hw7,????? $ye??J????~v=?u?~g??p??7?/??9??????? -?;?f -???r???YK??Q??NW???Mi5??i.R??_?Y????9?#R~)? ?V\??8????C?B?x????(?!$???K.??eM ????t?{?M?]\[4????'????H.???{ ?cf??O?S???>???P3m?4?n?D!e??c?^?G??| ????6?5????!m?k$s??,?? -?Lf?(#B?*?Ucv?+s???a?p?&oYr{~>R ?7?R&????A????q????????$??hK?hk????T?Sk*B?[s]]???wD??=|?Y??ogO????????? -?FdU?K&?t?v/???DL/?F?0???????-?[???{?4o??UC?Z???wO?;???Q???????$?)H?"?"???@~ n??v?????M(??+?&?d?V?R?????m ??"???? E???=;}(?hI???X]T??\f?????x^?s?{#??W??B?y$???p8???????h???'X??]?i;?X??N??Qc(?K?DG???L?+???C?k??2???? -??????(??0???m+???o?????B??c??9?Si?E -??r?{)R?(LH3?r?($?'v?U?9????J??)????????h?O?xU????y???????W??f#o}?Qj5J????eK??0?i?M??C,?`?MD?;??&o?Of???B?:?8????y%??Qe????????a( --?%E?U~[~n?u?%?7h\8?n??bk??!?r+BQ?vvw???Y??5q}?? ????'0qj?@Sh7?f????;?q?????i??'L? ?D?xH@?L??;?p?~2|?nAU???TpaN!T?~-gv?Z???-v????,?N????%??!?m?? -Q?\?*}??m??f,??C^.?Uf?e??(;8W????? [??????k??1?U????m?? ????R???1??wH???2O?cR???]M2?wC ?????qa?? {]??m+I+?s5???$??,?nX??>??`I??\?lnZw"Y?:b???:?R?%C?X?&)fn%?_E?U?????y?]e???5??k8RM?Aob??#8 c?WB? X?? ?,? -,w?????9P?{?^:%???????`qe???|]?V#?????zJ??!?]^?~5 I???????????y?-'?,?z???T? ?? ?O?M-???"?9??7?p?Y?n?&k???1?V(?v?6,.d?=????R-??`r?F -?Z??9)??,K-?x at qC???g?M??z?V?0>F??|???Vwr???!i4???????cG\??P?7d???RPbRKx???C:?^?~a???f???????Y=Q???\????????R??n`c?D???1?Iq???????@???d?`??Qv/7?8?M?o????????????Q-l*?2n??ox?Av?^w]???J??U?t?????zz????8??J??p?v7}?s~7>?z??8k???d?ULZW1NvYRo?????????h8d?`P?@??? -??n_??? ^S^?eW?_V?????V??0????j????k?MC'b???i?u???? ????????!?jY=??j???F$A?Y???L?!3?1?m??? ?IcG^?#?C????s E?mH??ii?????Wl????n?K!?v?^?f4l??(??? -?M???Vk?~?G?h?? D5?? ?????A?"??.????Wl?Y?!??? ??? -???_5????_;?v???R??Hk_v??kNj*r?0?- -?)??  -K*??f?|?????????j??>E2y?d?6?b?$??m?h>Jm?} ?>???8"???????????z??!????2?????^&)'???*??x?m???fLS????-v????s -ik??wC?Y?)OP?j3??T???_????xe=? h???=e?by:b,??p?W00"???Bk~-??e|?Sj???&??<? -W?B~?-I -?x'??S??Z???hD7?Q?G????????f3?????4t??ZK???S?ob?T??="???????????mX?Y{??qp?2s?~/?,??????5;[v??g????7?QE????Z??u?Jx?5??{????v>???'k??*??^??*?OR? Z$???=??Y?9??J?K?(fHS;[Y6^<+??c74D0gw?????:d8???[O??d?)a??%??RG?&??Et?r[??r8??&??x?y?????T*zy?N??????s$??9wP[v?l???~yua???9??E?!??+?wo???_0qcf??Z0^?Z??Lr?b??Z??i?J????zL???V??c?Wi?y?zBj?q?h??Jv_=?????J?x?VXOt???6???"? ?Abg?BH??{??H8?r;?XQ?X?{&?8o???$??j'k??t?m??z+D2i???HC+/ ?m???:4?1$v??? ??X|.???D???=?P???+?]4?????4? ?H??Lx]??????y?p?m??f??r???? ???F?:?W??DNk???bU?*??N?P??"?j???Vq?????????82=??h[?O?W??Ra(?I???????/???#*?DRd?iu2aW?S?U??F??H>???L?c? ZC/g? -???( E????[???}2(??N?Q????L???A?|?][?8??5???7?Cu?R?Q?:?3w*?/?MW?p?<>?Q!?u???4F?]?????\^?????f?k0PM?[??`C?%?? ???\?W:f?zE?TF-??s?]????3?[?2d?#a??2n?34??R???{?????7??@?????B]?@??~K??4??b??m?+????.h?????!??7???j?>jo/m???????????????O??c?b[5>>??8E????U?5>?????k4??^1?va&?z????????4cfWN?????t?dJ)?N?d?????D{?sVu.[?d-?f??????TV??^??&?{:pV??5?jIyo???]??????!????+?;????( ?L????,???S?0>B???!?u #?i??LF ????;0z??v????-?d$ /,y?? ??z+?'J??0=????o)?.M??e?Xa?oX????1????6???x?p???SYc?|lA) -X?,?????qy????R+???M,??=???/?;?)?76?E??? -G?? ?|?(?Q_??? -?;? -??54???u?? -Y4r??8v?[??8)?g;????0???B??Z??mE?y??{9????????KEk?W???};(?Z???f(?C?7?????V;GV??????e???F?3!??04V????eh8?q??_-{?z???>?3??Q3???4X??q?!???\??y???&?a?r+rt ?]??@?,???l???@??X??}??i?,%???A?F?hc??,????_0?]7? AaaA6f?-#?}??s????U~H??Y -?Fr??\ -1?r???C??+??????????9???F????x 1 ??q?7?x, -???j+??,?G7hhr???+??7}?,m?|??g????????N?\?W1?q?Z?5"; ?$h?????_??{+?O^=Z??=e[???P?8???Y7???]a??q50?*?ju???QV??[???A??S?,(??k?h?l"?u>??;??Of??k?`Bh???#???N?/????obk?'?8H?H?H~#????=%xe?c??"!?E??F:?????%Eigo~????l ??U?g?~q?1,?= 3???_#?? ??v??`??7O?o~u?????i??"o????O?%?!???eA???e???8=!???K?sP*??(>??? ????i???TB?????T??_~#*?h?x(L*UK??8?????Y???,m??nE?Z?mu??1?&H]s?*???N?H??k5?@UJA??8^W?5r??????C?+???%s??7???Y j????????f?|~???b????s?C?Vl??**?'-&O!y???Oz???PQ8R???l?]Q??4A???,??yp??O??F???kmsL# -?A{?.Iy?Sp???5????B?W_?Y?I?Q?]????sY)???w9???#7?1mvf( -?n -?Uh^B??'?'ld?aC?X-=e?2??Z?8*?/l???}??C????|???56S???q?????p??U}?oC?,?'=?????m???4l???^????Q?NQ????PPF??????-5????6?(=I??Y?U?(%?D@????Er??z ???Cj??R?C>??6??)??D????????'?4?z'?v?9??rn?6??A?[q?? -?6g?S9?b??z??J???????_??!wY ?????P:??????Kq?!?i?j??????w???&$-?????2??zGD???&?????r???wTK?????,Q?j??u????W??X??Q?@??=??????~?NS???????Tq??~???`?2?g??h???????Z??.T???m?C???'????K?X??nu??~?#V???N?N???&n??Sg?4h???O8?????????c?h\?:W?N -L?QZ))?g~???l0e?S??|r?????w????? ??d??D?#aO?O????[????????.??X -L??s#?[??6J-x????]d?@???o????H??`?j????S??? )?DuS??D?Hz?b?T?q?????;?}????{?6?H,?3?wd3(>?-???%f?v,E? -zq -7??F??v}?%?`??[(??n????3'Rzb??F`S?^4? ?\?4?P???$&(?\??q?????;? T??%?c%l0_ EY???w??????Br'&l14\#?GU Ne?????H?"~?D??2??}??T4 -??#?????~E|?6t3 ?G???~??MN????cq???<?+??+S??`???8?=???nf?/?V>?zP?? ?I??k?????????U??????l\0?fFt~?P??Ppug{???`y???8S?J??????f?#??S2J,?????m???lDs?[P?.?)?"'6?????t?????z????Ko?a??m? ?j?|?aA??? -?(?zB1f%V?Y?????????????m??#???????????????*??"?r<?????fx?" ????????S l|o9???&???^??????Q??u??1q?PS??(???[????l.PO?a?c?Sj?N;.w??]?}??Q ??n?`}O6(?xc????,???1)??_ ???????????2??p?fm????#??0?K????b+?) ??h??.???i?w??H%,?D??? T?g?&?`x?S -"f^?F!r?(?????bC0>v?J???Q(?Tw??^ '?HBW??MZ?tT?u?v?O????,?#???@??????`?????????x{r??n?t_????4f?+,b??y#+?????? -?*?hu??m?=??;??.??$?U?L[??[?? ?d?B0h???)m?T?????bM??|????U??*v?X?^p?ri \???p -??? ??x????????&?0?-'^4 ?????&????M??????SW???oxf?8?F??Y?O???[??q??5,w??Z?"!????5(l????b??`???C3?x?(aso;??? -???7o??}hg??z??L??Q?? -???????????#D~W),?W:?r??? ?}?$?='L[?`????????94??h?f?^???????????#xZ??u??A???????r??????y|??C???G]?9G?B?hh??????J at X???? -????V9"??t?N!?}NV+??N?6]?+?f?ud????,gG4s?mI&<{? -C???9N?u??^ 7mO?3?O!?4J?tn??5??j?????^G4D7^???\??~[????`?)?TB?????????&^?e?M5???.?KCw???q?n? m?q -?N???_J?????D????*b??dNtU?[l7B?8%?Mv{MT??o?4????7?q ??{&?????9Ke?`~????d??y????M?n?1ua?a?LuB8???T?????,???W???pW??@?#?Sq??|^J?????????? -bF??I -y?w&?E??????????????v?a??* =S??#V??g???cN??P?O?PK?n'!?|?>5????'??????????It??'?x?3????k???|6??%???h>???o?? 6???"???????????]oH9S?qo????Sq?{I?> endobj -317 0 obj << -/Type /Encoding -/Differences [2/fi/fl 34/quotedbl 39/quoteright/parenleft/parenright 44/comma/hyphen/period/slash/zero/one/two/three/four/five/six/seven/eight/nine 59/semicolon 65/A/B/C/D/E/F/G/H/I/J 77/M/N/O/P 83/S/T 87/W 91/bracketleft 93/bracketright 95/underscore 97/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/braceleft 125/braceright] ->> endobj -191 0 obj << -/Type /Font -/Subtype /Type1 -/BaseFont /TZLUSU+NimbusMonL-Regu -/FontDescriptor 324 0 R -/FirstChar 40 -/LastChar 125 -/Widths 318 0 R -/Encoding 317 0 R ->> endobj -141 0 obj << -/Type /Font -/Subtype /Type1 -/BaseFont /CRAVFF+NimbusSanL-Bold -/FontDescriptor 326 0 R -/FirstChar 46 -/LastChar 121 -/Widths 320 0 R -/Encoding 317 0 R ->> endobj -139 0 obj << -/Type /Font -/Subtype /Type1 -/BaseFont /ZMBSGR+NimbusSanL-Regu -/FontDescriptor 328 0 R -/FirstChar 34 -/LastChar 121 -/Widths 321 0 R -/Encoding 317 0 R ->> endobj -180 0 obj << -/Type /Font -/Subtype /Type1 -/BaseFont /DIXNGO+NimbusRomNo9L-Medi -/FontDescriptor 330 0 R -/FirstChar 49 -/LastChar 119 -/Widths 319 0 R -/Encoding 317 0 R ->> endobj -138 0 obj << -/Type /Font -/Subtype /Type1 -/BaseFont /SIGNJG+NimbusRomNo9L-Regu -/FontDescriptor 332 0 R -/FirstChar 2 -/LastChar 122 -/Widths 322 0 R -/Encoding 317 0 R ->> endobj -142 0 obj << -/Type /Pages -/Count 6 -/Parent 333 0 R -/Kids [134 0 R 177 0 R 182 0 R 205 0 R 235 0 R 260 0 R] ->> endobj -303 0 obj << -/Type /Pages -/Count 2 -/Parent 333 0 R -/Kids [283 0 R 308 0 R] ->> endobj -333 0 obj << -/Type /Pages -/Count 8 -/Kids [142 0 R 303 0 R] ->> endobj -334 0 obj << -/Type /Outlines -/First 3 0 R -/Last 7 0 R -/Count 2 ->> endobj -131 0 obj << -/Title 132 0 R -/A 129 0 R -/Parent 111 0 R -/Prev 127 0 R ->> endobj -127 0 obj << -/Title 128 0 R -/A 125 0 R -/Parent 111 0 R -/Prev 123 0 R -/Next 131 0 R ->> endobj -123 0 obj << -/Title 124 0 R -/A 121 0 R -/Parent 111 0 R -/Prev 119 0 R -/Next 127 0 R ->> endobj -119 0 obj << -/Title 120 0 R -/A 117 0 R -/Parent 111 0 R -/Prev 115 0 R -/Next 123 0 R ->> endobj -115 0 obj << -/Title 116 0 R -/A 113 0 R -/Parent 111 0 R -/Next 119 0 R ->> endobj -111 0 obj << -/Title 112 0 R -/A 109 0 R -/Parent 7 0 R -/Prev 43 0 R -/First 115 0 R -/Last 131 0 R -/Count -5 ->> endobj -107 0 obj << -/Title 108 0 R -/A 105 0 R -/Parent 43 0 R -/Prev 103 0 R ->> endobj -103 0 obj << -/Title 104 0 R -/A 101 0 R -/Parent 43 0 R -/Prev 99 0 R -/Next 107 0 R ->> endobj -99 0 obj << -/Title 100 0 R -/A 97 0 R -/Parent 43 0 R -/Prev 95 0 R -/Next 103 0 R ->> endobj -95 0 obj << -/Title 96 0 R -/A 93 0 R -/Parent 43 0 R -/Prev 91 0 R -/Next 99 0 R ->> endobj -91 0 obj << -/Title 92 0 R -/A 89 0 R -/Parent 43 0 R -/Prev 87 0 R -/Next 95 0 R ->> endobj -87 0 obj << -/Title 88 0 R -/A 85 0 R -/Parent 43 0 R -/Prev 83 0 R -/Next 91 0 R ->> endobj -83 0 obj << -/Title 84 0 R -/A 81 0 R -/Parent 43 0 R -/Prev 79 0 R -/Next 87 0 R ->> endobj -79 0 obj << -/Title 80 0 R -/A 77 0 R -/Parent 43 0 R -/Prev 75 0 R -/Next 83 0 R ->> endobj -75 0 obj << -/Title 76 0 R -/A 73 0 R -/Parent 43 0 R -/Prev 71 0 R -/Next 79 0 R ->> endobj -71 0 obj << -/Title 72 0 R -/A 69 0 R -/Parent 43 0 R -/Prev 67 0 R -/Next 75 0 R ->> endobj -67 0 obj << -/Title 68 0 R -/A 65 0 R -/Parent 43 0 R -/Prev 63 0 R -/Next 71 0 R ->> endobj -63 0 obj << -/Title 64 0 R -/A 61 0 R -/Parent 43 0 R -/Prev 59 0 R -/Next 67 0 R ->> endobj -59 0 obj << -/Title 60 0 R -/A 57 0 R -/Parent 43 0 R -/Prev 55 0 R -/Next 63 0 R ->> endobj -55 0 obj << -/Title 56 0 R -/A 53 0 R -/Parent 43 0 R -/Prev 51 0 R -/Next 59 0 R ->> endobj -51 0 obj << -/Title 52 0 R -/A 49 0 R -/Parent 43 0 R -/Prev 47 0 R -/Next 55 0 R ->> endobj -47 0 obj << -/Title 48 0 R -/A 45 0 R -/Parent 43 0 R -/Next 51 0 R ->> endobj -43 0 obj << -/Title 44 0 R -/A 41 0 R -/Parent 7 0 R -/Prev 11 0 R -/Next 111 0 R -/First 47 0 R -/Last 107 0 R -/Count -16 ->> endobj -39 0 obj << -/Title 40 0 R -/A 37 0 R -/Parent 11 0 R -/Prev 35 0 R ->> endobj -35 0 obj << -/Title 36 0 R -/A 33 0 R -/Parent 11 0 R -/Prev 31 0 R -/Next 39 0 R ->> endobj -31 0 obj << -/Title 32 0 R -/A 29 0 R -/Parent 11 0 R -/Prev 27 0 R -/Next 35 0 R ->> endobj -27 0 obj << -/Title 28 0 R -/A 25 0 R -/Parent 11 0 R -/Prev 23 0 R -/Next 31 0 R ->> endobj -23 0 obj << -/Title 24 0 R -/A 21 0 R -/Parent 11 0 R -/Prev 19 0 R -/Next 27 0 R ->> endobj -19 0 obj << -/Title 20 0 R -/A 17 0 R -/Parent 11 0 R -/Prev 15 0 R -/Next 23 0 R ->> endobj -15 0 obj << -/Title 16 0 R -/A 13 0 R -/Parent 11 0 R -/Next 19 0 R ->> endobj -11 0 obj << -/Title 12 0 R -/A 9 0 R -/Parent 7 0 R -/Next 43 0 R -/First 15 0 R -/Last 39 0 R -/Count -7 ->> endobj -7 0 obj << -/Title 8 0 R -/A 5 0 R -/Parent 334 0 R -/Prev 3 0 R -/First 11 0 R -/Last 111 0 R -/Count -3 ->> endobj -3 0 obj << -/Title 4 0 R -/A 1 0 R -/Parent 334 0 R -/Next 7 0 R ->> endobj -335 0 obj << -/Names [(Doc-Start) 140 0 R (_app_procedures) 227 0 R (_backgound_list) 278 0 R (_backgroundstruct) 208 0 R (_batch_wrappers) 289 0 R (_create_status_table) 286 0 R] -/Limits [(Doc-Start) (_create_status_table)] ->> endobj -336 0 obj << -/Names [(_diffstruct) 217 0 R (_header) 192 0 R (_image) 188 0 R (_jpeg) 198 0 R (_madd) 228 0 R (_mbackground) 231 0 R] -/Limits [(_diffstruct) (_mbackground)] ->> endobj -337 0 obj << -/Names [(_mbackgroundbatch) 290 0 R (_mbgmodel) 238 0 R (_mconcatfit) 241 0 R (_mdiff) 244 0 R (_mdiffbatch) 294 0 R (_mdifffit) 247 0 R] -/Limits [(_mbackgroundbatch) (_mdifffit)] ->> endobj -338 0 obj << -/Names [(_mdifffitbatch) 298 0 R (_mfitbatch) 311 0 R (_mfitplane) 250 0 R (_mimgtbl) 253 0 R (_mjpeg) 263 0 R (_mmakehdr) 256 0 R] -/Limits [(_mdifffitbatch) (_mmakehdr)] ->> endobj -339 0 obj << -/Names [(_moverlaps) 266 0 R (_mproject) 269 0 R (_mprojectbatch) 314 0 R (_mprojectpp) 272 0 R (_mshrink) 275 0 R (_overview) 185 0 R] -/Limits [(_moverlaps) (_overview)] ->> endobj -340 0 obj << -/Names [(_status) 201 0 R (_swiftmontage_api) 186 0 R (_table) 195 0 R (_types) 187 0 R (lstlisting.-1) 189 0 R (lstlisting.-10) 239 0 R] -/Limits [(_status) (lstlisting.-10)] ->> endobj -341 0 obj << -/Names [(lstlisting.-11) 242 0 R (lstlisting.-12) 245 0 R (lstlisting.-13) 248 0 R (lstlisting.-14) 251 0 R (lstlisting.-15) 254 0 R (lstlisting.-16) 257 0 R] -/Limits [(lstlisting.-11) (lstlisting.-16)] ->> endobj -342 0 obj << -/Names [(lstlisting.-17) 264 0 R (lstlisting.-18) 267 0 R (lstlisting.-19) 270 0 R (lstlisting.-2) 193 0 R (lstlisting.-20) 273 0 R (lstlisting.-21) 276 0 R] -/Limits [(lstlisting.-17) (lstlisting.-21)] ->> endobj -343 0 obj << -/Names [(lstlisting.-22) 279 0 R (lstlisting.-23) 287 0 R (lstlisting.-24) 291 0 R (lstlisting.-25) 295 0 R (lstlisting.-26) 299 0 R (lstlisting.-27) 312 0 R] -/Limits [(lstlisting.-22) (lstlisting.-27)] ->> endobj -344 0 obj << -/Names [(lstlisting.-28) 315 0 R (lstlisting.-3) 196 0 R (lstlisting.-4) 199 0 R (lstlisting.-5) 202 0 R (lstlisting.-6) 209 0 R (lstlisting.-7) 218 0 R] -/Limits [(lstlisting.-28) (lstlisting.-7)] ->> endobj -345 0 obj << -/Names [(lstlisting.-8) 229 0 R (lstlisting.-9) 232 0 R (lstnumber.-1.1) 190 0 R (lstnumber.-10.1) 240 0 R (lstnumber.-11.1) 243 0 R (lstnumber.-12.1) 246 0 R] -/Limits [(lstlisting.-8) (lstnumber.-12.1)] ->> endobj -346 0 obj << -/Names [(lstnumber.-13.1) 249 0 R (lstnumber.-14.1) 252 0 R (lstnumber.-15.1) 255 0 R (lstnumber.-16.1) 258 0 R (lstnumber.-17.1) 265 0 R (lstnumber.-18.1) 268 0 R] -/Limits [(lstnumber.-13.1) (lstnumber.-18.1)] ->> endobj -347 0 obj << -/Names [(lstnumber.-19.1) 271 0 R (lstnumber.-2.1) 194 0 R (lstnumber.-20.1) 274 0 R (lstnumber.-21.1) 277 0 R (lstnumber.-22.1) 280 0 R (lstnumber.-23.1) 288 0 R] -/Limits [(lstnumber.-19.1) (lstnumber.-23.1)] ->> endobj -348 0 obj << -/Names [(lstnumber.-24.1) 292 0 R (lstnumber.-24.2) 293 0 R (lstnumber.-25.1) 296 0 R (lstnumber.-25.2) 297 0 R (lstnumber.-26.1) 300 0 R (lstnumber.-26.2) 301 0 R] -/Limits [(lstnumber.-24.1) (lstnumber.-26.2)] ->> endobj -349 0 obj << -/Names [(lstnumber.-26.3) 302 0 R (lstnumber.-27.1) 313 0 R (lstnumber.-28.1) 316 0 R (lstnumber.-3.1) 197 0 R (lstnumber.-4.1) 200 0 R (lstnumber.-5.1) 203 0 R] -/Limits [(lstnumber.-26.3) (lstnumber.-5.1)] ->> endobj -350 0 obj << -/Names [(lstnumber.-6.1) 210 0 R (lstnumber.-6.2) 211 0 R (lstnumber.-6.3) 212 0 R (lstnumber.-6.4) 213 0 R (lstnumber.-6.5) 214 0 R (lstnumber.-6.6) 215 0 R] -/Limits [(lstnumber.-6.1) (lstnumber.-6.6)] ->> endobj -351 0 obj << -/Names [(lstnumber.-6.7) 216 0 R (lstnumber.-7.1) 219 0 R (lstnumber.-7.2) 220 0 R (lstnumber.-7.3) 221 0 R (lstnumber.-7.4) 222 0 R (lstnumber.-7.5) 223 0 R] -/Limits [(lstnumber.-6.7) (lstnumber.-7.5)] ->> endobj -352 0 obj << -/Names [(lstnumber.-7.6) 224 0 R (lstnumber.-7.7) 225 0 R (lstnumber.-7.8) 226 0 R (lstnumber.-8.1) 230 0 R (lstnumber.-9.1) 233 0 R (page.1) 184 0 R] -/Limits [(lstnumber.-7.6) (page.1)] ->> endobj -353 0 obj << -/Names [(page.2) 207 0 R (page.3) 237 0 R (page.4) 262 0 R (page.5) 285 0 R (page.6) 310 0 R (page.i) 137 0 R] -/Limits [(page.2) (page.i)] ->> endobj -354 0 obj << -/Names [(page.ii) 179 0 R (section.1) 2 0 R (section.2) 6 0 R (subsection.2.1) 10 0 R (subsection.2.2) 42 0 R (subsection.2.3) 110 0 R] -/Limits [(page.ii) (subsection.2.3)] ->> endobj -355 0 obj << -/Names [(subsubsection.2.1.1) 14 0 R (subsubsection.2.1.2) 18 0 R (subsubsection.2.1.3) 22 0 R (subsubsection.2.1.4) 26 0 R (subsubsection.2.1.5) 30 0 R (subsubsection.2.1.6) 34 0 R] -/Limits [(subsubsection.2.1.1) (subsubsection.2.1.6)] ->> endobj -356 0 obj << -/Names [(subsubsection.2.1.7) 38 0 R (subsubsection.2.2.1) 46 0 R (subsubsection.2.2.10) 82 0 R (subsubsection.2.2.11) 86 0 R (subsubsection.2.2.12) 90 0 R (subsubsection.2.2.13) 94 0 R] -/Limits [(subsubsection.2.1.7) (subsubsection.2.2.13)] ->> endobj -357 0 obj << -/Names [(subsubsection.2.2.14) 98 0 R (subsubsection.2.2.15) 102 0 R (subsubsection.2.2.16) 106 0 R (subsubsection.2.2.2) 50 0 R (subsubsection.2.2.3) 54 0 R (subsubsection.2.2.4) 58 0 R] -/Limits [(subsubsection.2.2.14) (subsubsection.2.2.4)] ->> endobj -358 0 obj << -/Names [(subsubsection.2.2.5) 62 0 R (subsubsection.2.2.6) 66 0 R (subsubsection.2.2.7) 70 0 R (subsubsection.2.2.8) 74 0 R (subsubsection.2.2.9) 78 0 R (subsubsection.2.3.1) 114 0 R] -/Limits [(subsubsection.2.2.5) (subsubsection.2.3.1)] ->> endobj -359 0 obj << -/Names [(subsubsection.2.3.2) 118 0 R (subsubsection.2.3.3) 122 0 R (subsubsection.2.3.4) 126 0 R (subsubsection.2.3.5) 130 0 R] -/Limits [(subsubsection.2.3.2) (subsubsection.2.3.5)] ->> endobj -360 0 obj << -/Kids [335 0 R 336 0 R 337 0 R 338 0 R 339 0 R 340 0 R] -/Limits [(Doc-Start) (lstlisting.-10)] ->> endobj -361 0 obj << -/Kids [341 0 R 342 0 R 343 0 R 344 0 R 345 0 R 346 0 R] -/Limits [(lstlisting.-11) (lstnumber.-18.1)] ->> endobj -362 0 obj << -/Kids [347 0 R 348 0 R 349 0 R 350 0 R 351 0 R 352 0 R] -/Limits [(lstnumber.-19.1) (page.1)] ->> endobj -363 0 obj << -/Kids [353 0 R 354 0 R 355 0 R 356 0 R 357 0 R 358 0 R] -/Limits [(page.2) (subsubsection.2.3.1)] ->> endobj -364 0 obj << -/Kids [359 0 R] -/Limits [(subsubsection.2.3.2) (subsubsection.2.3.5)] ->> endobj -365 0 obj << -/Kids [360 0 R 361 0 R 362 0 R 363 0 R 364 0 R] -/Limits [(Doc-Start) (subsubsection.2.3.5)] ->> endobj -366 0 obj << -/Dests 365 0 R ->> endobj -367 0 obj << -/Type /Catalog -/Pages 333 0 R -/Outlines 334 0 R -/Names 366 0 R -/PageMode/UseOutlines/PageLabels<>2<>]>> -/OpenAction 133 0 R ->> endobj -368 0 obj << -/Author()/Title(SwiftMontage API)/Subject()/Creator(DBLaTeX-0.3)/Producer(pdfTeX-1.40.10)/Keywords() -/CreationDate (D:20110620095433-05'00') -/ModDate (D:20110620095433-05'00') -/Trapped /False -/PTEX.Fullbanner (This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0) ->> endobj -xref -0 369 -0000000000 65535 f -0000000015 00000 n -0000012360 00000 n -0000100164 00000 n -0000000060 00000 n -0000000086 00000 n -0000012480 00000 n -0000100055 00000 n -0000000131 00000 n -0000000165 00000 n -0000012599 00000 n -0000099946 00000 n -0000000215 00000 n -0000000239 00000 n -0000012719 00000 n -0000099872 00000 n -0000000295 00000 n -0000000319 00000 n -0000012961 00000 n -0000099785 00000 n -0000000375 00000 n -0000000400 00000 n -0000013204 00000 n -0000099698 00000 n -0000000456 00000 n -0000000480 00000 n -0000013446 00000 n -0000099611 00000 n -0000000536 00000 n -0000000559 00000 n -0000013689 00000 n -0000099524 00000 n -0000000615 00000 n -0000000640 00000 n -0000016326 00000 n -0000099437 00000 n -0000000696 00000 n -0000000731 00000 n -0000016934 00000 n -0000099363 00000 n -0000000787 00000 n -0000000816 00000 n -0000017603 00000 n -0000099237 00000 n -0000000867 00000 n -0000000900 00000 n -0000017724 00000 n -0000099163 00000 n -0000000956 00000 n -0000000979 00000 n -0000017964 00000 n -0000099076 00000 n -0000001035 00000 n -0000001065 00000 n -0000020749 00000 n -0000098989 00000 n -0000001121 00000 n -0000001148 00000 n -0000020992 00000 n -0000098902 00000 n -0000001204 00000 n -0000001233 00000 n -0000021235 00000 n -0000098815 00000 n -0000001289 00000 n -0000001313 00000 n -0000021478 00000 n -0000098728 00000 n -0000001369 00000 n -0000001396 00000 n -0000021721 00000 n -0000098641 00000 n -0000001452 00000 n -0000001480 00000 n -0000021963 00000 n -0000098554 00000 n -0000001536 00000 n -0000001562 00000 n -0000022206 00000 n -0000098467 00000 n -0000001618 00000 n -0000001645 00000 n -0000025039 00000 n -0000098380 00000 n -0000001702 00000 n -0000001726 00000 n -0000025282 00000 n -0000098293 00000 n -0000001783 00000 n -0000001811 00000 n -0000025523 00000 n -0000098206 00000 n -0000001868 00000 n -0000001895 00000 n -0000025766 00000 n -0000098119 00000 n -0000001952 00000 n -0000001981 00000 n -0000026008 00000 n -0000098030 00000 n -0000002038 00000 n -0000002065 00000 n -0000026251 00000 n -0000097939 00000 n -0000002123 00000 n -0000002160 00000 n -0000030187 00000 n -0000097861 00000 n -0000002218 00000 n -0000002263 00000 n -0000030431 00000 n -0000097746 00000 n -0000002315 00000 n -0000002349 00000 n -0000030553 00000 n -0000097667 00000 n -0000002406 00000 n -0000002442 00000 n -0000030857 00000 n -0000097574 00000 n -0000002499 00000 n -0000002529 00000 n -0000031162 00000 n -0000097481 00000 n -0000002586 00000 n -0000002619 00000 n -0000033734 00000 n -0000097388 00000 n -0000002676 00000 n -0000002705 00000 n -0000033978 00000 n -0000097309 00000 n -0000002762 00000 n -0000002795 00000 n -0000003139 00000 n -0000003381 00000 n -0000002848 00000 n -0000003258 00000 n -0000096792 00000 n -0000096447 00000 n -0000003320 00000 n -0000096276 00000 n -0000096965 00000 n -0000004856 00000 n -0000005006 00000 n -0000005157 00000 n -0000005312 00000 n -0000005473 00000 n -0000005633 00000 n -0000005794 00000 n -0000005955 00000 n -0000006115 00000 n -0000006276 00000 n -0000006437 00000 n -0000006593 00000 n -0000006754 00000 n -0000006915 00000 n -0000007075 00000 n -0000007236 00000 n -0000007397 00000 n -0000007558 00000 n -0000007719 00000 n -0000007879 00000 n -0000008040 00000 n -0000008202 00000 n -0000008364 00000 n -0000008526 00000 n -0000008688 00000 n -0000008850 00000 n -0000009012 00000 n -0000009174 00000 n -0000009330 00000 n -0000009491 00000 n -0000009651 00000 n -0000009812 00000 n -0000009973 00000 n -0000010196 00000 n -0000004461 00000 n -0000003479 00000 n -0000010134 00000 n -0000096618 00000 n -0000013932 00000 n -0000012179 00000 n -0000010307 00000 n -0000012298 00000 n -0000012419 00000 n -0000012539 00000 n -0000012658 00000 n -0000012778 00000 n -0000012839 00000 n -0000012900 00000 n -0000096105 00000 n -0000013021 00000 n -0000013082 00000 n -0000013143 00000 n -0000013264 00000 n -0000013324 00000 n -0000013385 00000 n -0000013506 00000 n -0000013567 00000 n -0000013628 00000 n -0000013749 00000 n -0000013810 00000 n -0000013871 00000 n -0000018207 00000 n -0000016145 00000 n -0000014043 00000 n -0000016264 00000 n -0000016386 00000 n -0000016447 00000 n -0000016508 00000 n -0000016569 00000 n -0000016630 00000 n -0000016690 00000 n -0000016751 00000 n -0000016812 00000 n -0000016873 00000 n -0000016994 00000 n -0000017055 00000 n -0000017116 00000 n -0000017177 00000 n -0000017238 00000 n -0000017299 00000 n -0000017360 00000 n -0000017421 00000 n -0000017481 00000 n -0000017542 00000 n -0000017663 00000 n -0000017782 00000 n -0000017843 00000 n -0000017903 00000 n -0000018024 00000 n -0000018085 00000 n -0000018146 00000 n -0000022449 00000 n -0000020568 00000 n -0000018318 00000 n -0000020687 00000 n -0000020809 00000 n -0000020870 00000 n -0000020931 00000 n -0000021052 00000 n -0000021113 00000 n -0000021174 00000 n -0000021295 00000 n -0000021356 00000 n -0000021417 00000 n -0000021538 00000 n -0000021599 00000 n -0000021660 00000 n -0000021781 00000 n -0000021842 00000 n -0000021903 00000 n -0000022023 00000 n -0000022084 00000 n -0000022145 00000 n -0000022266 00000 n -0000022327 00000 n -0000022388 00000 n -0000026495 00000 n -0000024858 00000 n -0000022560 00000 n -0000024977 00000 n -0000025099 00000 n -0000025160 00000 n -0000025221 00000 n -0000025342 00000 n -0000025402 00000 n -0000025462 00000 n -0000025583 00000 n -0000025644 00000 n -0000025705 00000 n -0000025825 00000 n -0000025886 00000 n -0000025947 00000 n -0000026068 00000 n -0000026129 00000 n -0000026190 00000 n -0000026312 00000 n -0000026373 00000 n -0000026434 00000 n -0000028982 00000 n -0000031527 00000 n -0000028863 00000 n -0000026606 00000 n -0000030125 00000 n -0000030248 00000 n -0000030309 00000 n -0000030370 00000 n -0000030492 00000 n -0000030614 00000 n -0000030675 00000 n -0000030736 00000 n -0000030796 00000 n -0000030918 00000 n -0000030979 00000 n -0000031040 00000 n -0000031101 00000 n -0000031223 00000 n -0000031284 00000 n -0000031345 00000 n -0000031406 00000 n -0000031467 00000 n -0000097082 00000 n -0000029885 00000 n -0000030020 00000 n -0000030069 00000 n -0000034221 00000 n -0000033553 00000 n -0000031666 00000 n -0000033672 00000 n -0000033795 00000 n -0000033856 00000 n -0000033917 00000 n -0000034039 00000 n -0000034099 00000 n -0000034160 00000 n -0000095733 00000 n -0000034360 00000 n -0000034723 00000 n -0000035027 00000 n -0000035350 00000 n -0000035722 00000 n -0000036197 00000 n -0000050053 00000 n -0000050457 00000 n -0000061570 00000 n -0000061947 00000 n -0000069819 00000 n -0000070203 00000 n -0000078888 00000 n -0000079162 00000 n -0000095320 00000 n -0000097167 00000 n -0000097236 00000 n -0000100235 00000 n -0000100469 00000 n -0000100652 00000 n -0000100855 00000 n -0000101049 00000 n -0000101243 00000 n -0000101441 00000 n -0000101667 00000 n -0000101892 00000 n -0000102118 00000 n -0000102338 00000 n -0000102565 00000 n -0000102799 00000 n -0000103032 00000 n -0000103266 00000 n -0000103496 00000 n -0000103722 00000 n -0000103948 00000 n -0000104158 00000 n -0000104320 00000 n -0000104516 00000 n -0000104776 00000 n -0000105041 00000 n -0000105307 00000 n -0000105568 00000 n -0000105774 00000 n -0000105892 00000 n -0000106016 00000 n -0000106132 00000 n -0000106252 00000 n -0000106345 00000 n -0000106460 00000 n -0000106498 00000 n -0000106666 00000 n -trailer -<< /Size 369 -/Root 367 0 R -/Info 368 0 R -/ID [<1CB1ABA80FC8BDD482BDD5F3C66391C3> <1CB1ABA80FC8BDD482BDD5F3C66391C3>] >> -startxref -106985 -%%EOF