- tweaked the rt_resample regression test to use SRIDs under 1000000

- changed the computation of width and height when aligning to a grid

git-svn-id: http://svn.osgeo.org/postgis/trunk@7652 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/raster/rt_core/rt_api.c b/raster/rt_core/rt_api.c
index c2c78c2fbd8e419d9f82cfa604e3c6764c5bc031..240fbc1b8f3a1e11789c6badea79d099071d3105 100644 (file)
--- a/raster/rt_core/rt_api.c
+++ b/raster/rt_core/rt_api.c
@@ -6105,7 +6105,7 @@ rt_raster rt_raster_gdal_warp(
                ((NULL != ul_xw) && (NULL == ul_yw)) ||
                ((NULL == ul_xw) && (NULL != ul_yw))
        ) {
-               rterror("rt_raster_gdal_warp: Both X and Y coordinate values must be provided for upper-left corner\n");
+               rterror("rt_raster_gdal_warp: Both X and Y upper-left corner values must be provided\n");
 
                GDALClose(src_ds);
 
@@ -6138,7 +6138,7 @@ rt_raster rt_raster_gdal_warp(
                ((NULL != scale_x) && (NULL == scale_y)) ||
                ((NULL == scale_x) && (NULL != scale_y))
        ) {
-               rterror("rt_raster_gdal_warp: Both X and Y axis values must be provided for scale\n");
+               rterror("rt_raster_gdal_warp: Both X and Y scale values must be provided for scale\n");
 
                GDALClose(src_ds);
 
@@ -6161,7 +6161,7 @@ rt_raster rt_raster_gdal_warp(
                        ((NULL != grid_xw) && (NULL == grid_yw)) ||
                        ((NULL == grid_xw) && (NULL != grid_yw))
                ) {
-                       rterror("rt_raster_gdal_warp: Both X and Y coordinate values must be provided for alignment\n");
+                       rterror("rt_raster_gdal_warp: Both X and Y alignment values must be provided\n");
 
                        GDALClose(src_ds);
 
@@ -6226,8 +6226,8 @@ rt_raster rt_raster_gdal_warp(
                        max_x = dst_gt[0] + dst_gt[1] * width;
                        min_y = dst_gt[3] + dst_gt[5] * height;
 
-                       width = (int) ceil((max_x - min_x + (grid_pix_x / 2.)) / grid_pix_x);
-                       height = (int) ceil((max_y - min_y + (grid_pix_y / 2.)) / grid_pix_y);
+                       width = (int) ((max_x - min_x + (grid_pix_x / 2.)) / grid_pix_x);
+                       height = (int) ((max_y - min_y + (grid_pix_y / 2.)) / grid_pix_y);
                        dst_gt[1] = grid_pix_x;
                        dst_gt[5] = -1 * grid_pix_y;
                        RASTER_DEBUGF(3, "new dimensions: %d x %d", width, height);

diff --git a/raster/test/regress/rt_resample.sql b/raster/test/regress/rt_resample.sql
index c2cd6aa9aa561b1d10857b99b070cfe9b939f93f..d755cdd690579ab68a2db81b3da914a73e184398 100644 (file)
--- a/raster/test/regress/rt_resample.sql
+++ b/raster/test/regress/rt_resample.sql
@@ -17,7 +17,7 @@ CREATE OR REPLACE FUNCTION make_test_raster()
                y int;
                rast raster;
        BEGIN
-               rast := ST_MakeEmptyRaster(width, height, -500000, 600000, 1000, -1000, 0, 0, 1002163);
+               rast := ST_MakeEmptyRaster(width, height, -500000, 600000, 1000, -1000, 0, 0, 992163);
                rast := ST_AddBand(rast, 1, '64BF', 0, 0);
 
                FOR x IN 1..width LOOP
@@ -32,14 +32,14 @@ CREATE OR REPLACE FUNCTION make_test_raster()
        END;
        $$ LANGUAGE 'plpgsql';
 SELECT make_test_raster();
-DELETE FROM "spatial_ref_sys" WHERE srid = 1002163;
-DELETE FROM "spatial_ref_sys" WHERE srid = 1003309;
-DELETE FROM "spatial_ref_sys" WHERE srid = 1003310;
-DELETE FROM "spatial_ref_sys" WHERE srid = 1004269;
-INSERT INTO "spatial_ref_sys" ("srid","auth_name","auth_srid","srtext","proj4text") VALUES (1002163,'EPSG',2163,'PROJCS["unnamed",GEOGCS["unnamed ellipse",DATUM["unknown",SPHEROID["unnamed",6370997,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Lambert_Azimuthal_Equal_Area"],PARAMETER["latitude_of_center",45],PARAMETER["longitude_of_center",-100],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["Meter",1],AUTHORITY["EPSG","2163"]]','+proj=laea +lat_0=45 +lon_0=-100 +x_0=0 +y_0=0 +a=6370997 +b=6370997 +units=m +no_defs ');
-INSERT INTO "spatial_ref_sys" ("srid","auth_name","auth_srid","srtext","proj4text") VALUES (1003309,'EPSG',3309,'PROJCS["NAD27 / California Albers",GEOGCS["NAD27",DATUM["North_American_Datum_1927",SPHEROID["Clarke 1866",6378206.4,294.9786982139006,AUTHORITY["EPSG","7008"]],AUTHORITY["EPSG","6267"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4267"]],UNIT["metre",1,AUTHORITY["EPSG","9001"]],PROJECTION["Albers_Conic_Equal_Area"],PARAMETER["standard_parallel_1",34],PARAMETER["standard_parallel_2",40.5],PARAMETER["latitude_of_center",0],PARAMETER["longitude_of_center",-120],PARAMETER["false_easting",0],PARAMETER["false_northing",-4000000],AUTHORITY["EPSG","3309"],AXIS["X",EAST],AXIS["Y",NORTH]]','+proj=aea +lat_1=34 +lat_2=40.5 +lat_0=0 +lon_0=-120 +x_0=0 +y_0=-4000000 +ellps=clrk66 +datum=NAD27 +units=m +no_defs ');
-INSERT INTO "spatial_ref_sys" ("srid","auth_name","auth_srid","srtext","proj4text") VALUES (1003310,'EPSG',3310,'PROJCS["NAD83 / California Albers",GEOGCS["NAD83",DATUM["North_American_Datum_1983",SPHEROID["GRS 1980",6378137,298.257222101,AUTHORITY["EPSG","7019"]],AUTHORITY["EPSG","6269"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4269"]],UNIT["metre",1,AUTHORITY["EPSG","9001"]],PROJECTION["Albers_Conic_Equal_Area"],PARAMETER["standard_parallel_1",34],PARAMETER["standard_parallel_2",40.5],PARAMETER["latitude_of_center",0],PARAMETER["longitude_of_center",-120],PARAMETER["false_easting",0],PARAMETER["false_northing",-4000000],AUTHORITY["EPSG","3310"],AXIS["X",EAST],AXIS["Y",NORTH]]','+proj=aea +lat_1=34 +lat_2=40.5 +lat_0=0 +lon_0=-120 +x_0=0 +y_0=-4000000 +ellps=GRS80 +datum=NAD83 +units=m +no_defs ');
-INSERT INTO "spatial_ref_sys" ("srid","auth_name","auth_srid","srtext","proj4text") VALUES (1004269,'EPSG',4269,'GEOGCS["NAD83",DATUM["North_American_Datum_1983",SPHEROID["GRS 1980",6378137,298.257222101,AUTHORITY["EPSG","7019"]],AUTHORITY["EPSG","6269"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4269"]]','+proj=longlat +ellps=GRS80 +datum=NAD83 +no_defs ');
+DELETE FROM "spatial_ref_sys" WHERE srid = 992163;
+DELETE FROM "spatial_ref_sys" WHERE srid = 993309;
+DELETE FROM "spatial_ref_sys" WHERE srid = 993310;
+DELETE FROM "spatial_ref_sys" WHERE srid = 994269;
+INSERT INTO "spatial_ref_sys" ("srid","auth_name","auth_srid","srtext","proj4text") VALUES (992163,'EPSG',2163,'PROJCS["unnamed",GEOGCS["unnamed ellipse",DATUM["unknown",SPHEROID["unnamed",6370997,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Lambert_Azimuthal_Equal_Area"],PARAMETER["latitude_of_center",45],PARAMETER["longitude_of_center",-100],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["Meter",1],AUTHORITY["EPSG","2163"]]','+proj=laea +lat_0=45 +lon_0=-100 +x_0=0 +y_0=0 +a=6370997 +b=6370997 +units=m +no_defs ');
+INSERT INTO "spatial_ref_sys" ("srid","auth_name","auth_srid","srtext","proj4text") VALUES (993309,'EPSG',3309,'PROJCS["NAD27 / California Albers",GEOGCS["NAD27",DATUM["North_American_Datum_1927",SPHEROID["Clarke 1866",6378206.4,294.9786982139006,AUTHORITY["EPSG","7008"]],AUTHORITY["EPSG","6267"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4267"]],UNIT["metre",1,AUTHORITY["EPSG","9001"]],PROJECTION["Albers_Conic_Equal_Area"],PARAMETER["standard_parallel_1",34],PARAMETER["standard_parallel_2",40.5],PARAMETER["latitude_of_center",0],PARAMETER["longitude_of_center",-120],PARAMETER["false_easting",0],PARAMETER["false_northing",-4000000],AUTHORITY["EPSG","3309"],AXIS["X",EAST],AXIS["Y",NORTH]]','+proj=aea +lat_1=34 +lat_2=40.5 +lat_0=0 +lon_0=-120 +x_0=0 +y_0=-4000000 +ellps=clrk66 +datum=NAD27 +units=m +no_defs ');
+INSERT INTO "spatial_ref_sys" ("srid","auth_name","auth_srid","srtext","proj4text") VALUES (993310,'EPSG',3310,'PROJCS["NAD83 / California Albers",GEOGCS["NAD83",DATUM["North_American_Datum_1983",SPHEROID["GRS 1980",6378137,298.257222101,AUTHORITY["EPSG","7019"]],AUTHORITY["EPSG","6269"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4269"]],UNIT["metre",1,AUTHORITY["EPSG","9001"]],PROJECTION["Albers_Conic_Equal_Area"],PARAMETER["standard_parallel_1",34],PARAMETER["standard_parallel_2",40.5],PARAMETER["latitude_of_center",0],PARAMETER["longitude_of_center",-120],PARAMETER["false_easting",0],PARAMETER["false_northing",-4000000],AUTHORITY["EPSG","3310"],AXIS["X",EAST],AXIS["Y",NORTH]]','+proj=aea +lat_1=34 +lat_2=40.5 +lat_0=0 +lon_0=-120 +x_0=0 +y_0=-4000000 +ellps=GRS80 +datum=NAD83 +units=m +no_defs ');
+INSERT INTO "spatial_ref_sys" ("srid","auth_name","auth_srid","srtext","proj4text") VALUES (994269,'EPSG',4269,'GEOGCS["NAD83",DATUM["North_American_Datum_1983",SPHEROID["GRS 1980",6378137,298.257222101,AUTHORITY["EPSG","7019"]],AUTHORITY["EPSG","6269"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4269"]]','+proj=longlat +ellps=GRS80 +datum=NAD83 +no_defs ');
 
 -- ST_Resample
 INSERT INTO raster_resample_dst (rid, rast) VALUES (
@@ -49,22 +49,22 @@ INSERT INTO raster_resample_dst (rid, rast) VALUES (
 ), (
        1.2, (SELECT ST_Resample(
                rast,
-               1003310
+               993310
        ) FROM raster_resample_src)
 ), (
        1.3, (SELECT ST_Resample(
                rast,
-               1003309
+               993309
        ) FROM raster_resample_src)
 ), (
        1.4, (SELECT ST_Resample(
                rast,
-               1004269
+               994269
        ) FROM raster_resample_src)
 ), (
        1.5, (SELECT ST_Resample(
                rast,
-               1003310,
+               993310,
                500, 500,
                NULL, NULL,
                0, 0,
@@ -150,14 +150,14 @@ INSERT INTO raster_resample_dst (rid, rast) VALUES (
 ), (
        1.17, (SELECT ST_Resample(
                rast,
-               1003310,
+               993310,
                50, 50,
                -290, 7
        ) FROM raster_resample_src)
 ), (
        1.18, (SELECT ST_Resample(
                rast,
-               1003309,
+               993309,
                50, 50,
                -290, 7
        ) FROM raster_resample_src)
@@ -172,7 +172,7 @@ INSERT INTO raster_resample_dst (rid, rast) VALUES (
 ), (
        1.20, (SELECT ST_Resample(
                        rast,
-                       1003310,
+                       993310,
                        NULL, NULL,
                        NULL, NULL,
                        3, 3,
@@ -181,7 +181,7 @@ INSERT INTO raster_resample_dst (rid, rast) VALUES (
 ), (
        1.21, (SELECT ST_Resample(
                rast,
-               1003309,
+               993309,
                NULL, NULL,
                NULL, NULL,
                1, 3,
@@ -190,7 +190,7 @@ INSERT INTO raster_resample_dst (rid, rast) VALUES (
 ), (
        1.22, (SELECT ST_Resample(
                rast,
-               1003310,
+               993310,
                500, 500,
                NULL, NULL,
                3, 3,
@@ -199,7 +199,7 @@ INSERT INTO raster_resample_dst (rid, rast) VALUES (
 ), (
        1.23, (SELECT ST_Resample(
                rast,
-               1003310,
+               993310,
                500, 500,
                -12048, 14682,
                0, 6,
@@ -208,7 +208,7 @@ INSERT INTO raster_resample_dst (rid, rast) VALUES (
 ), (
        1.24, (SELECT ST_Resample(
                rast,
-               ST_MakeEmptyRaster(5, 5, -654321, 123456, 50, -100, 3, 0, 1002163)
+               ST_MakeEmptyRaster(5, 5, -654321, 123456, 50, -100, 3, 0, 992163)
        ) FROM raster_resample_src)
 );
 
@@ -216,77 +216,77 @@ INSERT INTO raster_resample_dst (rid, rast) VALUES (
 INSERT INTO raster_resample_dst (rid, rast) VALUES (
        2.1, (SELECT ST_Transform(
                rast,
-               1003310
+               993310
        ) FROM raster_resample_src)
 ), (
        2.2, (SELECT ST_Transform(
                rast,
-               1003309
+               993309
        ) FROM raster_resample_src)
 ), (
        2.3, (SELECT ST_Transform(
                rast,
-               1004269
+               994269
        ) FROM raster_resample_src)
 ), (
        2.4, (SELECT ST_Transform(
                rast,
-               1003310, NULL
+               993310, NULL
        ) FROM raster_resample_src)
 ), (
        2.5, (SELECT ST_Transform(
                rast,
-               1003310, 'Bilinear'
+               993310, 'Bilinear'
        ) FROM raster_resample_src)
 ), (
        2.6, (SELECT ST_Transform(
                rast,
-               1003310, 'Bilinear', NULL::double precision
+               993310, 'Bilinear', NULL::double precision
        ) FROM raster_resample_src)
 ), (
        2.7, (SELECT ST_Transform(
                rast,
-               1003310, 'Cubic', 0.0
+               993310, 'Cubic', 0.0
        ) FROM raster_resample_src)
 ), (
        2.8, (SELECT ST_Transform(
                rast,
-               1003310, 'NearestNeighbour', 0.0
+               993310, 'NearestNeighbour', 0.0
        ) FROM raster_resample_src)
 ), (
        2.9, (SELECT ST_Transform(
                rast,
-               1003310, 'NearestNeighbor', 0.0
+               993310, 'NearestNeighbor', 0.0
        ) FROM raster_resample_src)
 ), (
        2.10, (SELECT ST_Transform(
                rast,
-               1003310, 'NearestNeighbor', 0.125, 500, 500
+               993310, 'NearestNeighbor', 0.125, 500, 500
        ) FROM raster_resample_src)
 ), (
        2.11, (SELECT ST_Transform(
                rast,
-               1003309, 'Cubic', 0., 100, 100
+               993309, 'Cubic', 0., 100, 100
        ) FROM raster_resample_src)
 ), (
        2.12, (SELECT ST_Transform(
                rast,
-               1003310, 'CubicSpline', 0., 2000, 2000
+               993310, 'CubicSpline', 0., 2000, 2000
        ) FROM raster_resample_src)
 ), (
        2.13, (SELECT ST_Transform(
                rast,
-               1003310, 'CubicSpline', 0.1, 1500, 1500
+               993310, 'CubicSpline', 0.1, 1500, 1500
        ) FROM raster_resample_src)
 ), (
        2.14, (SELECT ST_Transform(
                rast,
-               1003310, 500, 500
+               993310, 500, 500
        ) FROM raster_resample_src)
 ), (
        2.15, (SELECT ST_Transform(
                rast,
-               1003310, 750
+               993310, 750
        ) FROM raster_resample_src)
 );
 
@@ -537,10 +537,10 @@ FROM (
        FROM raster_resample_dst
        ORDER BY rid
 ) foo;
-DELETE FROM "spatial_ref_sys" WHERE srid = 1002163;
-DELETE FROM "spatial_ref_sys" WHERE srid = 1003309;
-DELETE FROM "spatial_ref_sys" WHERE srid = 1003310;
-DELETE FROM "spatial_ref_sys" WHERE srid = 1004269;
+DELETE FROM "spatial_ref_sys" WHERE srid = 992163;
+DELETE FROM "spatial_ref_sys" WHERE srid = 993309;
+DELETE FROM "spatial_ref_sys" WHERE srid = 993310;
+DELETE FROM "spatial_ref_sys" WHERE srid = 994269;
 DROP TABLE raster_resample_src;
 DROP TABLE raster_resample_dst;
 DROP FUNCTION make_test_raster();

diff --git a/raster/test/regress/rt_resample_expected b/raster/test/regress/rt_resample_expected
index 0cf634b2f3c0a2d9f2b6e43a0ac106eada40d6e4..7f52a3a12a456e805aa1be952f72a50f56a5c420 100644 (file)
--- a/raster/test/regress/rt_resample_expected
+++ b/raster/test/regress/rt_resample_expected
@@ -2,81 +2,81 @@ NOTICE:  table "raster_resample_src" does not exist, skipping
 NOTICE:  table "raster_resample_dst" does not exist, skipping
 NOTICE:  Values must be provided for both X and Y axis when specifying the scale.  Returning original raster
 NOTICE:  Values must be provided for both X and Y axis when specifying the scale.  Returning original raster
-1.1|1002163|10|10|1|1000.000|-1000.000|0.000|0.000|-500000.000|600000.000|t|t|t
-1.10|1002163|40|40|1|250.000|-250.000|0.000|0.000|-500000.000|600000.000|t|t|t
-1.11|1002163|10|10|1|1000.000|-1000.000|0.000|0.000|-500000.000|600000.000|t|t|t
-1.12|1002163|11|11|1|1000.000|-1000.000|0.000|0.000|-500001.000|600000.000|t|t|t
-1.13|1002163|11|11|1|1000.000|-1000.000|0.000|0.000|-500000.000|600009.000|t|t|t
-1.14|1002163|11|12|1|1000.000|-1000.000|0.000|0.000|-500100.000|600950.000|t|t|t
-1.15|1002163|201|201|1|50.000|-50.000|0.000|0.000|-500010.000|600007.000|t|t|t
-1.16|1002163|84|84|1|121.000|-121.000|0.000|0.000|-500093.000|600039.000|t|t|t
-1.17|1003310|244|244|1|50.000|-50.000|0.000|0.000|950710.000|1409307.000|t|t|t
-1.18|1003309|243|244|1|50.000|-50.000|0.000|0.000|950760.000|1409107.000|t|t|t
-1.19|1002163|10|10|1|1000.000|-1000.000|3.000|3.000|-500000.000|600000.000|t|t|t
-1.2|1003310|12|12|1|1009.894|-1009.894|0.000|0.000|950732.188|1409281.783|t|t|t
-1.20|1003310|12|12|1|1009.894|-1009.894|3.000|3.000|950732.188|1409281.783|t|t|t
-1.21|1003309|12|12|1|1009.916|-1009.916|1.000|3.000|950762.305|1409088.896|t|t|t
-1.22|1003310|24|24|1|500.000|-500.000|3.000|3.000|950732.188|1409281.783|t|t|t
-1.23|1003310|26|26|1|500.000|-500.000|0.000|6.000|950452.000|1409682.000|t|t|t
-1.24|1002163|201|102|1|50.000|-100.000|3.000|0.000|-500021.000|600056.000|t|t|t
-1.3|1003309|12|12|1|1009.916|-1009.916|0.000|0.000|950762.305|1409088.896|t|t|t
-1.4|1004269|12|8|1|0.012|-0.012|0.000|0.000|-107.029|50.206|t|t|t
-1.5|1003310|24|24|1|500.000|-500.000|0.000|0.000|950732.188|1409281.783|t|t|t
-1.6|1002163|10|10|1|1000.000|-1000.000|0.000|0.000|-500000.000|600000.000|t|t|t
-1.7|1002163|10|10|1|1000.000|-1000.000|0.000|0.000|-500000.000|600000.000|t|t|t
-1.8|1002163|20|20|1|500.000|-500.000|0.000|0.000|-500000.000|600000.000|t|t|t
-1.9|1002163|40|40|1|250.000|-250.000|0.000|0.000|-500000.000|600000.000|t|t|t
-2.1|1003310|12|12|1|1009.894|-1009.894|0.000|0.000|950732.188|1409281.783|t|t|t
-2.10|1003310|24|24|1|500.000|-500.000|0.000|0.000|950732.188|1409281.783|t|t|t
-2.11|1003309|121|121|1|100.000|-100.000|0.000|0.000|950762.305|1409088.896|t|t|t
-2.12|1003310|6|6|1|2000.000|-2000.000|0.000|0.000|950732.188|1409281.783|t|t|t
-2.13|1003310|8|8|1|1500.000|-1500.000|0.000|0.000|950732.188|1409281.783|t|t|t
-2.14|1003310|24|24|1|500.000|-500.000|0.000|0.000|950732.188|1409281.783|t|t|t
-2.15|1003310|16|16|1|750.000|-750.000|0.000|0.000|950732.188|1409281.783|t|t|t
-2.2|1003309|12|12|1|1009.916|-1009.916|0.000|0.000|950762.305|1409088.896|t|t|t
-2.3|1004269|12|8|1|0.012|-0.012|0.000|0.000|-107.029|50.206|t|t|t
+1.1|992163|10|10|1|1000.000|-1000.000|0.000|0.000|-500000.000|600000.000|t|t|t
+1.10|992163|40|40|1|250.000|-250.000|0.000|0.000|-500000.000|600000.000|t|t|t
+1.11|992163|10|10|1|1000.000|-1000.000|0.000|0.000|-500000.000|600000.000|t|t|t
+1.12|992163|11|11|1|1000.000|-1000.000|0.000|0.000|-500001.000|600000.000|t|t|t
+1.13|992163|11|11|1|1000.000|-1000.000|0.000|0.000|-500000.000|600009.000|t|t|t
+1.14|992163|11|12|1|1000.000|-1000.000|0.000|0.000|-500100.000|600950.000|t|t|t
+1.15|992163|201|201|1|50.000|-50.000|0.000|0.000|-500010.000|600007.000|t|t|t
+1.16|992163|84|84|1|121.000|-121.000|0.000|0.000|-500093.000|600039.000|t|t|t
+1.17|993310|244|244|1|50.000|-50.000|0.000|0.000|950710.000|1409307.000|t|t|t
+1.18|993309|243|244|1|50.000|-50.000|0.000|0.000|950760.000|1409107.000|t|t|t
+1.19|992163|10|10|1|1000.000|-1000.000|3.000|3.000|-500000.000|600000.000|t|t|t
+1.2|993310|12|12|1|1009.894|-1009.894|0.000|0.000|950732.188|1409281.783|t|t|t
+1.20|993310|12|12|1|1009.894|-1009.894|3.000|3.000|950732.188|1409281.783|t|t|t
+1.21|993309|12|12|1|1009.916|-1009.916|1.000|3.000|950762.305|1409088.896|t|t|t
+1.22|993310|24|24|1|500.000|-500.000|3.000|3.000|950732.188|1409281.783|t|t|t
+1.23|993310|26|26|1|500.000|-500.000|0.000|6.000|950452.000|1409682.000|t|t|t
+1.24|992163|201|102|1|50.000|-100.000|3.000|0.000|-500021.000|600056.000|t|t|t
+1.3|993309|12|12|1|1009.916|-1009.916|0.000|0.000|950762.305|1409088.896|t|t|t
+1.4|994269|12|8|1|0.012|-0.012|0.000|0.000|-107.029|50.206|t|t|t
+1.5|993310|24|24|1|500.000|-500.000|0.000|0.000|950732.188|1409281.783|t|t|t
+1.6|992163|10|10|1|1000.000|-1000.000|0.000|0.000|-500000.000|600000.000|t|t|t
+1.7|992163|10|10|1|1000.000|-1000.000|0.000|0.000|-500000.000|600000.000|t|t|t
+1.8|992163|20|20|1|500.000|-500.000|0.000|0.000|-500000.000|600000.000|t|t|t
+1.9|992163|40|40|1|250.000|-250.000|0.000|0.000|-500000.000|600000.000|t|t|t
+2.1|993310|12|12|1|1009.894|-1009.894|0.000|0.000|950732.188|1409281.783|t|t|t
+2.10|993310|24|24|1|500.000|-500.000|0.000|0.000|950732.188|1409281.783|t|t|t
+2.11|993309|121|121|1|100.000|-100.000|0.000|0.000|950762.305|1409088.896|t|t|t
+2.12|993310|6|6|1|2000.000|-2000.000|0.000|0.000|950732.188|1409281.783|t|t|t
+2.13|993310|8|8|1|1500.000|-1500.000|0.000|0.000|950732.188|1409281.783|t|t|t
+2.14|993310|24|24|1|500.000|-500.000|0.000|0.000|950732.188|1409281.783|t|t|t
+2.15|993310|16|16|1|750.000|-750.000|0.000|0.000|950732.188|1409281.783|t|t|t
+2.2|993309|12|12|1|1009.916|-1009.916|0.000|0.000|950762.305|1409088.896|t|t|t
+2.3|994269|12|8|1|0.012|-0.012|0.000|0.000|-107.029|50.206|t|t|t
 2.4|||||||||||||
-2.5|1003310|12|12|1|1009.894|-1009.894|0.000|0.000|950732.188|1409281.783|t|t|t
+2.5|993310|12|12|1|1009.894|-1009.894|0.000|0.000|950732.188|1409281.783|t|t|t
 2.6|||||||||||||
-2.7|1003310|12|12|1|1009.894|-1009.894|0.000|0.000|950732.188|1409281.783|t|t|t
-2.8|1003310|12|12|1|1009.894|-1009.894|0.000|0.000|950732.188|1409281.783|t|t|t
-2.9|1003310|12|12|1|1009.894|-1009.894|0.000|0.000|950732.188|1409281.783|t|t|t
-3.1|1002163|100|100|1|100.000|-100.000|0.000|0.000|-500000.000|600000.000|t|t|t
-3.2|1002163|100|100|1|100.000|-100.000|0.000|0.000|-500000.000|600000.000|t|t|t
-3.3|1002163|10|10|1|1000.000|-1000.000|0.000|0.000|-500000.000|600000.000|t|t|t
-3.4|1002163|10|10|1|1000.000|-1000.000|0.000|0.000|-500000.000|600000.000|t|t|t
-3.5|1002163|100|100|1|100.000|-100.000|0.000|0.000|-500000.000|600000.000|t|t|t
-3.6|1002163|67|80|1|150.000|-125.000|0.000|0.000|-500000.000|600000.000|t|t|t
-4.1|1002163|10|10|1|1000.000|-1000.000|0.000|0.000|-500000.000|600000.000|t|t|t
-4.2|1002163|10|10|1|1000.000|-1000.000|1.000|1.000|-500000.000|600000.000|t|t|t
-4.3|1002163|10|10|1|1000.000|-1000.000|0.500|0.000|-500000.000|600000.000|t|t|t
-4.4|1002163|10|10|1|1000.000|-1000.000|10.000|10.000|-500000.000|600000.000|t|t|t
-4.5|1002163|10|10|1|1000.000|-1000.000|10.000|10.000|-500000.000|600000.000|t|t|t
-4.6|1002163|10|10|1|1000.000|-1000.000|10.000|10.000|-500000.000|600000.000|t|t|t
-5.1|1002163|10|10|1|1000.000|-1000.000|0.000|0.000|-500000.000|600000.000|t|t|t
-5.10|1002163|11|11|1|1000.000|-1000.000|0.000|0.000|-500005.000|600001.000|t|t|t
-5.11|1002163|12|12|1|1000.000|-1000.000|0.000|0.000|-500991.000|600991.000|t|t|t
-5.12|1002163|200|200|1|50.000|-50.000|0.000|0.000|-500000.000|600000.000|t|t|t
-5.13|1002163|200|200|1|50.000|-50.000|0.000|0.000|-500000.000|600000.000|t|t|t
-5.14|1002163|201|201|1|50.000|-50.000|0.000|0.000|-500001.000|600000.000|t|t|t
-5.15|1002163|201|201|1|50.000|-50.000|0.000|0.000|-500001.000|600000.000|t|t|t
-5.16|1002163|202|201|1|50.000|-50.000|0.000|0.000|-500049.000|600000.000|t|t|t
-5.17|1002163|201|202|1|50.000|-50.000|0.000|0.000|-500000.000|600049.000|t|t|t
-5.18|1002163|201|202|1|50.000|-50.000|0.000|0.000|-500000.000|600041.000|t|t|t
-5.19|1002163|201|201|1|50.000|-50.000|0.000|0.000|-500000.000|600001.000|t|t|t
-5.2|1002163|10|10|1|1000.000|-1000.000|0.000|0.000|-500000.000|600000.000|t|t|t
-5.20|1002163|201|201|1|50.000|-50.000|0.000|0.000|-500000.000|600009.000|t|t|t
-5.21|1002163|201|201|1|50.000|-50.000|0.000|0.000|-500005.000|600001.000|t|t|t
-5.22|1002163|202|202|1|50.000|-50.000|0.000|0.000|-500041.000|600041.000|t|t|t
-5.23|1002163|84|84|1|121.000|-121.000|0.000|0.000|-500093.000|600039.000|t|t|t
-5.24|1002163|84|84|1|121.000|-121.000|0.000|0.000|-500000.000|600040.000|t|t|t
-5.25|1002163|84|84|1|121.000|-121.000|0.000|0.000|-500000.000|600048.000|t|t|t
-5.26|1002163|84|84|1|121.000|-121.000|0.000|0.000|-500098.000|600040.000|t|t|t
-5.27|1002163|84|84|1|121.000|-121.000|0.000|0.000|-500037.000|600030.000|t|t|t
-5.3|1002163|11|11|1|1000.000|-1000.000|0.000|0.000|-500001.000|600000.000|t|t|t
-5.4|1002163|11|11|1|1000.000|-1000.000|0.000|0.000|-500001.000|600000.000|t|t|t
-5.5|1002163|12|11|1|1000.000|-1000.000|0.000|0.000|-500999.000|600000.000|t|t|t
-5.6|1002163|11|12|1|1000.000|-1000.000|0.000|0.000|-500000.000|600999.000|t|t|t
-5.7|1002163|11|12|1|1000.000|-1000.000|0.000|0.000|-500000.000|600991.000|t|t|t
-5.8|1002163|11|11|1|1000.000|-1000.000|0.000|0.000|-500000.000|600001.000|t|t|t
-5.9|1002163|11|11|1|1000.000|-1000.000|0.000|0.000|-500000.000|600009.000|t|t|t
+2.7|993310|12|12|1|1009.894|-1009.894|0.000|0.000|950732.188|1409281.783|t|t|t
+2.8|993310|12|12|1|1009.894|-1009.894|0.000|0.000|950732.188|1409281.783|t|t|t
+2.9|993310|12|12|1|1009.894|-1009.894|0.000|0.000|950732.188|1409281.783|t|t|t
+3.1|992163|100|100|1|100.000|-100.000|0.000|0.000|-500000.000|600000.000|t|t|t
+3.2|992163|100|100|1|100.000|-100.000|0.000|0.000|-500000.000|600000.000|t|t|t
+3.3|992163|10|10|1|1000.000|-1000.000|0.000|0.000|-500000.000|600000.000|t|t|t
+3.4|992163|10|10|1|1000.000|-1000.000|0.000|0.000|-500000.000|600000.000|t|t|t
+3.5|992163|100|100|1|100.000|-100.000|0.000|0.000|-500000.000|600000.000|t|t|t
+3.6|992163|67|80|1|150.000|-125.000|0.000|0.000|-500000.000|600000.000|t|t|t
+4.1|992163|10|10|1|1000.000|-1000.000|0.000|0.000|-500000.000|600000.000|t|t|t
+4.2|992163|10|10|1|1000.000|-1000.000|1.000|1.000|-500000.000|600000.000|t|t|t
+4.3|992163|10|10|1|1000.000|-1000.000|0.500|0.000|-500000.000|600000.000|t|t|t
+4.4|992163|10|10|1|1000.000|-1000.000|10.000|10.000|-500000.000|600000.000|t|t|t
+4.5|992163|10|10|1|1000.000|-1000.000|10.000|10.000|-500000.000|600000.000|t|t|t
+4.6|992163|10|10|1|1000.000|-1000.000|10.000|10.000|-500000.000|600000.000|t|t|t
+5.1|992163|10|10|1|1000.000|-1000.000|0.000|0.000|-500000.000|600000.000|t|t|t
+5.10|992163|11|11|1|1000.000|-1000.000|0.000|0.000|-500005.000|600001.000|t|t|t
+5.11|992163|12|12|1|1000.000|-1000.000|0.000|0.000|-500991.000|600991.000|t|t|t
+5.12|992163|200|200|1|50.000|-50.000|0.000|0.000|-500000.000|600000.000|t|t|t
+5.13|992163|200|200|1|50.000|-50.000|0.000|0.000|-500000.000|600000.000|t|t|t
+5.14|992163|201|201|1|50.000|-50.000|0.000|0.000|-500001.000|600000.000|t|t|t
+5.15|992163|201|201|1|50.000|-50.000|0.000|0.000|-500001.000|600000.000|t|t|t
+5.16|992163|202|201|1|50.000|-50.000|0.000|0.000|-500049.000|600000.000|t|t|t
+5.17|992163|201|202|1|50.000|-50.000|0.000|0.000|-500000.000|600049.000|t|t|t
+5.18|992163|201|202|1|50.000|-50.000|0.000|0.000|-500000.000|600041.000|t|t|t
+5.19|992163|201|201|1|50.000|-50.000|0.000|0.000|-500000.000|600001.000|t|t|t
+5.2|992163|10|10|1|1000.000|-1000.000|0.000|0.000|-500000.000|600000.000|t|t|t
+5.20|992163|201|201|1|50.000|-50.000|0.000|0.000|-500000.000|600009.000|t|t|t
+5.21|992163|201|201|1|50.000|-50.000|0.000|0.000|-500005.000|600001.000|t|t|t
+5.22|992163|202|202|1|50.000|-50.000|0.000|0.000|-500041.000|600041.000|t|t|t
+5.23|992163|84|84|1|121.000|-121.000|0.000|0.000|-500093.000|600039.000|t|t|t
+5.24|992163|84|84|1|121.000|-121.000|0.000|0.000|-500000.000|600040.000|t|t|t
+5.25|992163|84|84|1|121.000|-121.000|0.000|0.000|-500000.000|600048.000|t|t|t
+5.26|992163|84|84|1|121.000|-121.000|0.000|0.000|-500098.000|600040.000|t|t|t
+5.27|992163|84|84|1|121.000|-121.000|0.000|0.000|-500037.000|600030.000|t|t|t
+5.3|992163|11|11|1|1000.000|-1000.000|0.000|0.000|-500001.000|600000.000|t|t|t
+5.4|992163|11|11|1|1000.000|-1000.000|0.000|0.000|-500001.000|600000.000|t|t|t
+5.5|992163|12|11|1|1000.000|-1000.000|0.000|0.000|-500999.000|600000.000|t|t|t
+5.6|992163|11|12|1|1000.000|-1000.000|0.000|0.000|-500000.000|600999.000|t|t|t
+5.7|992163|11|12|1|1000.000|-1000.000|0.000|0.000|-500000.000|600991.000|t|t|t
+5.8|992163|11|11|1|1000.000|-1000.000|0.000|0.000|-500000.000|600001.000|t|t|t
+5.9|992163|11|11|1|1000.000|-1000.000|0.000|0.000|-500000.000|600009.000|t|t|t