[Swift-commit] r6290 - in SwiftApps/modis: . tutorial

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2013-02-18 14:36:02 -0600 (Mon, 18 Feb 2013)
New Revision: 6290

Modified:
   SwiftApps/modis/modis.swift
   SwiftApps/modis/tutorial/modis01.swift
   SwiftApps/modis/tutorial/modis02.swift
   SwiftApps/modis/tutorial/modis03.swift
   SwiftApps/modis/tutorial/modis04.swift
Log:
Fix path names to images


Modified: SwiftApps/modis/modis.swift
===================================================================
--- SwiftApps/modis/modis.swift	2013-02-18 20:28:51 UTC (rev 6289)
+++ SwiftApps/modis/modis.swift	2013-02-18 20:36:02 UTC (rev 6290)
@@ -35,7 +35,7 @@
 string webDir    = @arg("webdir");
 
 # Input Dataset
-imagefile geos[] <ext; exec="../bin/modis.mapper", location=MODISdir, suffix=".pgm.gz", n=nFiles>;
+imagefile geos[] <ext; exec="../bin/modis.mapper", location=MODISdir, suffix=".rgb", n=nFiles>;
 
 # Compute the land use summary of each MODIS tile
 landuse land[] <structured_regexp_mapper; source=geos, match="(h..v..)", transform=@strcat("landuse/\\1.landuse.byfreq")>;

Modified: SwiftApps/modis/tutorial/modis01.swift
===================================================================
--- SwiftApps/modis/tutorial/modis01.swift	2013-02-18 20:28:51 UTC (rev 6289)
+++ SwiftApps/modis/tutorial/modis01.swift	2013-02-18 20:36:02 UTC (rev 6290)
@@ -6,7 +6,7 @@
   getlanduse @filename(input) @filename(is_land) stdout=@filename(output);
 }
 
-imagefile modisImage <"../data/modis/2002/h00v09.pgm.gz">;
-landuse result <"landuse/h00v08.landuse.byfreq">;
-landuse land_result <"landuse/h00v08.is_land">;
+imagefile modisImage <"../data/modis/2002/h00v09.rgb">;
+landuse result <"landuse/h00v09.landuse.byfreq">;
+landuse land_result <"landuse/h00v09.is_land">;
 (result, land_result) = getLandUse(modisImage);

Modified: SwiftApps/modis/tutorial/modis02.swift
===================================================================
--- SwiftApps/modis/tutorial/modis02.swift	2013-02-18 20:28:51 UTC (rev 6289)
+++ SwiftApps/modis/tutorial/modis02.swift	2013-02-18 20:36:02 UTC (rev 6290)
@@ -11,7 +11,7 @@
 string MODISdir  = @arg("modisdir", "../data/modis/2002");
 
 # Input Dataset
-imagefile geos[] <ext; exec="../bin/modis.mapper", location=MODISdir, suffix=".pgm.gz", n=nFiles>;
+imagefile geos[] <ext; exec="../bin/modis.mapper", location=MODISdir, suffix=".rgb", n=nFiles>;
 
 # Compute the land use summary of each MODIS tile
 landuse land[] <structured_regexp_mapper; source=geos, match="(h..v..)", transform=@strcat("landuse/\\1.landuse.byfreq")>;

Modified: SwiftApps/modis/tutorial/modis03.swift
===================================================================
--- SwiftApps/modis/tutorial/modis03.swift	2013-02-18 20:28:51 UTC (rev 6289)
+++ SwiftApps/modis/tutorial/modis03.swift	2013-02-18 20:36:02 UTC (rev 6290)
@@ -19,7 +19,7 @@
 string MODISdir  = @arg("modisdir", "../data/modis/2002");
 
 # Input Dataset
-imagefile geos[] <ext; exec="../bin/modis.mapper", location=MODISdir, suffix=".pgm.gz", n=nFiles>;
+imagefile geos[] <ext; exec="../bin/modis.mapper", location=MODISdir, suffix=".rgb", n=nFiles>;
 
 # Compute the land use summary of each MODIS tile
 landuse land[] <structured_regexp_mapper; source=geos, match="(h..v..)", transform=@strcat("landuse/\\1.landuse.byfreq")>;

Modified: SwiftApps/modis/tutorial/modis04.swift
===================================================================
--- SwiftApps/modis/tutorial/modis04.swift	2013-02-18 20:28:51 UTC (rev 6289)
+++ SwiftApps/modis/tutorial/modis04.swift	2013-02-18 20:36:02 UTC (rev 6290)
@@ -24,7 +24,7 @@
 string MODISdir  = @arg("modisdir", "../data/modis/2002");
 
 # Input Dataset
-imagefile geos[] <ext; exec="../bin/modis.mapper", location=MODISdir, suffix=".pgm.gz", n=nFiles>;
+imagefile geos[] <ext; exec="../bin/modis.mapper", location=MODISdir, suffix=".rgb", n=nFiles>;
 
 # Compute the land use summary of each MODIS tile
 landuse land[]    <structured_regexp_mapper; source=geos, match="(h..v..)", transform=@strcat("landuse/\\1.landuse.byfreq")>;