galaxy-dev March 2010

galaxy-dev@lists.galaxyproject.org

36 participants
171 discussions

[hg] galaxy 3478: Added a new tool set for performing multivaria...
by Greg Von Kuster 08 Mar '10

08 Mar '10

details: http://www.bx.psu.edu/hg/galaxy/rev/11dcd9d18663 changeset: 3478:11dcd9d18663 user: gua110 date: Thu Mar 04 11:48:10 2010 -0500 description: Added a new tool set for performing multivariate statistical analyses diffstat: test-data/cca_out1.tabular | 22 + test-data/cca_out2.pdf | 858 +++++++++++++++++++++ test-data/iris.tabular | 151 +++ test-data/kcca_out1.tabular | 304 +++++++ test-data/kcca_out2.tabular | 304 +++++++ test-data/kpca_out1.tabular | 304 +++++++ test-data/kpca_out2.pdf | 1190 ++++++++++++++++++++++++++++++ test-data/kpca_out3.tabular | 304 +++++++ test-data/kpca_out4.pdf | 624 +++++++++++++++ test-data/pca_out1.tabular | 159 ++++ test-data/pca_out2.pdf | 705 +++++++++++++++++ test-data/pca_out3.tabular | 159 ++++ test-data/pca_out4.pdf | 705 +++++++++++++++++ tool_conf.xml.sample | 6 + tools/multivariate_stats/cca.py | 159 ++++ tools/multivariate_stats/cca.xml | 95 ++ tools/multivariate_stats/kcca.py | 146 +++ tools/multivariate_stats/kcca.xml | 150 +++ tools/multivariate_stats/kpca.py | 134 +++ tools/multivariate_stats/kpca.xml | 151 +++ tools/multivariate_stats/pca.py | 98 ++ tools/multivariate_stats/pca.xml | 76 + tools/regVariation/linear_regression.xml | 8 +- 23 files changed, 6809 insertions(+), 3 deletions(-) diffs (truncated from 6932 to 3000 lines): diff -r d9afcaa386f6 -r 11dcd9d18663 test-data/cca_out1.tabular --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/cca_out1.tabular Thu Mar 04 11:48:10 2010 -0500 @@ -0,0 +1,22 @@ +#Component 1 2 +#Correlation 0.940897180432 0.131074795925 +#F-statistic 144.410560578 2.5696974623 +#p-value 6.21285598619e-68 0.111075110551 +#X-Coefficients 1 2 +c3 1.50661351834 -3.37790409332 +c4 -0.537226204038 3.65944099051 +#Y-Coefficients 1 2 +c1 6.35046749378 3.37940792566 +c2 -2.6597206473 6.66976562808 +#X-Loadings 1 2 +c3 0.989395177676 0.145248691528 +c4 0.913276653253 0.407339851504 +#Y-Loadings 1 2 +c1 0.928869265104 0.370407732566 +c2 -0.469775462051 0.882785939656 +#X-CrossLoadings 1 2 +c3 0.930919133009 0.0190384426004 +c4 0.859299428 0.0533919879079 +#Y-CrossLoadings 1 2 +c1 0.873970472527 0.0485511179549 +c2 -0.44201040768 0.115710986885 diff -r d9afcaa386f6 -r 11dcd9d18663 test-data/cca_out2.pdf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/cca_out2.pdf Thu Mar 04 11:48:10 2010 -0500 @@ -0,0 +1,858 @@ +%PDF-1.4 +%âãÏÓ\r +1 0 obj +<< +/CreationDate (D:20100303132536) +/ModDate (D:20100303132536) +/Title (R Graphics Output) +/Producer (R 2.10.0) +/Creator (R) +>> +endobj +2 0 obj +<< +/Type /Catalog +/Pages 3 0 R +>> +endobj +5 0 obj +<< +/Type /Page +/Parent 3 0 R +/Contents 6 0 R +/Resources 4 0 R +>> +endobj +6 0 obj +<< +/Length 7 0 R +>> +stream +q +Q q 59.04 73.44 486.72 443.52 re W n +0.000 0.000 0.000 RG +0.75 w +[] 0 d +1 J +1 j +10.00 M +302.40 110.40 m +302.40 480.00 l +S +302.40 356.80 m +306.64 356.68 l +310.87 356.31 l +315.07 355.71 l +319.21 354.86 l +323.29 353.79 l +327.29 352.47 l +331.18 350.94 l +334.97 349.18 l +338.62 347.21 l +342.13 345.04 l +345.49 342.66 l +348.68 340.10 l +351.68 337.37 l +354.49 334.47 l +357.09 331.41 l +359.48 328.21 l +361.64 324.88 l +363.57 321.43 l +365.25 317.88 l +366.69 314.24 l +367.88 310.52 l +368.80 306.74 l +369.47 302.92 l +369.87 299.07 l +370.00 295.20 l +369.87 291.33 l +369.47 287.48 l +368.80 283.66 l +367.88 279.88 l +366.69 276.16 l +365.25 272.52 l +363.57 268.97 l +361.64 265.52 l +359.48 262.19 l +357.09 258.99 l +354.49 255.93 l +351.68 253.03 l +348.68 250.30 l +345.49 247.74 l +342.13 245.36 l +338.62 243.19 l +334.97 241.22 l +331.18 239.46 l +327.29 237.93 l +323.29 236.61 l +319.21 235.54 l +315.07 234.69 l +310.87 234.09 l +306.64 233.72 l +302.40 233.60 l +298.16 233.72 l +293.93 234.09 l +289.73 234.69 l +285.59 235.54 l +281.51 236.61 l +277.51 237.93 l +273.62 239.46 l +269.83 241.22 l +266.18 243.19 l +262.67 245.36 l +259.31 247.74 l +256.12 250.30 l +253.12 253.03 l +250.31 255.93 l +247.71 258.99 l +245.32 262.19 l +243.16 265.52 l +241.23 268.97 l +239.55 272.52 l +238.11 276.16 l +236.92 279.88 l +236.00 283.66 l +235.33 287.48 l +234.93 291.33 l +234.80 295.20 l +234.93 299.07 l +235.33 302.92 l +236.00 306.74 l +236.92 310.52 l +238.11 314.24 l +239.55 317.88 l +241.23 321.43 l +243.16 324.88 l +245.32 328.21 l +247.71 331.41 l +250.31 334.47 l +253.12 337.37 l +256.12 340.10 l +259.31 342.66 l +262.67 345.04 l +266.18 347.21 l +269.83 349.18 l +273.62 350.94 l +277.51 352.47 l +281.51 353.79 l +285.59 354.86 l +289.73 355.71 l +293.93 356.31 l +298.16 356.68 l +302.40 356.80 l +S +0.75 w +[ 0.00 4.00] 0 d +302.40 315.73 m +303.81 315.69 l +305.22 315.57 l +306.62 315.37 l +308.00 315.09 l +309.36 314.73 l +310.70 314.29 l +311.99 313.78 l +313.26 313.19 l +314.47 312.54 l +315.64 311.81 l +316.76 311.02 l +317.83 310.17 l +318.83 309.26 l +319.76 308.29 l +320.63 307.27 l +321.43 306.20 l +322.15 305.09 l +322.79 303.94 l +323.35 302.76 l +323.83 301.55 l +324.23 300.31 l +324.53 299.05 l +324.76 297.77 l +324.89 296.49 l +324.93 295.20 l +324.89 293.91 l +324.76 292.63 l +324.53 291.35 l +324.23 290.09 l +323.83 288.85 l +323.35 287.64 l +322.79 286.46 l +322.15 285.31 l +321.43 284.20 l +320.63 283.13 l +319.76 282.11 l +318.83 281.14 l +317.83 280.23 l +316.76 279.38 l +315.64 278.59 l +314.47 277.86 l +313.26 277.21 l +311.99 276.62 l +310.70 276.11 l +309.36 275.67 l +308.00 275.31 l +306.62 275.03 l +305.22 274.83 l +303.81 274.71 l +302.40 274.67 l +300.99 274.71 l +299.58 274.83 l +298.18 275.03 l +296.80 275.31 l +295.44 275.67 l +294.10 276.11 l +292.81 276.62 l +291.54 277.21 l +290.33 277.86 l +289.16 278.59 l +288.04 279.38 l +286.97 280.23 l +285.97 281.14 l +285.04 282.11 l +284.17 283.13 l +283.37 284.20 l +282.65 285.31 l +282.01 286.46 l +281.45 287.64 l +280.97 288.85 l +280.57 290.09 l +280.27 291.35 l +280.04 292.63 l +279.91 293.91 l +279.87 295.20 l +279.91 296.49 l +280.04 297.77 l +280.27 299.05 l +280.57 300.31 l +280.97 301.55 l +281.45 302.76 l +282.01 303.94 l +282.65 305.09 l +283.37 306.20 l +284.17 307.27 l +285.04 308.29 l +285.97 309.26 l +286.97 310.17 l +288.04 311.02 l +289.16 311.81 l +290.33 312.54 l +291.54 313.19 l +292.81 313.78 l +294.10 314.29 l +295.44 314.73 l +296.80 315.09 l +298.18 315.37 l +299.58 315.57 l +300.99 315.69 l +302.40 315.73 l +S +302.40 397.87 m +309.47 397.66 l +316.52 397.06 l +323.51 396.05 l +330.42 394.64 l +337.22 392.84 l +343.88 390.66 l +350.37 388.10 l +356.68 385.17 l +362.77 381.88 l +368.62 378.26 l +374.22 374.31 l +379.53 370.04 l +384.53 365.48 l +389.21 360.64 l +393.55 355.55 l +397.53 350.21 l +401.13 344.66 l +404.34 338.91 l +407.15 332.99 l +409.55 326.93 l +411.53 320.73 l +413.07 314.44 l +414.18 308.07 l +414.84 301.65 l +415.07 295.20 l +414.84 288.75 l +414.18 282.33 l +413.07 275.96 l +411.53 269.67 l +409.55 263.47 l +407.15 257.41 l +404.34 251.49 l +401.13 245.74 l +397.53 240.19 l +393.55 234.85 l +389.21 229.76 l +384.53 224.92 l +379.53 220.36 l +374.22 216.09 l +368.62 212.14 l +362.77 208.52 l +356.68 205.23 l +350.37 202.30 l +343.88 199.74 l +337.22 197.56 l +330.42 195.76 l +323.51 194.35 l +316.52 193.34 l +309.47 192.74 l +302.40 192.53 l +295.33 192.74 l +288.28 193.34 l +281.29 194.35 l +274.38 195.76 l +267.58 197.56 l +260.92 199.74 l +254.43 202.30 l +248.12 205.23 l +242.03 208.52 l +236.18 212.14 l +230.58 216.09 l +225.27 220.36 l +220.27 224.92 l +215.59 229.76 l +211.25 234.85 l +207.27 240.19 l +203.67 245.74 l +200.46 251.49 l +197.65 257.41 l +195.25 263.47 l +193.27 269.67 l +191.73 275.96 l +190.62 282.33 l +189.96 288.75 l +189.73 295.20 l +189.96 301.65 l +190.62 308.07 l +191.73 314.44 l +193.27 320.73 l +195.25 326.93 l +197.65 332.99 l +200.46 338.91 l +203.67 344.66 l +207.27 350.21 l +211.25 355.55 l +215.59 360.64 l +220.27 365.48 l +225.27 370.04 l +230.58 374.31 l +236.18 378.26 l +242.03 381.88 l +248.12 385.17 l +254.43 388.10 l +260.92 390.66 l +267.58 392.84 l +274.38 394.64 l +281.29 396.05 l +288.28 397.06 l +295.33 397.66 l +302.40 397.87 l +S +BT +0.000 0.000 0.000 rg +/F2 1 Tf 18.00 0.00 -0.00 18.00 144.39 483.94 Tm [(X V) 70 (ar) -15 (iab) 20 (les)] TJ +ET +BT +/F2 1 Tf 18.00 0.00 -0.00 18.00 369.72 483.94 Tm [(Y V) 70 (ar) -15 (iab) 20 (les)] TJ +ET +0.75 w +[] 0 d + 239.55 319.19 m + 201.34 339.30 l + 209.96 352.91 l + 248.17 332.81 l +b +BT +/F2 1 Tf 10.39 -6.00 6.00 10.39 175.46 355.52 Tm (c3) Tj +ET + 248.17 257.59 m + 215.62 240.47 l + 206.99 254.08 l + 239.55 271.21 l +b +BT +/F2 1 Tf 10.39 6.00 -6.00 10.39 178.33 229.91 Tm (c4) Tj +ET + 356.63 332.81 m + 390.31 350.52 l + 398.93 336.91 l + 365.25 319.19 l +b +BT +/F2 1 Tf 10.39 6.00 -6.00 10.39 418.37 349.18 Tm (c1) Tj +ET + 365.25 271.21 m + 373.87 266.67 l + 365.24 253.06 l + 356.63 257.59 l +b +BT +/F2 1 Tf 10.39 -6.00 6.00 10.39 415.49 236.25 Tm (c2) Tj +ET +Q q +BT +0.000 0.000 0.000 rg +/F3 1 Tf 14.00 0.00 -0.00 14.00 209.98 541.45 Tm [(Explained V) 60 (ariance f) 20 (or CV 1)] TJ +ET +BT +/F2 1 Tf 12.00 0.00 -0.00 12.00 252.04 4.32 Tm [(Canonical V) 70 (ar) -15 (iate1)] TJ +ET +Q +endstream +endobj +7 0 obj +5992 +endobj +8 0 obj +<< +/Type /Page +/Parent 3 0 R +/Contents 9 0 R +/Resources 4 0 R +>> +endobj +9 0 obj +<< +/Length 10 0 R +>> +stream +q +Q q 59.04 73.44 486.72 443.52 re W n +Q q 59.04 73.44 486.72 443.52 re W n +0.000 0.000 0.000 RG +0.75 w +[] 0 d +1 J +1 j +10.00 M +302.40 110.40 m +302.40 480.00 l +S +302.40 356.80 m +306.64 356.68 l +310.87 356.31 l +315.07 355.71 l +319.21 354.86 l +323.29 353.79 l +327.29 352.47 l +331.18 350.94 l +334.97 349.18 l +338.62 347.21 l +342.13 345.04 l +345.49 342.66 l +348.68 340.10 l +351.68 337.37 l +354.49 334.47 l +357.09 331.41 l +359.48 328.21 l +361.64 324.88 l +363.57 321.43 l +365.25 317.88 l +366.69 314.24 l +367.88 310.52 l +368.80 306.74 l +369.47 302.92 l +369.87 299.07 l +370.00 295.20 l +369.87 291.33 l +369.47 287.48 l +368.80 283.66 l +367.88 279.88 l +366.69 276.16 l +365.25 272.52 l +363.57 268.97 l +361.64 265.52 l +359.48 262.19 l +357.09 258.99 l +354.49 255.93 l +351.68 253.03 l +348.68 250.30 l +345.49 247.74 l +342.13 245.36 l +338.62 243.19 l +334.97 241.22 l +331.18 239.46 l +327.29 237.93 l +323.29 236.61 l +319.21 235.54 l +315.07 234.69 l +310.87 234.09 l +306.64 233.72 l +302.40 233.60 l +298.16 233.72 l +293.93 234.09 l +289.73 234.69 l +285.59 235.54 l +281.51 236.61 l +277.51 237.93 l +273.62 239.46 l +269.83 241.22 l +266.18 243.19 l +262.67 245.36 l +259.31 247.74 l +256.12 250.30 l +253.12 253.03 l +250.31 255.93 l +247.71 258.99 l +245.32 262.19 l +243.16 265.52 l +241.23 268.97 l +239.55 272.52 l +238.11 276.16 l +236.92 279.88 l +236.00 283.66 l +235.33 287.48 l +234.93 291.33 l +234.80 295.20 l +234.93 299.07 l +235.33 302.92 l +236.00 306.74 l +236.92 310.52 l +238.11 314.24 l +239.55 317.88 l +241.23 321.43 l +243.16 324.88 l +245.32 328.21 l +247.71 331.41 l +250.31 334.47 l +253.12 337.37 l +256.12 340.10 l +259.31 342.66 l +262.67 345.04 l +266.18 347.21 l +269.83 349.18 l +273.62 350.94 l +277.51 352.47 l +281.51 353.79 l +285.59 354.86 l +289.73 355.71 l +293.93 356.31 l +298.16 356.68 l +302.40 356.80 l +S +0.75 w +[ 0.00 4.00] 0 d +302.40 315.73 m +303.81 315.69 l +305.22 315.57 l +306.62 315.37 l +308.00 315.09 l +309.36 314.73 l +310.70 314.29 l +311.99 313.78 l +313.26 313.19 l +314.47 312.54 l +315.64 311.81 l +316.76 311.02 l +317.83 310.17 l +318.83 309.26 l +319.76 308.29 l +320.63 307.27 l +321.43 306.20 l +322.15 305.09 l +322.79 303.94 l +323.35 302.76 l +323.83 301.55 l +324.23 300.31 l +324.53 299.05 l +324.76 297.77 l +324.89 296.49 l +324.93 295.20 l +324.89 293.91 l +324.76 292.63 l +324.53 291.35 l +324.23 290.09 l +323.83 288.85 l +323.35 287.64 l +322.79 286.46 l +322.15 285.31 l +321.43 284.20 l +320.63 283.13 l +319.76 282.11 l +318.83 281.14 l +317.83 280.23 l +316.76 279.38 l +315.64 278.59 l +314.47 277.86 l +313.26 277.21 l +311.99 276.62 l +310.70 276.11 l +309.36 275.67 l +308.00 275.31 l +306.62 275.03 l +305.22 274.83 l +303.81 274.71 l +302.40 274.67 l +300.99 274.71 l +299.58 274.83 l +298.18 275.03 l +296.80 275.31 l +295.44 275.67 l +294.10 276.11 l +292.81 276.62 l +291.54 277.21 l +290.33 277.86 l +289.16 278.59 l +288.04 279.38 l +286.97 280.23 l +285.97 281.14 l +285.04 282.11 l +284.17 283.13 l +283.37 284.20 l +282.65 285.31 l +282.01 286.46 l +281.45 287.64 l +280.97 288.85 l +280.57 290.09 l +280.27 291.35 l +280.04 292.63 l +279.91 293.91 l +279.87 295.20 l +279.91 296.49 l +280.04 297.77 l +280.27 299.05 l +280.57 300.31 l +280.97 301.55 l +281.45 302.76 l +282.01 303.94 l +282.65 305.09 l +283.37 306.20 l +284.17 307.27 l +285.04 308.29 l +285.97 309.26 l +286.97 310.17 l +288.04 311.02 l +289.16 311.81 l +290.33 312.54 l +291.54 313.19 l +292.81 313.78 l +294.10 314.29 l +295.44 314.73 l +296.80 315.09 l +298.18 315.37 l +299.58 315.57 l +300.99 315.69 l +302.40 315.73 l +S +302.40 397.87 m +309.47 397.66 l +316.52 397.06 l +323.51 396.05 l +330.42 394.64 l +337.22 392.84 l +343.88 390.66 l +350.37 388.10 l +356.68 385.17 l +362.77 381.88 l +368.62 378.26 l +374.22 374.31 l +379.53 370.04 l +384.53 365.48 l +389.21 360.64 l +393.55 355.55 l +397.53 350.21 l +401.13 344.66 l +404.34 338.91 l +407.15 332.99 l +409.55 326.93 l +411.53 320.73 l +413.07 314.44 l +414.18 308.07 l +414.84 301.65 l +415.07 295.20 l +414.84 288.75 l +414.18 282.33 l +413.07 275.96 l +411.53 269.67 l +409.55 263.47 l +407.15 257.41 l +404.34 251.49 l +401.13 245.74 l +397.53 240.19 l +393.55 234.85 l +389.21 229.76 l +384.53 224.92 l +379.53 220.36 l +374.22 216.09 l +368.62 212.14 l +362.77 208.52 l +356.68 205.23 l +350.37 202.30 l +343.88 199.74 l +337.22 197.56 l +330.42 195.76 l +323.51 194.35 l +316.52 193.34 l +309.47 192.74 l +302.40 192.53 l +295.33 192.74 l +288.28 193.34 l +281.29 194.35 l +274.38 195.76 l +267.58 197.56 l +260.92 199.74 l +254.43 202.30 l +248.12 205.23 l +242.03 208.52 l +236.18 212.14 l +230.58 216.09 l +225.27 220.36 l +220.27 224.92 l +215.59 229.76 l +211.25 234.85 l +207.27 240.19 l +203.67 245.74 l +200.46 251.49 l +197.65 257.41 l +195.25 263.47 l +193.27 269.67 l +191.73 275.96 l +190.62 282.33 l +189.96 288.75 l +189.73 295.20 l +189.96 301.65 l +190.62 308.07 l +191.73 314.44 l +193.27 320.73 l +195.25 326.93 l +197.65 332.99 l +200.46 338.91 l +203.67 344.66 l +207.27 350.21 l +211.25 355.55 l +215.59 360.64 l +220.27 365.48 l +225.27 370.04 l +230.58 374.31 l +236.18 378.26 l +242.03 381.88 l +248.12 385.17 l +254.43 388.10 l +260.92 390.66 l +267.58 392.84 l +274.38 394.64 l +281.29 396.05 l +288.28 397.06 l +295.33 397.66 l +302.40 397.87 l +S +BT +0.000 0.000 0.000 rg +/F2 1 Tf 18.00 0.00 -0.00 18.00 144.39 483.94 Tm [(X V) 70 (ar) -15 (iab) 20 (les)] TJ +ET +BT +/F2 1 Tf 18.00 0.00 -0.00 18.00 369.72 483.94 Tm [(Y V) 70 (ar) -15 (iab) 20 (les)] TJ +ET +0.75 w +[] 0 d + 239.55 319.19 m + 238.72 319.63 l + 247.34 333.24 l + 248.17 332.81 l +b +BT +/F2 1 Tf 10.39 -6.00 6.00 10.39 175.46 355.52 Tm (c3) Tj +ET + 248.17 257.59 m + 241.69 254.19 l + 233.07 267.80 l + 239.55 271.21 l +b +BT +/F2 1 Tf 10.39 6.00 -6.00 10.39 178.33 229.91 Tm (c4) Tj +ET + 356.63 332.81 m + 361.99 335.62 l + 370.61 322.01 l + 365.25 319.19 l +b +BT +/F2 1 Tf 10.39 6.00 -6.00 10.39 418.37 349.18 Tm (c1) Tj +ET + 365.25 271.21 m + 395.67 255.20 l + 387.05 241.59 l + 356.63 257.59 l +b +BT +/F2 1 Tf 10.39 -6.00 6.00 10.39 415.49 236.25 Tm (c2) Tj +ET +Q q +BT +0.000 0.000 0.000 rg +/F3 1 Tf 14.00 0.00 -0.00 14.00 209.98 541.45 Tm [(Explained V) 60 (ariance f) 20 (or CV 2)] TJ +ET +BT +/F2 1 Tf 12.00 0.00 -0.00 12.00 252.04 4.32 Tm [(Canonical V) 70 (ar) -15 (iate2)] TJ +ET +Q +endstream +endobj +10 0 obj +6029 +endobj +3 0 obj +<< +/Type /Pages +/Kids [ +5 0 R +8 0 R +] +/Count 2 +/MediaBox [0 0 576 576] +>> +endobj +4 0 obj +<< +/ProcSet [/PDF /Text] +/Font <</F2 12 0 R /F3 13 0 R >> +/ExtGState << >> +>> +endobj +11 0 obj +<< +/Type /Encoding +/BaseEncoding /WinAnsiEncoding +/Differences [ 45/minus 96/quoteleft +144/dotlessi /grave /acute /circumflex /tilde /macron /breve /dotaccent +/dieresis /.notdef /ring /cedilla /.notdef /hungarumlaut /ogonek /caron /space] +>> +endobj +12 0 obj << +/Type /Font +/Subtype /Type1 +/Name /F2 +/BaseFont /Helvetica +/Encoding 11 0 R +>> endobj +13 0 obj << +/Type /Font +/Subtype /Type1 +/Name /F3 +/BaseFont /Helvetica-Bold +/Encoding 11 0 R +>> endobj +xref +0 14 +0000000000 65535 f +0000000021 00000 n +0000000164 00000 n +0000012542 00000 n +0000012631 00000 n +0000000213 00000 n +0000000293 00000 n +0000006338 00000 n +0000006358 00000 n +0000006438 00000 n +0000012521 00000 n +0000012724 00000 n +0000012982 00000 n +0000013080 00000 n +trailer +<< +/Size 14 +/Info 1 0 R +/Root 2 0 R +>> +startxref +13183 +%%EOF diff -r d9afcaa386f6 -r 11dcd9d18663 test-data/iris.tabular --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/iris.tabular Thu Mar 04 11:48:10 2010 -0500 @@ -0,0 +1,151 @@ +5.1 3.5 1.4 0.2 Iris-setosa +4.9 3.0 1.4 0.2 Iris-setosa +4.7 3.2 1.3 0.2 Iris-setosa +4.6 3.1 1.5 0.2 Iris-setosa +5.0 3.6 1.4 0.2 Iris-setosa +5.4 3.9 1.7 0.4 Iris-setosa +4.6 3.4 1.4 0.3 Iris-setosa +5.0 3.4 1.5 0.2 Iris-setosa +4.4 2.9 1.4 0.2 Iris-setosa +4.9 3.1 1.5 0.1 Iris-setosa +5.4 3.7 1.5 0.2 Iris-setosa +4.8 3.4 1.6 0.2 Iris-setosa +4.8 3.0 1.4 0.1 Iris-setosa +4.3 3.0 1.1 0.1 Iris-setosa +5.8 4.0 1.2 0.2 Iris-setosa +5.7 4.4 1.5 0.4 Iris-setosa +5.4 3.9 1.3 0.4 Iris-setosa +5.1 3.5 1.4 0.3 Iris-setosa +5.7 3.8 1.7 0.3 Iris-setosa +5.1 3.8 1.5 0.3 Iris-setosa +5.4 3.4 1.7 0.2 Iris-setosa +5.1 3.7 1.5 0.4 Iris-setosa +4.6 3.6 1.0 0.2 Iris-setosa +5.1 3.3 1.7 0.5 Iris-setosa +4.8 3.4 1.9 0.2 Iris-setosa +5.0 3.0 1.6 0.2 Iris-setosa +5.0 3.4 1.6 0.4 Iris-setosa +5.2 3.5 1.5 0.2 Iris-setosa +5.2 3.4 1.4 0.2 Iris-setosa +4.7 3.2 1.6 0.2 Iris-setosa +4.8 3.1 1.6 0.2 Iris-setosa +5.4 3.4 1.5 0.4 Iris-setosa +5.2 4.1 1.5 0.1 Iris-setosa +5.5 4.2 1.4 0.2 Iris-setosa +4.9 3.1 1.5 0.1 Iris-setosa +5.0 3.2 1.2 0.2 Iris-setosa +5.5 3.5 1.3 0.2 Iris-setosa +4.9 3.1 1.5 0.1 Iris-setosa +4.4 3.0 1.3 0.2 Iris-setosa +5.1 3.4 1.5 0.2 Iris-setosa +5.0 3.5 1.3 0.3 Iris-setosa +4.5 2.3 1.3 0.3 Iris-setosa +4.4 3.2 1.3 0.2 Iris-setosa +5.0 3.5 1.6 0.6 Iris-setosa +5.1 3.8 1.9 0.4 Iris-setosa +4.8 3.0 1.4 0.3 Iris-setosa +5.1 3.8 1.6 0.2 Iris-setosa +4.6 3.2 1.4 0.2 Iris-setosa +5.3 3.7 1.5 0.2 Iris-setosa +5.0 3.3 1.4 0.2 Iris-setosa +7.0 3.2 4.7 1.4 Iris-versicolor +6.4 3.2 4.5 1.5 Iris-versicolor +6.9 3.1 4.9 1.5 Iris-versicolor +5.5 2.3 4.0 1.3 Iris-versicolor +6.5 2.8 4.6 1.5 Iris-versicolor +5.7 2.8 4.5 1.3 Iris-versicolor +6.3 3.3 4.7 1.6 Iris-versicolor +4.9 2.4 3.3 1.0 Iris-versicolor +6.6 2.9 4.6 1.3 Iris-versicolor +5.2 2.7 3.9 1.4 Iris-versicolor +5.0 2.0 3.5 1.0 Iris-versicolor +5.9 3.0 4.2 1.5 Iris-versicolor +6.0 2.2 4.0 1.0 Iris-versicolor +6.1 2.9 4.7 1.4 Iris-versicolor +5.6 2.9 3.6 1.3 Iris-versicolor +6.7 3.1 4.4 1.4 Iris-versicolor +5.6 3.0 4.5 1.5 Iris-versicolor +5.8 2.7 4.1 1.0 Iris-versicolor +6.2 2.2 4.5 1.5 Iris-versicolor +5.6 2.5 3.9 1.1 Iris-versicolor +5.9 3.2 4.8 1.8 Iris-versicolor +6.1 2.8 4.0 1.3 Iris-versicolor +6.3 2.5 4.9 1.5 Iris-versicolor +6.1 2.8 4.7 1.2 Iris-versicolor +6.4 2.9 4.3 1.3 Iris-versicolor +6.6 3.0 4.4 1.4 Iris-versicolor +6.8 2.8 4.8 1.4 Iris-versicolor +6.7 3.0 5.0 1.7 Iris-versicolor +6.0 2.9 4.5 1.5 Iris-versicolor +5.7 2.6 3.5 1.0 Iris-versicolor +5.5 2.4 3.8 1.1 Iris-versicolor +5.5 2.4 3.7 1.0 Iris-versicolor +5.8 2.7 3.9 1.2 Iris-versicolor +6.0 2.7 5.1 1.6 Iris-versicolor +5.4 3.0 4.5 1.5 Iris-versicolor +6.0 3.4 4.5 1.6 Iris-versicolor +6.7 3.1 4.7 1.5 Iris-versicolor +6.3 2.3 4.4 1.3 Iris-versicolor +5.6 3.0 4.1 1.3 Iris-versicolor +5.5 2.5 4.0 1.3 Iris-versicolor +5.5 2.6 4.4 1.2 Iris-versicolor +6.1 3.0 4.6 1.4 Iris-versicolor +5.8 2.6 4.0 1.2 Iris-versicolor +5.0 2.3 3.3 1.0 Iris-versicolor +5.6 2.7 4.2 1.3 Iris-versicolor +5.7 3.0 4.2 1.2 Iris-versicolor +5.7 2.9 4.2 1.3 Iris-versicolor +6.2 2.9 4.3 1.3 Iris-versicolor +5.1 2.5 3.0 1.1 Iris-versicolor +5.7 2.8 4.1 1.3 Iris-versicolor +6.3 3.3 6.0 2.5 Iris-virginica +5.8 2.7 5.1 1.9 Iris-virginica +7.1 3.0 5.9 2.1 Iris-virginica +6.3 2.9 5.6 1.8 Iris-virginica +6.5 3.0 5.8 2.2 Iris-virginica +7.6 3.0 6.6 2.1 Iris-virginica +4.9 2.5 4.5 1.7 Iris-virginica +7.3 2.9 6.3 1.8 Iris-virginica +6.7 2.5 5.8 1.8 Iris-virginica +7.2 3.6 6.1 2.5 Iris-virginica +6.5 3.2 5.1 2.0 Iris-virginica +6.4 2.7 5.3 1.9 Iris-virginica +6.8 3.0 5.5 2.1 Iris-virginica +5.7 2.5 5.0 2.0 Iris-virginica +5.8 2.8 5.1 2.4 Iris-virginica +6.4 3.2 5.3 2.3 Iris-virginica +6.5 3.0 5.5 1.8 Iris-virginica +7.7 3.8 6.7 2.2 Iris-virginica +7.7 2.6 6.9 2.3 Iris-virginica +6.0 2.2 5.0 1.5 Iris-virginica +6.9 3.2 5.7 2.3 Iris-virginica +5.6 2.8 4.9 2.0 Iris-virginica +7.7 2.8 6.7 2.0 Iris-virginica +6.3 2.7 4.9 1.8 Iris-virginica +6.7 3.3 5.7 2.1 Iris-virginica +7.2 3.2 6.0 1.8 Iris-virginica +6.2 2.8 4.8 1.8 Iris-virginica +6.1 3.0 4.9 1.8 Iris-virginica +6.4 2.8 5.6 2.1 Iris-virginica +7.2 3.0 5.8 1.6 Iris-virginica +7.4 2.8 6.1 1.9 Iris-virginica +7.9 3.8 6.4 2.0 Iris-virginica +6.4 2.8 5.6 2.2 Iris-virginica +6.3 2.8 5.1 1.5 Iris-virginica +6.1 2.6 5.6 1.4 Iris-virginica +7.7 3.0 6.1 2.3 Iris-virginica +6.3 3.4 5.6 2.4 Iris-virginica +6.4 3.1 5.5 1.8 Iris-virginica +6.0 3.0 4.8 1.8 Iris-virginica +6.9 3.1 5.4 2.1 Iris-virginica +6.7 3.1 5.6 2.4 Iris-virginica +6.9 3.1 5.1 2.3 Iris-virginica +5.8 2.7 5.1 1.9 Iris-virginica +6.8 3.2 5.9 2.3 Iris-virginica +6.7 3.3 5.7 2.5 Iris-virginica +6.7 3.0 5.2 2.3 Iris-virginica +6.3 2.5 5.0 1.9 Iris-virginica +6.5 3.0 5.2 2.0 Iris-virginica +6.2 3.4 5.4 2.3 Iris-virginica +5.9 3.0 5.1 1.8 Iris-virginica + diff -r d9afcaa386f6 -r 11dcd9d18663 test-data/kcca_out1.tabular --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/kcca_out1.tabular Thu Mar 04 11:48:10 2010 -0500 @@ -0,0 +1,304 @@ +#Component 1 2 3 4 +#Correlation -0.999499965799 0.999499965799 -0.937388978867 0.937388978867 +#Estimated X-coefficients 1 2 3 4 +1 -0.00159226306681 -0.00159226306681 0.0347922336733 0.0347922336734 +2 -0.00110978716164 -0.00110978716146 0.0325550634964 0.0325550634964 +3 0.000104871380431 0.00010487138039 0.0183484731624 0.0183484731623 +4 0.00102415734634 0.00102415734636 -0.00485228064778 -0.00485228064775 +5 -0.000169999236028 -0.000169999236004 0.0524192345792 0.0524192345792 +6 0.00230258587505 0.00230258587502 0.0196794881537 0.0196794881537 +7 0.00145199861756 0.00145199861756 0.00575575672441 0.00575575672438 +8 -0.00159595387536 -0.00159595387541 0.0382833844726 0.0382833844726 +9 0.00360877029314 0.00360877029312 -0.0750970801906 -0.0750970801906 +10 -0.00136083597277 -0.00136083597278 0.0318384011561 0.0318384011561 +11 -0.000806991906868 -0.000806991906869 0.00139328931528 0.00139328931529 +12 -0.000200007372161 -0.000200007372182 0.0392128558972 0.0392128558972 +13 -0.000376620449557 -0.000376620449546 0.0293209660811 0.0293209660811 +14 0.00424812920862 0.00424812920862 -0.131314655808 -0.131314655808 +15 0.00440751040841 0.00440751040844 -0.0215875677083 -0.0215875677083 +16 0.0158137737287 0.0158137737287 0.0413483506506 0.0413483506506 +17 0.00230258096229 0.00230258096233 0.0196792569231 0.0196792569231 +18 -0.00159229337587 -0.00159229337587 0.034791794765 0.034791794765 +19 0.000470908151429 0.000470908151435 -0.033768454116 -0.033768454116 +20 0.00175754173735 0.00175754173739 0.0594708458718 0.0594708458718 +21 -0.00334320757685 -0.00334320757684 -0.0210157518991 -0.0210157518991 +22 0.000356998265944 0.00035699826596 0.0506142212928 0.0506142212928 +23 0.00287793787049 0.00287793787051 0.0198921560768 0.0198921560768 +24 -0.00253287592115 -0.00253287592111 0.0229011408536 0.0229011408536 +25 -0.000199966741261 -0.000199966741259 0.039213190751 0.0392131907509 +26 -0.00177266177845 -0.00177266177847 0.0283910522008 0.0283910522008 +27 -0.00159590123482 -0.00159590123485 0.038282588671 0.038282588671 +28 -0.00208498848365 -0.00208498848366 0.0204255781063 0.0204255781063 +29 -0.00267192971883 -0.00267192971883 0.0138389269867 0.0138389269867 +30 0.000104980469185 0.000104980469188 0.0183490300234 0.0183490300234 +31 -0.000627859471217 -0.000627859471211 0.0286050882842 0.0286050882842 +32 -0.00334315632058 -0.0033431563206 -0.021015317998 -0.021015317998 +33 0.00737949966525 0.00737949966526 0.0757911137154 0.0757911137153 +34 0.00926681020655 0.00926681020653 0.0362748843231 0.0362748843231 +35 -0.00136084775243 -0.00136084775244 0.0318385553343 0.0318385553343 +36 -0.00208708693783 -0.00208708693783 0.029318413035 0.029318413035 +37 -0.00291824596158 -0.0029182459616 -0.0316400169446 -0.0316400169446 +38 -0.00136084705751 -0.00136084705752 0.0318383985846 0.0318383985845 +39 0.00317922708464 0.00317922708461 -0.0784504607557 -0.0784504607557 +40 -0.00217929118556 -0.00217929118555 0.0282052840325 0.0282052840325 +41 -0.00100896730901 -0.00100896730901 0.0448689392189 0.0448689392188 +42 0.0088378418176 0.00883784181758 0.0414569436219 0.0414569436219 +43 0.00286479080033 0.00286479080034 -0.0775226035577 -0.0775226035577 +44 -0.00100892420468 -0.00100892420468 0.044868959418 0.044868959418 +45 0.00175754329615 0.00175754329613 0.0594711681396 0.0594711681395 +46 -0.000376629073915 -0.000376629073921 0.0293209668801 0.0293209668801 +47 0.00175754920557 0.00175754920562 0.0594710191761 0.0594710191761 +48 0.000960826589906 0.000960826589907 -0.00320856169229 -0.00320856169234 +49 -0.000526936996666 -0.000526936996691 0.0192804658813 0.0192804658813 +50 -0.00194953734422 -0.0019495373442 0.0329782808594 0.0329782808594 +51 6.55505160483e-05 6.55505160251e-05 0.0963097412008 0.0963097412008 +52 -0.0011718760537 -0.00117187605367 -0.0201469456847 -0.0201469456848 +53 0.000176671254579 0.000176671254581 0.0847986697478 0.0847986697478 +54 0.00296310911687 0.00296310911688 0.0293431942735 0.0293431942735 +55 0.000607776190472 0.000607776190486 0.0117139207005 0.0117139207005 +56 -0.00261157098019 -0.00261157098018 -0.0654067243745 -0.0654067243745 +57 -0.0015146048768 -0.0015146048768 -0.0376121620644 -0.0376121620644 +58 0.00404504063063 0.00404504063063 0.092945109105 0.092945109105 +59 0.00036877721416 0.000368777214162 0.0295027716538 0.0295027716538 +60 -0.00104700002988 -0.00104700002991 0.0224831294608 0.0224831294608 +61 0.0106423484729 0.0106423484729 0.152385267998 0.152385267998 +62 -0.0031520185592 -0.00315201855917 -0.0846778020825 -0.0846778020825 +63 0.00557212171653 0.00557212171651 0.0129291757862 0.0129291757862 +64 -0.00189259304055 -0.00189259304053 -0.0699730283655 -0.0699730283655 +65 -0.00329284250094 -0.00329284250094 -0.059850140447 -0.059850140447 +66 -4.19255339958e-05 -4.19255339884e-05 0.0484549594796 0.0484549594797 +67 -0.00372238588335 -0.00372238588336 -0.0632035000244 -0.0632035000244 +68 -0.00164700987437 -0.00164700987437 -0.0637729313267 -0.0637729313267 +69 0.00650587912972 0.00650587912971 0.0346722693281 0.0346722693281 +70 0.000134953294294 0.000134953294323 -0.0187985221915 -0.0187985221915 +71 -0.00346646664488 -0.00346646664488 -0.0837494602393 -0.0837494602393 +72 -0.00129113838679 -0.00129113838678 -0.0638064857952 -0.0638064857951 +73 0.00251974364983 0.00251974364985 0.0022055760206 0.00220557602061 +74 -0.00129116036811 -0.0012911603681 -0.0638066193927 -0.0638066193927 +75 -0.000427852329099 -0.000427852329122 -0.0177210266231 -0.0177210266231 +76 -6.07104681603e-05 -6.07104681845e-05 0.0261490639915 0.0261490639915 +77 0.00140452555267 0.00140452555267 0.0790608976409 0.0790608976408 +78 0.000209327997368 0.000209327997393 0.0491700187535 0.0491700187535 +79 -0.00233986780648 -0.00233986780648 -0.0783320881243 -0.0783320881243 +80 -0.000900328222947 -0.00090032822295 -0.0446524406999 -0.0446524406999 +81 0.00147282851191 0.00147282851192 0.0122725620319 0.0122725620319 +82 0.00147281209976 0.00147281209977 0.0122725086224 0.0122725086224 +83 -0.00164700173013 -0.00164700173014 -0.06377323849 -0.06377323849 +84 -0.000967708203349 -0.000967708203351 -0.0631482116068 -0.0631482116068 +85 -0.00351986557339 -0.00351986557338 -0.030908097987 -0.030908097987 +86 -0.00259272827972 -0.00259272827972 -0.0717927951437 -0.0717927951437 +87 -4.18965141628e-05 -4.18965141522e-05 0.0484552570532 0.0484552570532 +88 0.00530734252965 0.00530734252963 0.0352616047044 0.0352616047044 +89 -0.00372239312775 -0.00372239312776 -0.0632034676432 -0.0632034676432 +90 0.000175478311049 0.000175478311042 -0.00371336493864 -0.00371336493865 +91 -0.000939577619534 -0.000939577619522 -0.0178449710765 -0.0178449710765 +92 -0.00232205533945 -0.00232205533946 -0.0733261558013 -0.0733261558013 +93 -0.00070634156182 -0.000706341561824 -0.052035469948 -0.052035469948 +94 0.00487236705406 0.00487236705406 0.105852225573 0.105852225573 +95 -0.00192078284287 -0.00192078284288 -0.0446670554592 -0.0446670554592 +96 -0.00364258343827 -0.00364258343827 -0.0749260068443 -0.0749260068443 +97 -0.00321303286671 -0.0032130328667 -0.0715723152411 -0.0715723152411 +98 -0.00140604417103 -0.00140604417105 -0.0565884530031 -0.0565884530031 +99 0.00150148065434 0.00150148065431 0.0627184287393 0.0627184287394 +100 -0.00261158477 -0.00261158476999 -0.0654066442111 -0.0654066442112 +101 -0.00151458006047 -0.00151458006047 -0.0376119582238 -0.0376119582238 +102 -0.00164700343889 -0.00164700343888 -0.06377288888 -0.06377288888 +103 0.000251068468294 0.000251068468298 0.0975435120003 0.0975435120003 +104 -0.000908080899935 -0.000908080899925 -0.0388460712661 -0.0388460712661 +105 -0.000423216718942 -0.000423216718959 0.00219435777697 0.00219435777695 +106 0.000255624978855 0.00025562497886 -0.0480116282141 -0.0480116282141 +107 0.00274773787057 0.00274773787055 0.0769590274139 0.0769590274139 +108 0.000341726654612 0.000341726654597 0.0766246057863 0.0766246057863 +109 0.00406672119039 0.0040667211904 0.0935756884052 0.0935756884052 +110 0.00168012039808 0.00168012039807 0.114599686992 0.114599686992 +111 -0.000737702734906 -0.000737702734914 0.0031222049116 0.00312220491159 +112 0.000944239770407 0.000944239770391 -0.00253804367075 -0.00253804367075 +113 0.000373533380611 0.000373533380627 0.0695413493313 0.0695413493313 +114 0.000214764783387 0.000214764783394 -0.0305207662625 -0.0305207662625 +115 -0.0024176574971 -0.00241765749712 -0.0727895122943 -0.0727895122943 +116 -0.00117184106569 -0.00117184106569 -0.020147379235 -0.020147379235 +117 -0.000423245890376 -0.000423245890374 0.00219411724102 0.002194117241 +118 0.00511278621358 0.00511278621362 -0.0711192328408 -0.0711192328408 +119 0.00374158288488 0.00374158288488 -0.0820025184858 -0.0820025184857 +120 0.00557210528707 0.00557210528706 0.0129285972769 0.0129285972769 +121 0.000113440914253 0.000113440914255 0.0864426484813 0.0864426484813 +122 -0.00269141225358 -0.00269141225358 -0.0536835150794 -0.0536835150794 +123 0.00203032906275 0.00203032906276 -0.102756314558 -0.102756314558 +124 0.000463985316019 0.00046398531602 -0.0236637080927 -0.0236637080927 +125 3.23398695696e-05 3.23398695946e-05 0.0537583523329 0.0537583523329 +126 -0.000236944823046 -0.000236944823052 0.0914993805259 0.0914993805259 +127 -0.000804521731675 -0.000804521731666 -0.0504218395017 -0.0504218395017 +128 -0.00232209010852 -0.00232209010854 -0.0733257347061 -0.0733257347061 +129 0.000173591516244 0.000173591516248 -0.0115550211641 -0.0115550211641 +130 7.75013058308e-05 7.7501305819e-05 0.0905707020934 0.0905707020934 +131 0.000856346120183 0.000856346120186 0.0542528201863 0.0542528201863 +132 0.00833835823432 0.0083383582343 -0.232668169832 -0.232668169832 +133 0.000173619999677 0.000173619999659 -0.0115549698037 -0.0115549698037 +134 -0.000306631445279 -0.000306631445295 -0.0326803614331 -0.032680361433 +135 0.000420140644556 0.00042014064454 -0.0430529283201 -0.0430529283201 +136 0.0009993072384 0.000999307238389 -0.112276057196 -0.112276057196 +137 -0.00116097843462 -0.00116097843463 -0.0323074368066 -0.0323074368066 +138 -0.00110862543672 -0.0011086254367 -0.0217901323169 -0.0217901323169 +139 -0.0027693146479 -0.00276931464791 -0.0816839889734 -0.0816839889734 +140 0.000176676195733 0.000176676195739 0.0847993817539 0.0847993817538 +141 -4.19162508702e-05 -4.19162509088e-05 0.048455131876 0.048455131876 +142 0.000176690917474 0.000176690917456 0.0847992182528 0.0847992182528 +143 -0.00164700027723 -0.00164700027725 -0.0637729771005 -0.0637729771005 +144 5.90748259444e-05 5.90748259518e-05 0.0704687213602 0.0704687213602 +145 3.23787858251e-05 3.23787858432e-05 0.0537581665472 0.0537581665472 +146 0.000209342022695 0.000209342022689 0.0491697329809 0.0491697329809 +147 0.00251978363427 0.00251978363426 0.00220560706463 0.00220560706461 +148 -0.000423180575963 -0.000423180576007 0.00219444456054 0.00219444456053 +149 -0.00165893244585 -0.00165893244587 -0.0500493239232 -0.0500493239232 +150 -0.00315200955113 -0.00315200955116 -0.0846780840986 -0.0846780840986 +#Estimated Y-coefficients 1 2 3 4 +1 -0.00207802379602 0.00207802379604 0.0147525748618 -0.0147525748618 +2 -0.00207803770129 0.00207803770129 0.014754894517 -0.0147548945171 +3 -0.00186125958712 0.00186125958712 0.00430906718496 -0.00430906718501 +4 -0.00204203652249 0.00204203652248 0.00946170484263 -0.00946170484263 +5 -0.00207799868272 0.00207799868272 0.0147524900087 -0.0147524900087 +6 0.00466745517136 -0.00466745517131 -0.00473638718146 0.00473638718143 +7 0.00127661314181 -0.0012766131418 0.0308096049073 -0.0308096049073 +8 -0.00204202966462 0.0020420296646 0.00946178027838 -0.00946178027836 +9 -0.00207798104461 0.00207798104462 0.0147522000925 -0.0147522000924 +10 -0.00592375302166 0.00592375302167 -0.0133800658341 0.0133800658341 +11 -0.00204201746389 0.0020420174639 0.00946180738045 -0.00946180738041 +12 -0.00184159719676 0.00184159719675 -0.00664656658428 0.00664656658427 +13 -0.00595967357466 0.00595967357467 -0.00808941808643 0.00808941808643 +14 -0.00418938935089 0.0041893893509 -0.108608995338 0.108608995338 +15 -0.0013012394729 0.00130123947293 -0.0272679367976 0.0272679367976 +16 0.00418518885797 -0.00418518885798 0.0339388340086 -0.0339388340086 +17 0.00436596427266 -0.00436596427265 0.0287864784987 -0.0287864784987 +18 0.00127661524729 -0.00127661524728 0.0308095328996 -0.0308095328996 +19 0.00179485276965 -0.00179485276965 -0.013157096566 0.013157096566 +20 0.00131259459476 -0.00131259459477 0.0255187095653 -0.0255187095653 +21 -0.00155977265386 0.00155977265387 -0.0292141997607 0.0292141997607 +22 0.0041852046722 -0.0041852046722 0.0339387026427 -0.0339387026427 +23 0.00120614277783 -0.00120614277786 -0.17724731125 0.17724731125 +24 0.00710764806912 -0.00710764806913 -0.00432447811811 0.00432447811812 +25 -0.0010444934481 0.00104449344812 -0.0793995548327 0.0793995548327 +26 -0.00184159033127 0.00184159033127 -0.00664665686254 0.00664665686252 +27 0.00438565231829 -0.00438565231831 0.0178306826236 -0.0178306826236 +28 -0.00204202477243 0.00204202477243 0.0094617038311 -0.00946170383111 +29 -0.0020779828495 0.0020779828495 0.0147525280146 -0.0147525280146 +30 -0.00184157136867 0.00184157136867 -0.00664674784976 0.00664674784975 +31 -0.0018415799055 0.00184157990549 -0.00664671809202 0.00664671809201 +32 0.0041851833166 -0.0041851833166 0.0339389281678 -0.0339389281679 +33 -0.00592375365141 0.00592375365141 -0.013380052398 0.0133800523981 +34 -0.00207798401128 0.00207798401127 0.0147525387324 -0.0147525387324 +35 -0.00592374684747 0.00592374684747 -0.0133800953506 0.0133800953506 +36 -0.00130125322065 0.00130125322063 -0.0272678229064 0.0272678229064 +37 -0.00186126364156 0.00186126364158 0.00430983712957 -0.00430983712957 +38 -0.0059237521318 0.00592375213181 -0.013380153675 0.013380153675 +39 -0.00186126331287 0.00186126331284 0.00430983539031 -0.00430983539032 +40 -0.00204201942989 0.00204201942987 0.00946167601189 -0.00946167601188 +41 0.00149334720855 -0.00149334720853 0.0203666076652 -0.0203666076652 +42 0.00149334486802 -0.00149334486802 0.0203666572745 -0.0203666572745 +43 -0.00186125654471 0.00186125654469 0.00430985522631 -0.00430985522632 +44 0.00888546279299 -0.00888546279299 0.0107444363185 -0.0107444363185 +45 0.00518271680498 -0.005182716805 -0.0549225278324 0.0549225278324 +46 0.00127661752013 -0.00127661752012 0.0308093216206 -0.0308093216206 +47 -0.00184157347647 0.00184157347649 -0.00664647143535 0.00664647143536 +48 -0.00207797495723 0.00207797495723 0.0147525398855 -0.0147525398855 +49 -0.00204202136105 0.00204202136103 0.00946156002567 -0.00946156002569 +50 -0.00207797529532 0.00207797529531 0.0147525447432 -0.0147525447431 +51 0.000173374914166 -0.000173374914135 0.0183900180943 -0.0183900180943 +52 0.000334232451934 -0.000334232451922 -0.0231810555233 0.0231810555233 +53 0.000845589590767 -0.000845589590778 0.0130254684027 -0.0130254684028 +54 -0.00050620465143 0.000506204651423 -0.00673528987195 0.00673528987195 +55 0.000459214630557 -0.000459214630566 -0.0149813117293 0.0149813117293 +56 -0.000615457853335 0.000615457853327 0.0299232782723 -0.0299232782723 +57 0.000879971359249 -0.00087997135925 -0.0255719364993 0.0255719364993 +58 0.00260036335542 -0.0026003633554 -0.0195491080562 0.0195491080562 +59 -0.000490443228571 0.000490443228557 0.0381226217921 -0.0381226217921 +60 0.000342085855682 -0.000342085855703 -0.0444375409715 0.0444375409715 +61 0.000316768459576 -0.000316768459588 0.0237688603721 -0.0237688603721 +62 0.00016878609145 -0.000168786091454 -0.0447717783554 0.0447717783554 +63 -0.00277577058767 0.00277577058768 0.0897601662258 -0.0897601662258 +64 0.000173360052024 -0.000173360052007 0.0183900476597 -0.0183900476597 +65 0.00165683452716 -0.00165683452713 -0.0548302244871 0.0548302244871 +66 -0.000187042401834 0.000187042401845 -0.00623951407567 0.00623951407569 +67 0.000334221183017 -0.000334221183032 -0.0231809127501 0.0231809127501 +68 -0.00296633524758 0.0029663352476 0.0976503457326 -0.0976503457326 +69 0.000334209374616 -0.000334209374652 -0.0231808821748 0.0231808821748 +70 -0.00157894710211 0.0015789471021 0.0483095137533 -0.0483095137533 +71 0.00107261772161 -0.0010726177216 -0.038389379181 0.038389379181 +72 -0.000506194774864 0.000506194774861 -0.00673520248594 0.00673520248594 +73 0.000845585488371 -0.000845585488368 0.0130257485428 -0.0130257485428 +74 -0.00099649083861 0.000996490838618 0.0784164003274 -0.0784164003274 +75 -0.000780572502124 0.000780572502132 0.015267209426 -0.015267209426 +76 -0.000187049589314 0.000187049589319 -0.0062394904277 0.0062394904277 +77 0.000303631239276 -0.000303631239272 0.0278134201998 -0.0278134201999 +78 0.00138186467032 -0.0013818646703 -0.0107230643199 0.0107230643199 +79 0.000334201978329 -0.00033420197834 -0.0231807067633 0.0231807067632 +80 0.000316783844032 -0.000316783844047 0.0237685795838 -0.0237685795838 +81 -0.00111921630232 0.00111921630232 0.0375207814487 -0.0375207814487 +82 -0.0013854108222 0.00138541082219 0.0569766380778 -0.0569766380778 +83 -0.000827746868009 0.000827746867994 0.0155883232139 -0.0155883232139 +84 0.0013709210119 -0.00137092101189 0.0122186887524 -0.0122186887524 +85 0.000334212989212 -0.000334212989235 -0.0231806937032 0.0231806937032 +86 0.000622483770067 -0.000622483770066 -0.0426415468143 0.0426415468143 +87 0.000591717557469 -0.000591717557463 -0.00611123603734 0.00611123603733 +88 -0.000718358722683 0.000718358722686 0.0223631657984 -0.0223631657984 +89 -0.000696756836574 0.000696756836581 0.00115505660589 -0.00115505660589 +90 -0.000506204477782 0.000506204477782 -0.00673516408525 0.00673516408525 +91 -0.00135690159436 0.00135690159436 0.0537867933428 -0.0537867933428 +92 4.08718730297e-05 -4.08718730283e-05 0.00951997394088 -0.00951997394087 +93 -0.00114474880537 0.00114474880538 0.0246887231278 -0.0246887231278 +94 0.00260039073663 -0.00260039073661 -0.0195489870951 0.0195489870951 +95 -0.000780885311649 0.000780885311643 0.00833259826846 -0.00833259826847 +96 -0.00141938985277 0.00141938985275 0.0397560748719 -0.0397560748719 +97 -0.000780881620895 0.000780881620912 0.00833252194557 -0.00833252194556 +98 -0.000780566605387 0.000780566605416 0.0152673550777 -0.0152673550777 +99 0.00760602648383 -0.00760602648382 -0.129536312408 0.129536312408 +100 -0.000696760328124 0.000696760328164 0.00115497725961 -0.00115497725962 +101 -0.00678600258327 0.00678600258326 -0.0465649501276 0.0465649501276 +102 0.00111985118299 -0.00111985118299 -0.0133311713893 0.0133311713893 +103 0.00179128299969 -0.00179128299967 -0.0117629965412 0.0117629965413 +104 0.00245919021666 -0.00245919021666 0.00824989787101 -0.00824989787102 +105 -8.76492503355e-05 8.76492503354e-05 -0.000496254333627 0.000496254333633 +106 0.000761967432587 -0.000761967432566 -7.83367381654e-05 7.83367381754e-05 +107 0.000752341381348 -0.00075234138135 -0.0565467602809 0.0565467602809 +108 0.00493978422624 -0.00493978422623 -0.0423953299002 0.0423953299002 +109 0.00324788826973 -0.00324788826971 -0.00283722024642 0.00283722024643 +110 -0.00637676293374 0.00637676293375 -0.0562338429038 0.0562338429038 +111 0.000503159820755 -0.000503159820738 -0.0127616264245 0.0127616264245 +112 0.00140440261799 -0.00140440261802 0.000816319075632 -0.000816319075634 +113 0.000240534267342 -0.000240534267329 0.00957268947576 -0.00957268947577 +114 0.000384206839893 -0.000384206839888 -0.0217977011189 0.0217977011189 +115 -0.00634724290611 0.0063472429061 -0.0162945308629 0.016294530863 +116 -0.00354841350688 0.0035484135069 0.00558402036707 -0.00558402036708 +117 0.00215492172491 -0.00215492172492 0.00963144402194 -0.00963144402194 +118 -0.00275396275316 0.00275396275316 0.044837028746 -0.044837028746 +119 -0.0119814923701 0.01198149237 0.193515094085 -0.193515094085 +120 0.000963734153542 -0.00096373415354 0.0226428351944 -0.0226428351944 +121 -0.00244037523199 0.00244037523198 0.00546591341746 -0.00546591341744 +122 0.000266029608572 -0.00026602960856 -0.0314149983787 0.0314149983787 +123 -0.000348614897638 0.000348614897651 0.0397566415853 -0.0397566415853 +124 0.00119624036114 -0.00119624036116 -0.0286752098822 0.0286752098822 +125 0.000911513554691 -0.000911513554674 0.0039503682424 -0.00395036824241 +126 0.00416496074481 -0.00416496074481 -0.021645721723 0.021645721723 +127 0.00107259886096 -0.00107259886096 -0.0383893990267 0.0383893990268 +128 0.00119624052347 -0.00119624052348 -0.0286751556142 0.0286751556142 +129 0.00054481896186 -0.000544818961844 0.00819147865674 -0.00819147865675 +130 0.00318546200452 -0.00318546200451 0.0194033902589 -0.0194033902589 +131 0.00426070161194 -0.00426070161192 -0.0346242888528 0.0346242888528 +132 0.00376292316169 -0.00376292316171 -0.0418071757284 0.0418071757283 +133 -0.00087631493066 0.000876314930647 0.0105907484353 -0.0105907484353 +134 0.0010826505927 -0.00108265059272 0.0316795216603 -0.0316795216603 +135 0.00169020541014 -0.00169020541014 0.0744521027106 -0.0744521027107 +136 -0.000692087598833 0.000692087598854 -0.0298567664795 0.0298567664795 +137 -0.00532133931133 0.00532133931132 0.00197677995068 -0.00197677995068 +138 0.00215491723505 -0.00215491723504 0.00963119640396 -0.00963119640397 +139 0.00107260919521 -0.00107260919522 -0.0383891865417 0.0383891865417 +140 -3.59016028262e-06 3.59016027307e-06 0.00811701973019 -0.00811701973017 +141 -0.00532134139947 0.00532134139946 0.00197683432762 -0.00197683432763 +142 -0.00383298415331 0.00383298415332 -0.00856391328718 0.00856391328718 +143 0.00111984317293 -0.00111984317294 -0.0133312669044 0.0133312669044 +144 -0.0015606294529 0.00156062945289 -0.0102470797367 0.0102470797367 +145 -0.00812507234928 0.00812507234927 -0.0209114480533 0.0209114480533 +146 -0.00370288186472 0.00370288186472 -0.000652009420983 0.000652009420984 +147 0.0010009233634 -0.00100092336337 -0.0223679412346 0.0223679412346 +148 0.00063323482203 -0.000633234822026 -0.0048486309278 0.00484863092779 +149 -0.00335548443538 0.00335548443542 0.00963297901935 -0.00963297901936 +150 0.00143331899859 -0.00143331899856 -0.0100217011426 0.0100217011426 diff -r d9afcaa386f6 -r 11dcd9d18663 test-data/kcca_out2.tabular --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/kcca_out2.tabular Thu Mar 04 11:48:10 2010 -0500 @@ -0,0 +1,304 @@ +#Component 1 2 +#Correlation -0.997722247293 0.997722247293 +#Estimated X-coefficients 1 2 +1 -0.00122731840743 0.00122731840742 +2 -0.00122731106403 0.00122731106387 +3 0.00166794295518 -0.00166794295525 +4 -0.00173362374287 0.00173362374291 +5 -0.00122731862766 0.00122731862769 +6 -0.0029554785628 0.00295547856271 +7 -0.00461498736385 0.00461498736384 +8 -0.00173362629843 0.00173362629836 +9 -0.00122732331673 0.00122732331672 +10 0.00688097994625 -0.00688097994624 +11 -0.00173362826184 0.00173362826186 +12 -8.37004866976e-05 8.37004867417e-05 +13 0.00635554576927 -0.00635554576925 +14 0.00873026392029 -0.00873026392028 +15 0.00652732389235 -0.00652732389232 +16 -0.00603047472024 0.00603047472021 +17 0.00873631760763 -0.00873631760765 +18 -0.00461499433646 0.00461499433645 +19 -0.00219576033584 0.00219576033585 +20 -0.00691698230553 0.00691698230556 +21 0.00292177636345 -0.00292177636347 +22 -0.00603047506996 0.00603047506995 +23 0.0172373160862 -0.0172373160862 +24 0.00249397988781 -0.00249397988776 +25 0.00798852789597 -0.00798852789598 +26 -8.37043942033e-05 8.37043942473e-05 +27 -0.00630705042003 0.00630705042003 +28 -0.00173363075689 0.0017336307569 +29 -0.00122732018654 0.00122732018653 +30 -8.3706566709e-05 8.37065667174e-05 +31 -8.37037029634e-05 8.37037029813e-05 +32 -0.00603046924565 0.00603046924565 +33 0.00688097728833 -0.00688097728833 +34 -0.00122732731419 0.00122732731425 +35 0.00688098087012 -0.00688098087015 +36 0.00652731714093 -0.00652731714093 +37 0.00166793992756 -0.00166793992754 +38 0.00688097839506 -0.00688097839508 +39 0.00166794141434 -0.00166794141431 +40 -0.00173363131319 0.00173363131319 +41 0.0014004109735 -0.00140041097347 +42 0.00140041664328 -0.00140041664323 +43 0.00166794191139 -0.00166794191136 +44 0.0155877231838 -0.0155877231838 +45 0.00840352861092 -0.0084035286109 +46 -0.0046149948871 0.00461499488714 +47 -8.37036024121e-05 8.37036023937e-05 +48 -0.00122732358385 0.00122732358381 +49 -0.00173363170928 0.00173363170926 +50 -0.00122732256951 0.0012273225695 +51 0.000660960845406 -0.000660960845404 +52 -0.00213814090606 0.00213814090606 +53 -0.00172474025037 0.00172474025036 +54 -1.15192134321e-05 1.15192134284e-05 +55 -0.00270262833397 0.00270262833397 +56 0.00215511291935 -0.00215511291935 +57 -0.00300187218663 0.00300187218663 +58 0.00185267145989 -0.0018526714599 +59 0.00472457250519 -0.00472457250517 +60 0.00384665232521 -0.0038466523252 +61 -0.00310019835939 0.0031001983594 +62 0.00258744962442 -0.00258744962443 +63 0.00641438900071 -0.00641438900071 +64 0.00066096075849 -0.000660960758496 +65 0.00671559094757 -0.00671559094758 +66 -0.00232160450111 0.00232160450112 +67 -0.00213814191545 0.00213814191544 +68 0.0114627849428 -0.0114627849428 +69 -0.0021381429419 0.00213814294188 +70 0.000641012727381 -0.00064101272739 +71 0.00112493603698 -0.00112493603698 +72 -1.15272295775e-05 1.15272295687e-05 +73 -0.00172473744183 0.00172473744183 +74 0.018276550116 -0.018276550116 +75 -0.00125666892339 0.00125666892339 +76 -0.00232160381613 0.00232160381614 +77 0.00219982317236 -0.00219982317237 +78 -0.00586026163233 0.00586026163236 +79 -0.00213814041066 0.00213814041065 +80 -0.0031001930441 0.00310019304412 +81 0.00032247134769 -0.000322471347699 +82 -0.00253960255175 0.00253960255175 +83 0.000580298776161 -0.000580298776172 +84 -0.00339887362339 0.00339887362339 +85 -0.00213814304507 0.00213814304505 +86 0.00141644720267 -0.00141644720266 +87 -0.00275665838117 0.00275665838116 +88 7.299837356e-05 -7.29983735588e-05 +89 -0.00122133112354 0.00122133112352 +90 -1.1520732577e-05 1.15207325665e-05 +91 0.00623668821962 -0.00623668821961 +92 -0.000750488786068 0.000750488786081 +93 -0.000134743806793 0.000134743806781 +94 0.00185266774503 -0.00185266774504 +95 -0.00168681443561 0.00168681443562 +96 0.00104551800392 -0.00104551800392 +97 -0.00168681378149 0.00168681378151 +98 -0.00125666731119 0.0012566673112 +99 0.0273373188851 -0.0273373188851 +100 -0.00122132449275 0.00122132449276 +101 0.0164080376037 -0.0164080376037 +102 -0.00584347307691 0.00584347307691 +103 -0.0175645745896 0.0175645745896 +104 -0.000812522970572 0.000812522970572 +105 -0.00635860059631 0.0063586005963 +106 0.00275366392106 -0.00275366392106 +107 0.00954602258661 -0.00954602258661 +108 0.0155278096117 -0.0155278096117 +109 -0.00306825657773 0.00306825657775 +110 0.0112597051463 -0.0112597051463 +111 -0.00398796328134 0.00398796328133 +112 -0.00441274112723 0.00441274112722 +113 -0.00171496236972 0.00171496236972 +114 0.000877789735939 -0.000877789735948 +115 0.0273970544333 -0.0273970544333 +116 -0.00131825030571 0.0013182503057 +117 -0.000930125218004 0.000930125218002 +118 0.0155089924497 -0.0155089924497 +119 0.0118140403622 -0.0118140403622 +120 -0.000801552123165 0.00080155212317 +121 0.00284932184324 -0.00284932184324 +122 0.00962061241972 -0.00962061241972 +123 0.0158935928536 -0.0158935928536 +124 -0.0032912758955 0.00329127589549 +125 -0.00449164711626 0.00449164711627 +126 -0.00365891492729 0.0036589149273 +127 0.00112493995903 -0.00112493995902 +128 -0.0032912756797 0.00329127567971 +129 -0.00180788589755 0.00180788589754 +130 0.0223816193407 -0.0223816193407 +131 -0.0186465081581 0.0186465081581 +132 -0.0165897014 0.0165897014 +133 -9.15600724877e-05 9.15600724931e-05 +134 0.000396631463788 -0.000396631463796 +135 0.0366828617501 -0.0366828617501 +136 -0.0207881503725 0.0207881503725 +137 0.00716867549967 -0.00716867549967 +138 -0.000930124083137 0.000930124083139 +139 0.00112493800574 -0.00112493800573 +140 -0.00317568145256 0.00317568145257 +141 0.00716867883327 -0.00716867883327 +142 0.0151224437075 -0.0151224437075 +143 -0.00584347370931 0.00584347370932 +144 -0.00593952985175 0.00593952985175 +145 0.0182854382585 -0.0182854382585 +146 0.00354375934258 -0.00354375934259 +147 -0.00361285051891 0.00361285051892 +148 -0.0055083733504 0.00550837335042 +149 -0.00145063403334 0.00145063403336 +150 -0.00625027498836 0.00625027498837 +#Estimated Y-coefficients 1 2 +1 0.000952236730115 0.000952236730136 +2 0.00753180911842 0.00753180911838 +3 -0.00516801028579 -0.00516801028581 +4 -0.00882498990477 -0.00882498990477 +5 -0.00140542873921 -0.00140542873922 +6 0.00330266798272 0.00330266798272 +7 -0.0081387911267 -0.00813879112671 +8 0.00152443564077 0.00152443564076 +9 -0.00771870201025 -0.00771870201025 +10 0.00547713010073 0.00547713010074 +11 0.003270659849 0.003270659849 +12 -0.00306812817496 -0.00306812817497 +13 0.00445886261671 0.00445886261673 +14 -0.00353335505412 -0.00353335505412 +15 0.0085173158937 0.0085173158937 +16 -0.0383961776234 -0.0383961776234 +17 0.00330267922582 0.00330267922583 +18 0.000952240516451 0.000952240516456 +19 0.00818906645105 0.00818906645104 +20 -0.00309614228051 -0.00309614228051 +21 -0.000971621477879 -0.000971621477885 +22 -0.00165164343654 -0.00165164343652 +23 0.00604384541776 0.00604384541777 +24 0.00341647364957 0.00341647364958 +25 -0.00306812439373 -0.00306812439374 +26 0.00830847900819 0.00830847900821 +27 0.00152443887844 0.00152443887844 +28 0.00132401884933 0.00132401884932 +29 0.00179979352006 0.00179979352008 +30 -0.00516800670429 -0.0051680067043 +31 0.00208562867941 0.00208562867942 +32 -0.000971619066246 -0.000971619066261 +33 -0.0113128074854 -0.0113128074854 +34 -0.00870056701442 -0.0087005670144 +35 0.00547713027423 0.00547713027424 +36 0.00495542862463 0.00495542862463 +37 -0.000337423424473 -0.000337423424464 +38 0.00547712655395 0.00547712655396 +39 -0.010973258652 -0.010973258652 +40 0.0022008011203 0.0022008011203 +41 -5.46008492518e-05 -5.46008492437e-05 +42 -0.0234396971996 -0.0234396971996 +43 -0.0134511606022 -0.0134511606023 +44 -5.45996121933e-05 -5.45996122011e-05 +45 -0.00309614158163 -0.00309614158163 +46 0.00445886019725 0.00445886019722 +47 -0.00309614420386 -0.00309614420386 +48 -0.0104579849693 -0.0104579849693 +49 0.00168842769973 0.00168842769972 +50 0.00322357131135 0.00322357131133 +51 0.00202630582019 0.00202630582019 +52 -0.000691700383038 -0.000691700383018 +53 -0.00104045859173 -0.00104045859172 +54 -0.00344346850677 -0.00344346850675 +55 0.000998125320535 0.000998125320523 +56 -0.00199381905541 -0.0019938190554 +57 -0.00106665569072 -0.00106665569075 +58 0.00650984277058 0.00650984277059 +59 -0.00127555360175 -0.00127555360178 +60 0.0074404524885 0.00744045248845 +61 -0.0317908788312 -0.0317908788312 +62 -0.0039999913858 -0.00399999138579 +63 -0.0115243240423 -0.0115243240423 +64 0.00176831166006 0.00176831166007 +65 -0.00440085578754 -0.00440085578751 +66 -0.00192225561804 -0.00192225561805 +67 -0.00603442682678 -0.00603442682675 +68 0.00152674197776 0.00152674197778 +69 -0.0154861222259 -0.0154861222259 +70 0.00112666408174 0.00112666408172 +71 -0.0063441217448 -0.0063441217448 +72 0.00416182160539 0.0041618216054 +73 0.00285475184215 0.00285475184214 +74 0.00416181855219 0.00416181855219 +75 0.00220354621189 0.00220354621189 +76 -0.00115406490584 -0.00115406490584 +77 -0.0083901924992 -0.00839019249917 +78 -0.00238535825306 -0.0023853582531 +79 0.000206755320136 0.000206755320148 +80 0.00158982739788 0.00158982739788 +81 -1.37720111221e-05 -1.37720111046e-05 +82 -1.3770694678e-05 -1.37706946744e-05 +83 0.00152674594702 0.00152674594698 +84 0.00488108634371 0.00488108634369 +85 -0.00220091184671 -0.0022009118467 +86 -0.00318012733342 -0.0031801273334 +87 -0.00192225857826 -0.00192225857825 +88 -0.00911898267779 -0.00911898267778 +89 -0.00603441933504 -0.00603441933506 +90 0.00142092462435 0.00142092462434 +91 0.00128331390667 0.00128331390668 +92 -0.00057432105445 -0.000574321054431 +93 0.00290994036196 0.00290994036199 +94 0.00227437971826 0.00227437971826 +95 -0.000409584211176 -0.000409584211157 +96 -0.0062564186313 -0.00625641863131 +97 -0.00430727169536 -0.00430727169537 +98 0.00274042717244 0.00274042717247 +99 0.00952367801675 0.00952367801678 +100 -0.00199382288663 -0.00199382288664 +101 -0.00106665068897 -0.00106665068897 +102 0.00152674543824 0.00152674543823 +103 0.00174787415807 0.00174787415805 +104 0.00290750496381 0.00290750496381 +105 9.66708166621e-05 9.6670816661e-05 +106 -0.00101935419571 -0.00101935419568 +107 0.0100871271044 0.0100871271044 +108 0.00352958176992 0.00352958176992 +109 -0.019066105421 -0.0190661054211 +110 0.00240693112447 0.00240693112447 +111 -0.00090513595859 -0.00090513595857 +112 0.0035205054436 0.0035205054436 +113 -0.00310599240981 -0.00310599240982 +114 0.00169430085813 0.00169430085813 +115 -0.000733363285101 -0.000733363285101 +116 -0.000691698262239 -0.000691698262241 +117 9.66698551435e-05 9.66698551349e-05 +118 0.0171457397785 0.0171457397785 +119 0.00625881933768 0.00625881933768 +120 -0.0115243221165 -0.0115243221165 +121 -0.000457609674661 -0.000457609674665 +122 -0.0023718905732 -0.00237189057318 +123 -0.00299238147421 -0.00299238147421 +124 0.00547391509592 0.00547391509591 +125 -0.00200127266833 -0.00200127266834 +126 0.00971289811654 0.00971289811655 +127 0.00481618871657 0.00481618871656 +128 -0.000574322474196 -0.000574322474171 +129 0.00323239431475 0.00323239431476 +130 0.00567244833234 0.00567244833233 +131 -0.00143721256674 -0.00143721256671 +132 -0.0474284189227 -0.0474284189227 +133 0.00323239591076 0.00323239591076 +134 0.00453050823172 0.00453050823173 +135 0.00662134137135 0.00662134137136 +136 -0.0222253238714 -0.0222253238714 +137 -0.000472180108221 -0.000472180108238 +138 -8.96030271952e-05 -8.96030271771e-05 +139 -0.00223279969811 -0.00223279969812 +140 -0.00104045712364 -0.00104045712363 +141 -0.00192225343433 -0.00192225343433 +142 -0.0010404587415 -0.00104045874147 +143 0.00152674421725 0.00152674421723 +144 -0.00165763647411 -0.00165763647409 +145 -0.00200127181815 -0.00200127181816 +146 -0.00238535855193 -0.00238535855193 +147 0.00285475011985 0.00285475011986 +148 9.66702716109e-05 9.66702716107e-05 +149 -0.00109079514933 -0.00109079514929 +150 -0.00399998975976 -0.00399998975976 diff -r d9afcaa386f6 -r 11dcd9d18663 test-data/kpca_out1.tabular --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/kpca_out1.tabular Thu Mar 04 11:48:10 2010 -0500 @@ -0,0 +1,304 @@ +#Component 1 2 +#Eigenvalue 748.53295257 31.7564711908 +#Principal component vectors 1 2 +1 -0.00355307349951 0.010798043393 +2 -0.00372171398464 -0.00319202227241 +3 -0.00388666963315 -0.00306208266383 +4 -0.0037995051228 -0.00750936595439 +5 -0.00359988454628 0.0106843456635 +6 -0.00299499814368 0.0244145455947 +7 -0.00381378035242 -0.00182771020035 +8 -0.00354042321831 0.00630539436577 +9 -0.00400175554745 -0.0145202364622 +10 -0.0036630352299 -0.00136819012831 +11 -0.00326674025957 0.0213381031254 +12 -0.00357519624231 0.00181491746835 +13 -0.00380730480961 -0.0049118993488 +14 -0.0042807390398 -0.013520126312 +15 -0.00325109413176 0.0386362582597 +16 -0.0029222183254 0.0439372659369 +17 -0.00334909683853 0.025845377936 +18 -0.00352067050475 0.0105349072573 +19 -0.00284736799589 0.0295161649048 +20 -0.00340343226564 0.0164339289456 +21 -0.00312848751113 0.0141934462825 +22 -0.00338156462338 0.0140621875533 +23 -0.00412447090326 0.00340207509083 +24 -0.00322710660152 0.00486270310359 +25 -0.00332920046569 0.000741686459317 +26 -0.00350562773687 -0.0018911475654 +27 -0.00339310720123 0.00542360368742 +28 -0.00341115136262 0.0126295090519 +29 -0.00350586794258 0.0109084171675 +30 -0.00365520087074 -0.00403408864917 +31 -0.0036097322482 -0.00395326488411 +32 -0.00323422448999 0.0143754764524 +33 -0.00337735967561 0.0257295115702 +34 -0.00323624470121 0.035204794488 +35 -0.0036630352299 -0.00136819012831 +36 -0.00380098698319 0.00332108429984 +37 -0.00340101962525 0.0199919567158 +38 -0.0036630352299 -0.00136819012831 +39 -0.00406364785654 -0.0124621360523 +40 -0.00348192497209 0.00842215059195 +41 -0.00365954855054 0.00871751918805 +42 -0.00405650169482 -0.0228354383139 +43 -0.00404399701786 -0.00889238369142 +44 -0.003314992587 0.00689235987806 +45 -0.00302208085492 0.014691962046 +46 -0.00374682975461 -0.0054083973616 +47 -0.00335195787406 0.0163610385692 +48 -0.00386473126531 -0.0053404692461 +49 -0.00332787397638 0.0190663593005 +50 -0.00363243277483 0.00464859342961 +51 0.00213134716649 0.0235348223035 +52 0.00126833388577 0.010770856327 +53 0.00231973604021 0.0165043816266 +54 -0.00054456516814 -0.0221796154179 +55 0.00139079918371 0.00286317141153 +56 0.000352174603738 -0.0119723346983 +57 0.00150292456851 0.0088321679366 +58 -0.00187873890345 -0.0252928947697 +59 0.0014246176887 0.00830441949209 +60 -0.000783999496101 -0.0195987047495 +61 -0.00168806505916 -0.0318750199005 +62 0.000332005325527 -0.00227272707421 +63 -0.000240109205398 -0.0136362166478 +64 0.00107889762034 -0.00371369901933 +65 -0.000755702559702 -0.00554349815991 +66 0.00137471857777 0.0164559631848 +67 0.000400237612268 -0.0105937514639 +68 -0.000186605633993 -0.00791711329626 +69 0.000781260386547 -0.0156695687823 +70 -0.000602293691986 -0.014916217386 +71 0.00128053061726 -0.00382898708379 +72 0.000141070576797 -0.000177704692482 +73 0.0014804796511 -0.0105311838 +74 0.00095326423819 -0.0050250570579 +75 0.000831513901556 0.00625180962049 +76 0.00124204236488 0.0117902480983 +77 0.00192892696243 0.00828195017884 +78 0.00230888433286 0.00765437064913 +79 0.000772988980957 -0.00466004256634 +80 -0.000972934470601 -0.00794203589665 +81 -0.000825239851136 -0.0180890001892 +82 -0.000975175708257 -0.017046945113 +83 -0.000328157175199 -0.00733223273401 +84 0.00152809458981 -0.014337289403 +85 0.000204561491838 -0.0145038337473 +86 0.000958564114974 0.00611562699814 +87 0.00182495005699 0.0135671536294 +88 0.000691799295473 -0.00991154906392 +89 -0.000164814642312 -0.00683729147812 +90 -0.000495108434506 -0.018272246356 +91 -5.75283291151e-05 -0.0187391570922 +92 0.000980006758757 -0.000691467878134 +93 -0.000237878724736 -0.0101121125697 +94 -0.00182103731256 -0.02537083053 +95 -0.000124416007346 -0.0137765920579 +96 1.28307436801e-06 -0.00511559296079 +97 2.13006652241e-05 -0.00765449401728 +98 0.000630107936427 0.00193944394238 +99 -0.00195781990797 -0.0185721711052 +100 -0.000121047850397 -0.00903979441776 +101 0.00380328631922 -0.00735042696528 +102 0.00146195943076 -0.0196360714253 +103 0.00431818384817 0.00623068278311 +104 0.00270535358616 -0.00919789069736 +105 0.00348128902639 -0.00661174582865 +106 0.00608948395467 0.0105925795597 +107 -0.000316164072773 -0.0340356815797 +108 0.00498054497252 0.00589466060194 +109 0.00332851194261 -0.0119530548351 +110 0.00521718108616 0.019838433964 +111 0.0024425365186 0.0056190945732 +112 0.00239304071946 -0.00943633793421 +113 0.0033517411382 0.00333352355283 +114 0.00121571788624 -0.0252729457662 +115 0.00174247582859 -0.0198739526029 +116 0.00276824324416 0.00012671005862 +117 0.00283087224731 -0.00171497869775 +118 0.00677564081585 0.0333579774127 +119 0.00669433449169 -0.00213577965515 +120 0.00119992099901 -0.0235626863995 +121 0.0039514012311 0.00753951675886 +122 0.00107394296724 -0.0201437000923 +123 0.00625053915694 0.00718047948235 +124 0.00169144697539 -0.00751769568719 +125 0.00362530843477 0.00652532644077 +126 0.00449337826627 0.0143122037644 +127 0.00148231189251 -0.00651360693069 +128 0.00156493567407 -0.00495452682527 +129 0.00295099547041 -0.0109308371774 +130 0.0040009541229 0.0122602980101 +131 0.00482086296995 0.0071695428205 +132 0.00641618457442 0.0431443194121 +133 0.00300528343518 -0.0114433590101 +134 0.00183409020836 -0.00555386556062 +135 0.00216811021196 -0.0179461401821 +136 0.00553489980813 0.0172257235932 +137 0.00319828572246 -0.000592991026508 +138 0.00274692788031 -0.00152565423339 +139 0.00132810381823 -0.00620179238822 +140 0.00335981997382 0.00898416237223 +141 0.00357910201795 0.00100409451945 +142 0.00303686395111 0.0107216156308 +143 0.00146195943076 -0.0196360714253 +144 0.00412744981738 0.00329510730094 +145 0.00385310530472 0.0043919488708 +146 0.00291206809269 0.00286898102218 +147 0.00181332919273 -0.0132702604229 +148 0.00251823082733 -2.87503486175e-06 +149 0.00274135416487 -0.000415299029875 +150 0.00161105855831 -0.0107445157278 +#Rotated values 1 2 +1 -398.938889593 51.4361630892 +2 -417.873833632 -15.2051045001 +3 -436.395044425 -14.5861409847 +4 -426.608218182 -35.7706445387 +5 -404.194831251 50.8945672883 +6 -336.278220515 116.297972072 +7 -428.211040147 -8.70624394838 +8 -397.518516743 30.0355611785 +9 -449.31688431 -69.1667206344 +10 -411.285386401 -6.51733355896 +11 -366.789409766 101.643428575 +12 -401.422829891 8.64530614458 +13 -427.483966571 -23.3976885243 +14 -480.641134897 -64.4027252584 +15 -365.03266343 184.042683351 +16 -328.106506675 209.293877989 +17 -376.036401748 123.113699976 +18 -395.300683193 50.1827218221 +19 -319.702315953 140.599386069 +20 -382.137180401 78.282538667 +21 -351.266399068 67.6100651954 +22 -379.681882777 66.9848180875 +23 -463.095357451 16.2056849416 +24 -362.339344904 23.1633436528 +25 -373.802438142 3.53300170168 +26 -393.611682074 -9.00842597671 +27 -380.977882758 25.8351771375 +28 -383.003880169 60.1602960542 +29 -393.638652357 51.9619253275 +30 -410.405745001 -19.2162629953 +31 -405.30053066 -18.8312613603 +32 -363.138541016 68.4771605722 +33 -379.209751481 122.56177394 +34 -363.365370216 167.69700629 +35 -411.285386401 -6.51733355896 +36 -426.774601382 15.8198876835 +37 -381.866289275 95.2310996238 +38 -411.285386401 -6.51733355896 +39 -456.266149239 -59.3630196781 +40 -390.950336998 40.1186673956 +41 -410.893902242 41.5256470425 +42 -455.463778609 -108.775940841 +43 -454.059754194 -42.3586089771 +44 -372.207178335 32.8315541856 +45 -339.319065786 69.9847304172 +46 -420.69383085 -25.7627422503 +47 -376.357638654 77.9353274961 +48 -433.931805737 -25.4391686638 +49 -373.653499999 90.8220434758 +50 -407.849344494 22.1434384987 +51 239.307538123 112.107435969 +52 142.408456254 51.3066582975 +53 260.459830104 78.618137947 +54 -61.1437459762 -105.651947706 +55 156.158852912 13.6386330667 +56 39.5421443935 -57.0298652899 +57 168.748284713 42.0717729946 +58 -210.944696776 -120.481962613 +59 159.955992721 39.5578587535 +60 -88.0274186445 -93.3578554128 +61 -189.53584843 -151.835722676 +62 37.2775389879 -10.8260687785 +63 -26.9594478684 -64.955718169 +64 121.138563191 -17.6900963878 +65 -84.8502402418 -26.4062909417 +66 154.353323395 78.3874981192 +67 44.9386562461 -50.4630244749 +68 -20.9520699268 -37.712937046 +69 87.7198715803 -74.6415314411 +70 -67.6255013365 -71.0529641542 +71 143.77790457 -18.2392677024 +72 15.8393963056 -0.846491092088 +73 166.228170669 -50.1649852426 +74 107.032454219 -23.9367119537 +75 93.3623333752 29.7803118155 +76 139.45644579 56.16250111 +77 216.579809171 39.4508268386 +78 259.241401023 36.4613701504 +79 86.791158633 -22.1979761258 +80 -109.24102679 -37.8316551222 +81 -92.6578833524 -86.1664220066 +82 -109.492672826 -81.2026232057 +83 -36.8454688889 -34.9268756372 +84 171.574373268 -68.295257682 +85 22.9681526201 -69.0885867828 +86 107.627524081 29.131609887 +87 204.905288168 64.6267385057 +88 77.6751853839 -47.2133733456 +89 -18.5053786255 -32.5692374772 +90 -55.5907467484 -87.0393097495 +91 -6.45927750734 -89.2634253508 +92 110.035102901 -3.29378696269 +93 -26.709009627 -48.1687517244 +94 -204.465965447 -120.853207322 +95 -13.9694221989 -65.6243923192 +96 0.144063516758 -24.3679770725 +97 2.39163747478 -36.4619578109 +98 70.7484831137 9.23848435236 +99 -219.823907447 -88.4679924977 +100 -13.591245729 -43.0607956497 +101 427.032770699 -35.0135433244 +102 164.148721387 -93.5358504774 +103 484.845435841 29.6796747451 +104 303.756946139 -43.813882642 +105 390.878933052 -31.4948573892 +106 683.726910633 50.4574421437 +107 -35.4988840335 -162.127971232 +108 559.215305053 28.0790429377 +109 373.72513081 -56.9380262268 +110 585.784794378 94.499798497 +111 274.247860804 26.7663922398 +112 268.690475304 -44.9497190631 +113 376.333303564 15.8791417004 +114 136.500734832 -120.386936119 +115 195.645086513 -94.6689904923 +116 310.818193348 0.603579648922 +117 317.850174244 -8.16925074119 +118 760.768563816 158.899747303 +119 751.639494384 -10.1737237633 +120 134.727061236 -112.240165774 +121 443.663104546 35.9142670118 +122 120.582255024 -95.9539247487 +123 701.810179545 34.2040034726 +124 189.915569791 -35.8103229767 +125 407.049423998 31.083201169 +126 504.5162551 68.1757629779 +127 166.43389463 -31.0273756263 +128 175.710888105 -23.6007432586 +129 331.337602873 -52.0687223872 +130 449.226900407 58.4015700824 +131 541.286218925 34.1519070045 +132 720.408837559 205.516700468 +133 337.433052457 -54.5101051094 +134 205.931543841 -26.455675751 +135 243.435290768 -85.4859125517 +136 621.458234334 82.0542292543 +137 359.103338249 -2.82469536745 +138 308.424905512 -7.26740920646 +139 149.119420857 -29.5420561961 +140 377.240394766 42.795794032 +141 401.861370157 4.78297480198 +142 340.978910982 51.0721016846 +143 164.148721387 -93.5358504774 +144 463.429829758 15.6961470109 +145 432.626443546 20.920919668 +146 326.966839126 13.6663069767 +147 203.600498192 -63.212496422 +148 282.746813465 -0.0136951442637 +149 307.799089061 -1.97826475167 +150 180.889562913 -51.1811856252 diff -r d9afcaa386f6 -r 11dcd9d18663 test-data/kpca_out2.pdf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/kpca_out2.pdf Thu Mar 04 11:48:10 2010 -0500 @@ -0,0 +1,1190 @@ +%PDF-1.4 +%âãÏÓ\r +1 0 obj +<< +/CreationDate (D:20100303115833) +/ModDate (D:20100303115833) +/Title (R Graphics Output) +/Producer (R 2.10.0) +/Creator (R) +>> +endobj +2 0 obj +<< +/Type /Catalog +/Pages 3 0 R +>> +endobj +5 0 obj +<< +/Type /Page +/Parent 3 0 R +/Contents 6 0 R +/Resources 4 0 R +>> +endobj +6 0 obj +<< +/Length 7 0 R +>> +stream +q +Q q 47.81 276.05 240.19 228.24 re W n +Q q +0.000 0.000 0.000 RG +0.75 w +[] 0 d +1 J +1 j +10.00 M +53.78 282.02 m +282.02 282.02 l +282.02 498.31 l +53.78 498.31 l +53.78 282.02 l +S +Q q 53.78 282.02 228.24 216.29 re W n +BT +0.000 0.000 0.000 rg +/F2 1 Tf 20.00 0.00 -0.00 20.00 162.34 383.14 Tm (1) Tj +ET +Q q 293.98 282.02 228.24 216.29 re W n +Q q 288.00 276.05 240.19 228.24 re W n +Q q +0.000 0.000 0.000 RG +0.75 w +[] 0 d +1 J +1 j +10.00 M +293.98 282.02 m +522.22 282.02 l +522.22 498.31 l +293.98 498.31 l +293.98 282.02 l +S +337.78 498.31 m 508.47 498.31 l S +337.78 498.31 m 337.78 504.29 l S +394.68 498.31 m 394.68 504.29 l S +451.58 498.31 m 451.58 504.29 l S +508.47 498.31 m 508.47 504.29 l S +BT +0.000 0.000 0.000 rg +/F2 1 Tf 10.00 0.00 -0.00 10.00 326.52 512.65 Tm (-100) Tj +ET +BT +/F2 1 Tf 10.00 0.00 -0.00 10.00 391.90 512.65 Tm (0) Tj +ET +BT +/F2 1 Tf 10.00 0.00 -0.00 10.00 443.24 512.65 Tm (100) Tj +ET +BT +/F2 1 Tf 10.00 0.00 -0.00 10.00 500.13 512.65 Tm (200) Tj +ET +522.22 303.04 m 522.22 496.63 l S +522.22 303.04 m 528.19 303.04 l S +522.22 335.31 m 528.19 335.31 l S +522.22 367.57 m 528.19 367.57 l S +522.22 399.84 m 528.19 399.84 l S +522.22 432.10 m 528.19 432.10 l S +522.22 464.37 m 528.19 464.37 l S +522.22 496.63 m 528.19 496.63 l S +BT +/F2 1 Tf 0.00 10.00 -10.00 0.00 543.73 291.78 Tm (-400) Tj +ET +BT +/F2 1 Tf 0.00 10.00 -10.00 0.00 543.73 324.05 Tm (-200) Tj +ET +BT +/F2 1 Tf 0.00 10.00 -10.00 0.00 543.73 364.79 Tm (0) Tj +ET +BT +/F2 1 Tf 0.00 10.00 -10.00 0.00 543.73 391.50 Tm (200) Tj +ET +BT +/F2 1 Tf 0.00 10.00 -10.00 0.00 543.73 423.76 Tm (400) Tj +ET +BT +/F2 1 Tf 0.00 10.00 -10.00 0.00 543.73 456.03 Tm (600) Tj +ET +BT +/F2 1 Tf 0.00 10.00 -10.00 0.00 543.73 488.29 Tm (800) Tj +ET +Q q 293.98 282.02 228.24 216.29 re W n +0.000 0.000 0.000 RG +0.75 w +[] 0 d +1 J +1 j +10.00 M +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 421.49 301.06 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 383.57 298.01 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 383.92 295.02 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 371.87 296.60 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 421.18 300.21 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 458.39 311.17 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 387.27 296.34 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 409.31 301.29 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 352.86 292.93 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 388.51 299.07 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 450.05 306.25 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 397.14 300.66 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 378.91 296.46 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 355.58 287.88 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 496.94 306.53 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 511.30 312.49 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 462.27 304.76 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 420.77 301.65 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 472.22 313.84 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 436.76 303.77 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 430.69 308.75 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 430.33 304.17 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 401.44 290.71 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 405.40 306.97 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 394.23 305.12 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 387.09 301.92 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 406.92 303.96 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 426.45 303.63 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 421.78 301.92 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 381.29 299.21 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 381.50 300.03 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 431.18 306.84 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 461.96 304.24 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 487.64 306.80 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 388.51 299.07 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 401.22 296.57 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 446.40 303.82 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 388.51 299.07 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 358.44 291.81 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 415.05 302.35 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 415.85 299.13 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 330.33 291.94 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 368.12 292.17 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 410.90 305.37 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 432.04 310.68 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 377.56 297.55 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 436.56 304.70 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 377.74 295.42 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 443.90 305.14 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 404.82 299.62 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 456.01 404.02 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 421.41 388.39 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 436.95 407.44 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 332.11 355.55 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 399.98 390.61 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 359.77 371.80 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 416.16 392.64 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 323.67 331.39 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 414.73 391.22 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 339.10 351.22 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 305.83 334.84 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 386.06 371.43 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 355.26 361.07 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 382.15 384.96 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 377.19 351.73 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 436.82 390.32 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 363.51 372.67 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 370.76 362.04 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 349.75 379.57 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 351.79 354.51 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 381.84 388.61 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 391.74 367.97 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 363.68 392.23 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 378.60 382.69 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 409.16 380.48 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 424.17 387.92 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 414.67 400.36 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 412.97 407.24 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 379.59 379.42 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 370.69 347.80 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 343.19 350.47 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 346.02 347.75 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 372.35 359.47 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 353.36 393.10 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 352.91 369.12 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 408.79 382.78 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 428.99 398.47 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 365.36 377.95 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 373.69 362.43 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 342.70 356.45 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 341.43 364.38 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 390.35 383.17 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 364.81 361.11 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 323.46 332.43 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 354.88 363.16 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 378.35 365.44 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 371.47 365.80 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 397.48 376.83 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 341.88 329.96 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 367.72 363.23 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 372.30 434.31 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 339.00 391.90 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 409.11 443.63 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 367.29 414.42 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 374.30 428.48 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 420.93 475.72 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 299.97 359.69 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 408.20 455.63 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 359.82 425.71 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 445.99 459.92 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 407.45 409.66 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 366.64 408.76 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 401.25 426.13 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 323.72 387.44 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 338.35 396.98 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 392.56 415.56 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 387.57 416.69 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 482.63 488.15 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 386.43 486.67 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 328.36 387.15 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 412.65 436.99 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 337.62 384.87 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 411.68 478.64 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 371.84 396.06 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 409.91 431.08 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 431.01 446.81 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 374.57 392.27 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 378.79 393.76 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 362.59 418.87 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 425.45 437.89 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 411.65 452.74 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 509.16 481.64 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 361.20 419.85 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 377.17 398.64 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 343.58 404.69 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 438.91 465.67 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 390.61 423.35 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 388.08 415.17 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 375.41 389.47 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 416.57 426.28 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 394.94 430.25 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 421.28 420.43 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 339.00 391.90 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 401.15 440.18 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 404.12 435.21 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 400.00 418.17 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 356.25 398.26 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 392.21 411.03 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 391.09 415.07 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 363.10 394.60 Tm (l) Tj 0 Tr +ET +Q q 53.78 53.78 228.24 216.29 re W n +Q q 47.81 47.81 240.19 228.24 re W n +Q q +0.000 0.000 0.000 RG +0.75 w +[] 0 d +1 J +1 j +10.00 M +53.78 53.78 m +282.02 53.78 l +282.02 270.07 l +53.78 270.07 l +53.78 53.78 l +S +75.97 53.78 m 280.25 53.78 l S +75.97 53.78 m 75.97 47.81 l S +110.01 53.78 m 110.01 47.81 l S +144.06 53.78 m 144.06 47.81 l S +178.11 53.78 m 178.11 47.81 l S +212.15 53.78 m 212.15 47.81 l S +246.20 53.78 m 246.20 47.81 l S +280.25 53.78 m 280.25 47.81 l S +BT +0.000 0.000 0.000 rg +/F2 1 Tf 10.00 0.00 -0.00 10.00 64.71 32.27 Tm (-400) Tj +ET +BT +/F2 1 Tf 10.00 0.00 -0.00 10.00 98.75 32.27 Tm (-200) Tj +ET +BT +/F2 1 Tf 10.00 0.00 -0.00 10.00 141.28 32.27 Tm (0) Tj +ET +BT +/F2 1 Tf 10.00 0.00 -0.00 10.00 169.77 32.27 Tm (200) Tj +ET +BT +/F2 1 Tf 10.00 0.00 -0.00 10.00 203.81 32.27 Tm (400) Tj +ET +BT +/F2 1 Tf 10.00 0.00 -0.00 10.00 237.86 32.27 Tm (600) Tj +ET +BT +/F2 1 Tf 10.00 0.00 -0.00 10.00 271.91 32.27 Tm (800) Tj +ET +53.78 95.29 m 53.78 257.05 l S +53.78 95.29 m 47.81 95.29 l S +53.78 149.21 m 47.81 149.21 l S +53.78 203.13 m 47.81 203.13 l S +53.78 257.05 m 47.81 257.05 l S +BT +/F2 1 Tf 0.00 10.00 -10.00 0.00 39.44 84.03 Tm (-100) Tj +ET +BT +/F2 1 Tf 0.00 10.00 -10.00 0.00 39.44 146.43 Tm (0) Tj +ET +BT +/F2 1 Tf 0.00 10.00 -10.00 0.00 39.44 194.79 Tm (100) Tj +ET +BT +/F2 1 Tf 0.00 10.00 -10.00 0.00 39.44 248.71 Tm (200) Tj +ET +Q q 53.78 53.78 228.24 216.29 re W n +0.000 0.000 0.000 RG +0.75 w +[] 0 d +1 J +1 j +10.00 M +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 73.69 174.79 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 70.46 138.86 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 67.31 139.19 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 68.98 127.77 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 72.79 174.50 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 84.35 209.76 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 68.70 142.36 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 73.93 163.25 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 65.11 109.76 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 71.59 143.54 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 79.16 201.86 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 73.26 151.72 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 68.83 134.44 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 59.78 112.33 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 79.46 246.29 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 85.75 259.91 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 77.59 213.44 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 74.31 174.12 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 87.18 222.87 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 76.55 189.27 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 81.80 183.51 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 76.97 183.18 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 62.77 155.80 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 79.92 159.55 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 77.97 148.96 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 74.59 142.20 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 76.75 160.99 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 76.40 179.50 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 74.59 175.08 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 71.74 136.70 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 72.60 136.90 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 79.78 183.98 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 77.05 213.14 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 79.74 237.48 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 71.59 143.54 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 68.95 155.59 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 76.59 198.41 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 71.59 143.54 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 63.93 115.05 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 75.05 168.69 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 71.65 169.45 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 64.07 88.41 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 64.30 124.22 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 78.24 164.76 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 83.84 184.79 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 69.98 133.17 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 77.53 189.08 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 67.73 133.34 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 77.99 196.03 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 72.17 159.00 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 182.34 207.51 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 165.84 174.72 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 185.94 189.45 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 131.19 90.09 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 168.19 154.41 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 148.33 116.31 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 170.33 169.74 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 105.69 82.10 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 168.83 168.39 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 126.62 96.72 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 109.34 65.19 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 147.95 141.22 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 137.01 112.03 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 162.22 137.52 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 127.16 132.82 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 167.88 189.32 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 149.25 119.85 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 138.03 126.72 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 156.53 106.81 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 130.09 108.75 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 166.08 137.22 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 144.30 146.60 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 169.90 120.01 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 159.82 134.15 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 157.50 163.12 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 165.34 177.34 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 178.47 168.33 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 185.73 166.72 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 156.38 135.09 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 123.00 126.66 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 125.83 100.60 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 122.96 103.27 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 135.33 128.23 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 170.81 110.23 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 145.51 109.81 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 159.92 162.77 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 176.48 181.90 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 154.82 121.60 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 138.45 129.50 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 132.14 100.13 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 140.50 98.93 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 160.33 145.28 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 137.05 121.09 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 106.79 81.90 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 139.22 111.67 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 141.63 133.92 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 142.01 127.40 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 153.65 152.04 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 104.18 99.36 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 139.29 123.84 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 214.30 128.18 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 169.55 96.62 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 224.14 163.06 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 193.31 123.43 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 208.14 130.08 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 258.00 174.26 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 135.56 59.64 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 236.80 162.20 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 205.22 116.36 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 241.32 198.01 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 188.29 161.49 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 187.34 122.82 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 205.67 155.62 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 164.84 82.15 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 174.91 96.01 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 194.51 147.38 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 195.71 142.65 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 271.11 232.74 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 269.56 141.57 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 164.54 86.54 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 217.13 166.42 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 162.13 95.32 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 261.08 165.50 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 173.93 127.75 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 210.90 163.82 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 227.49 183.82 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 169.93 130.33 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 171.51 134.33 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 198.01 118.98 Tm (l) Tj 0 Tr +ET +BT +/F1 1 Tf 1 Tr 6.21 0 0 6.21 218.08 178.55 Tm (l) Tj 0 Tr +ET +BT

1 0

Fwd: [galaxy-user] Protein names
by Anton Nekrutenko 05 Mar '10

05 Mar '10

Begin forwarded message: > From: webb(a)bx.psu.edu > Date: March 5, 2010 1:44:01 PM EST > To: Tjaart de Beer <tdebeer(a)gmail.com> > Cc: Anton Nekrutenko <anton(a)bx.psu.edu>, Webb Miller > <webb(a)bx.psu.edu>, Aakrosh Ratan <ratan(a)cse.psu.edu> > Subject: Re: Fwd: [galaxy-user] Protein names > > Hi, > > The gene annotations are from RefSeq. As we processed the SNPs with > tools such as PolyPhen and Sift, we sometimes had to use other > names. My assumption was that people would load their favorite gene > annotations into Galaxy and use an "interval" join to attach the > desired names. Can you do something like that? Or is the problem > that you need to deal with alternate splice forms? > > Please keep asking until you have everything working. If necessary, > I can regenerate the file with other protein names. Thanks for your > patience. > > --Webb > > > Quoting Anton Nekrutenko <anton(a)bx.psu.edu>: > >> Webb: >> >> The question here is on where the protein names come from. Can you >> elaborate, so I send him a reply. >> >> Thanks, >> >> anton >> >> >> >> Begin forwarded message: >> >>> From: Tjaart de Beer <tdebeer(a)gmail.com> >>> Date: March 5, 2010 7:34:13 AM EST >>> To: galaxy-user(a)bx.psu.edu >>> Subject: [galaxy-user] Protein names >>> >>> Hi >>> >>> I am trying to parse some data from the Bushmen dataset and have >>> a question. >>> >>> Where do you get the protein names from? It does not correspond 100% >>> to the UniProt ID field in Uniprot entries nor is it Uniprot AC >>> numbers. Is there some kind of mapping I can use to get the >>> appropriate names or Uniprot entries? Would you be able to provide >>> with this mapping? I have been going through the Uniprot website >>> rather extensively and have failed to find any such downloadable >>> mapping. Hope you can help! >>> >>> Thanks! >>> >>> Dr. Tjaart de Beer >>> Thornton group >>> EMBL-EBI >>> Cambridge >>> _______________________________________________ >>> galaxy-user mailing list >>> galaxy-user(a)lists.bx.psu.edu >>> http://lists.bx.psu.edu/listinfo/galaxy-user >> >> Anton Nekrutenko >> http://nekrut.bx.psu.edu >> http://usegalaxy.org >> >> >> >> > > > Anton Nekrutenko http://nekrut.bx.psu.edu http://usegalaxy.org

1 0

Problem with displaying wiggle file in galaxy.
by Vipin TS 05 Mar '10

05 Mar '10

Dear Galaxy Team, I would like to visualize a wiggle format file in my galaxy instance. I made initial set up for visualization and I am not able to find my track display. Here I am attaching my screen shot, please find it. less from my wiggle file, track type=wiggle_0 name=test variableStep chrom=I I 3749 1 I 3750 1 I 3751 1 I 3752 1 I 3753 1 I 3754 1 I 3755 1 I 3756 1 I 3757 1 I 3758 1 I 3759 1 I 3760 1 I 3761 1 I 3762 1 I 3763 1 I 3764 1 I 3765 1 I 3766 3 I 3767 5 I 3768 6 I 3769 6 I 3770 6 I 3771 6 I 3772 6 It will be great if you can suggest me a way to solve the display problem. Many thanks, Vipin

3 3

Python 2.6
by SHAUN WEBB 05 Mar '10

05 Mar '10

Hi, I just wanted to check if Galaxy is now fully compatible with Python 2.6. Thanks for your help Shaun webb -- The University of Edinburgh is a charitable body, registered in Scotland, with registration number SC005336.

2 1

[hg] galaxy 3476: Fix for sharing histories that include restric...
by Greg Von Kuster 03 Mar '10

03 Mar '10

details: http://www.bx.psu.edu/hg/galaxy/rev/adda1b9e31fa changeset: 3476:adda1b9e31fa user: Greg Von Kuster <greg(a)bx.psu.edu> date: Wed Mar 03 17:00:50 2010 -0500 description: Fix for sharing histories that include restricted datasets. diffstat: lib/galaxy/web/controllers/history.py | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diffs (31 lines): diff -r a2cb4b0ccf6b -r adda1b9e31fa lib/galaxy/web/controllers/history.py --- a/lib/galaxy/web/controllers/history.py Wed Mar 03 15:37:43 2010 -0500 +++ b/lib/galaxy/web/controllers/history.py Wed Mar 03 17:00:50 2010 -0500 @@ -908,7 +908,7 @@ else: # Only deal with datasets that have not been purged for hda in history.activatable_datasets: - if trans.app.security_agent.dataset_is_public( hda.dataset ): + if trans.app.security_agent.can_access_dataset( send_to_user.all_roles(), hda.dataset ): # The no_change_needed dictionary is a special case. If both of can_change # and cannot_change are empty, no_change_needed will used for sharing. Otherwise # unique_no_change_needed will be used for displaying, so we need to populate both. @@ -924,12 +924,14 @@ no_change_needed[ send_to_user ][ history ] = [ hda ] else: no_change_needed[ send_to_user ][ history ].append( hda ) - elif not trans.app.security_agent.can_access_dataset( send_to_user.all_roles(), hda.dataset ): + else: # The user with which we are sharing the history does not have access permission on the current dataset - if trans.app.security_agent.can_manage_dataset( user_roles, hda.dataset ) and not hda.dataset.library_associations: + if trans.app.security_agent.can_manage_dataset( user_roles, hda.dataset ): # The current user has authority to change permissions on the current dataset because - # they have permission to manage permissions on the dataset and the dataset is not associated - # with a library. + # they have permission to manage permissions on the dataset. + # NOTE: ( gvk )There may be problems if the dataset also has an ldda, but I don't think so + # because the user with which we are sharing will not have the "manage permission" permission + # on the dataset in their history. Keep an eye on this though... if unique: # Build the dictionaries for display, containing unique histories only if history not in can_change:

1 0

[hg] galaxy 3475: Updated Bowtie wrapper for new fastqcssanger d...
by Greg Von Kuster 03 Mar '10

03 Mar '10

details: http://www.bx.psu.edu/hg/galaxy/rev/a2cb4b0ccf6b changeset: 3475:a2cb4b0ccf6b user: Kelly Vincent <kpvincent(a)bx.psu.edu> date: Wed Mar 03 15:37:43 2010 -0500 description: Updated Bowtie wrapper for new fastqcssanger datatype, and added equCab2 to builds.txt so sam_to_bam and sam_pileup will pass diffstat: test-data/bowtie_in1.fastqcssanger | 4 +++ test-data/bowtie_in1.fastqsanger | 4 --- test-data/bowtie_in3.fastqcssanger | 4 +++ test-data/bowtie_in3.fastqsanger | 4 --- test-data/bowtie_in4.fastqcssanger | 4 +++ test-data/bowtie_in4.fastqsanger | 4 --- tool-data/shared/ucsc/builds.txt | 1 + tools/sr_mapping/bowtie_color_wrapper.xml | 32 +++++++++++++++--------------- 8 files changed, 29 insertions(+), 28 deletions(-) diffs (183 lines): diff -r f0e32644688b -r a2cb4b0ccf6b test-data/bowtie_in1.fastqcssanger --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/bowtie_in1.fastqcssanger Wed Mar 03 15:37:43 2010 -0500 @@ -0,0 +1,4 @@ +@869_1532_1255/1 +G2102223311000312223321002 ++ +=;8:?@=?;;9:8;=>;5A?;<8>< diff -r f0e32644688b -r a2cb4b0ccf6b test-data/bowtie_in1.fastqsanger --- a/test-data/bowtie_in1.fastqsanger Wed Mar 03 15:18:09 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -@869_1532_1255/1 -G2102223311000312223321002 -+ -=;8:?@=?;;9:8;=>;5A?;<8>< diff -r f0e32644688b -r a2cb4b0ccf6b test-data/bowtie_in3.fastqcssanger --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/bowtie_in3.fastqcssanger Wed Mar 03 15:37:43 2010 -0500 @@ -0,0 +1,4 @@ +@869_1532_1255/1 +G2102223311000312223321002 ++ +=;8:?@=?;;9:8;=>;5A?;<8>< diff -r f0e32644688b -r a2cb4b0ccf6b test-data/bowtie_in3.fastqsanger --- a/test-data/bowtie_in3.fastqsanger Wed Mar 03 15:18:09 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -@869_1532_1255/1 -G2102223311000312223321002 -+ -=;8:?@=?;;9:8;=>;5A?;<8>< diff -r f0e32644688b -r a2cb4b0ccf6b test-data/bowtie_in4.fastqcssanger --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/bowtie_in4.fastqcssanger Wed Mar 03 15:37:43 2010 -0500 @@ -0,0 +1,4 @@ +@869_1532_1255/2 +T1301222000112122113330022 ++ +;89<:==5<8>69;8=<9;<>9:=< diff -r f0e32644688b -r a2cb4b0ccf6b test-data/bowtie_in4.fastqsanger --- a/test-data/bowtie_in4.fastqsanger Wed Mar 03 15:18:09 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -@869_1532_1255/2 -T1301222000112122113330022 -+ -;89<:==5<8>69;8=<9;<>9:=< diff -r f0e32644688b -r a2cb4b0ccf6b tool-data/shared/ucsc/builds.txt --- a/tool-data/shared/ucsc/builds.txt Wed Mar 03 15:18:09 2010 -0500 +++ b/tool-data/shared/ucsc/builds.txt Wed Mar 03 15:37:43 2010 -0500 @@ -786,6 +786,7 @@ aeroHydr_ATCC7966 Aeromonas hydrophila subsp. hydrophila ATCC 7966 (aeroHydr_ATCC7966) baciAnth_AMES Bacillus anthracis str. Ames (baciAnth_AMES) shewOnei Shewanella oneidensis MR-1 (shewOnei) +equCab2 Horse Sep. 2007 (equCab2) arabidopsis Arabidopsis thaliana TAIR9 arabidopsis_tair8 Arabidopsis thaliana TAIR8 araTha1 Arabidopsis thaliana TAIR7 diff -r f0e32644688b -r a2cb4b0ccf6b tools/sr_mapping/bowtie_color_wrapper.xml --- a/tools/sr_mapping/bowtie_color_wrapper.xml Wed Mar 03 15:18:09 2010 -0500 +++ b/tools/sr_mapping/bowtie_color_wrapper.xml Wed Mar 03 15:37:43 2010 -0500 @@ -210,7 +210,7 @@ <param name="indexSettings" type="select" label="Choose whether to use Default options for building indices or to Set your own"> <option value="indexPreSet">Default</option> <option value="indexFull">Set your own</option> - </param> + </param> <when value="indexPreSet" /> <when value="indexFull"> <conditional name="autoBehavior"> @@ -259,7 +259,7 @@ <option value="paired">Paired-end</option> </param> <when value="single"> - <param name="sInput1" type="data" format="fastqsanger" label="FASTQ file" help="Must have Sanger-scaled quality values with ASCII offset 33"/> + <param name="sInput1" type="data" format="fastqcssanger" label="FASTQ file" help="Must have Sanger-scaled quality values with ASCII offset 33"/> <conditional name="sParams"> <param name="sSettingsType" type="select" label="Bowtie settings to use" help="For most mapping needs use Commonly used settings. If you want full control use Full parameter list"> <option value="preSet">Commonly used</option> @@ -317,8 +317,8 @@ </conditional>  </when>  <when value="paired"> - <param name="pInput1" type="data" format="fastqsanger" label="FASTQ file" help="Must have Sanger-scaled quality values with ASCII offset 33"/> - <param name="pInput2" type="data" format="fastqsanger" label="Reverse FASTQ file" help="Must have Sanger-scaled quality values with ASCII offset 33"/> + <param name="pInput1" type="data" format="fastqcssanger" label="FASTQ file" help="Must have Sanger-scaled quality values with ASCII offset 33"/> + <param name="pInput2" type="data" format="fastqcssanger" label="Reverse FASTQ file" help="Must have Sanger-scaled quality values with ASCII offset 33"/> <param name="pMaxInsert" type="integer" value="1000" label="Maximum insert size for valid paired-end alignments (-X)" /> <param name="pMateOrient" type="select" label="The upstream/downstream mate orientation for valid paired-end alignment against the forward reference strand (--fr/--rf/--ff)"> <option value="ff">FF (for SOLiD)</option> @@ -401,14 +401,14 @@ <test>  <param name="genomeSource" value="indexed" /> <param name="index" value="equCab2chrM" /> <param name="sPaired" value="single" /> - <param name="sInput1" ftype="fastqsanger" value="bowtie_in1.fastqsanger" /> + <param name="sInput1" ftype="fastqcssanger" value="bowtie_in1.fastqcssanger" /> <param name="sSettingsType" value="preSet" /> <param name="suppressHeader" value="true" /> <output name="output" ftype="sam" file="bowtie_out1.sam" /> @@ -417,7 +417,7 @@  @@ -425,8 +425,8 @@ <param name="ownFile" value="chr_m.fasta" /> <param name="indexSettings" value="indexPreSet" /> <param name="sPaired" value="paired" /> - <param name="pInput1" ftype="fastqsanger" value="bowtie_in3.fastqsanger" /> - <param name="pInput2" ftype="fastqsanger" value="bowtie_in4.fastqsanger" /> + <param name="pInput1" ftype="fastqcssanger" value="bowtie_in3.fastqcssanger" /> + <param name="pInput2" ftype="fastqcssanger" value="bowtie_in4.fastqcssanger" /> <param name="pMaxInsert" value="1000" /> <param name="pMateOrient" value="ff" /> <param name="pSettingsType" value="full" /> @@ -460,14 +460,14 @@ <test>  <param name="genomeSource" value="indexed" /> <param name="index" value="equCab2chrM" /> <param name="sPaired" value="single" /> - <param name="sInput1" ftype="fastqsanger" value="bowtie_in1.fastqsanger" /> + <param name="sInput1" ftype="fastqcssanger" value="bowtie_in1.fastqcssanger" /> <param name="sSettingsType" value="full" /> <param name="sSkip" value="0" /> <param name="sAlignLimit" value="-1" /> @@ -496,7 +496,7 @@  @@ -517,8 +517,8 @@ <param name="seed" value="-1" /> <param name="cutoff" value="-1" /> <param name="sPaired" value="paired" /> - <param name="pInput1" ftype="fastqsanger" value="bowtie_in3.fastqsanger" /> - <param name="pInput2" ftype="fastqsanger" value="bowtie_in4.fastqsanger" /> + <param name="pInput1" ftype="fastqcssanger" value="bowtie_in3.fastqcssanger" /> + <param name="pInput2" ftype="fastqcssanger" value="bowtie_in4.fastqcssanger" /> <param name="pMaxInsert" value="1000" /> <param name="pMateOrient" value="ff" /> <param name="pSettingsType" value="preSet" /> @@ -558,7 +558,7 @@ The output is in SAM format, and has the following columns:: Column Description - -------- -------------------------------------------------------- + -------- -------------------------------------------------------- 1 QNAME Query (pair) NAME 2 FLAG bitwise FLAG 3 RNAME Reference sequence NAME @@ -571,7 +571,7 @@ 10 SEQ query SEQuence on the same strand as the reference 11 QUAL query QUALity (ASCII-33 gives the Phred base quality) 12 OPT variable OPTional fields in the format TAG:VTYPE:VALUE - + The flags are as follows:: Flag Description

1 0

[hg] galaxy 3474: Update tool_conf.xml.main to use the new FASTQ...
by Greg Von Kuster 03 Mar '10

03 Mar '10

details: http://www.bx.psu.edu/hg/galaxy/rev/f0e32644688b changeset: 3474:f0e32644688b user: Dan Blankenberg <dan(a)bx.psu.edu> date: Wed Mar 03 15:18:09 2010 -0500 description: Update tool_conf.xml.main to use the new FASTQ tools. Minor updates to help text for a few of the FASTQ tools. diffstat: tool_conf.xml.main | 15 +++++++++++++-- tools/fastq/fastq_filter.xml | 2 +- tools/fastq/fastq_groomer.xml | 5 ++++- tools/fastq/fastq_manipulation.xml | 10 +++++----- tools/fastq/fastq_trimmer.xml | 2 +- 5 files changed, 24 insertions(+), 10 deletions(-) diffs (116 lines): diff -r d6d156b04767 -r f0e32644688b tool_conf.xml.main --- a/tool_conf.xml.main Wed Mar 03 14:34:31 2010 -0500 +++ b/tool_conf.xml.main Wed Mar 03 15:18:09 2010 -0500 @@ -265,20 +265,31 @@ </section> <label text="NGS Toolbox Beta" id="ngs" /> <section name="NGS: QC and manipulation" id="cshl_library_information"> - <label text="Generic FASTQ data" id="fastq" /> + <label text="Illumina data" id="illumina" /> + <tool file="fastq/fastq_groomer.xml" /> + <tool file="fastq/fastq_paired_end_splitter.xml" /> + <tool file="fastq/fastq_paired_end_joiner.xml" /> + <tool file="fastq/fastq_stats.xml" /> +  <label text="Roche-454 data" id="454" /> <tool file="metag_tools/short_reads_figure_score.xml" /> <tool file="metag_tools/short_reads_trim_seq.xml" /> + <tool file="fastq/fastq_combiner.xml" /> <label text="AB-SOLiD data" id="solid" /> <tool file="next_gen_conversion/solid2fastq.xml" /> <tool file="solid_tools/solid_qual_stats.xml" /> <tool file="solid_tools/solid_qual_boxplot.xml" /> + <label text="Generic FASTQ manipulation" id="generic_fastq" /> + <tool file="fastq/fastq_filter.xml" /> + <tool file="fastq/fastq_trimmer.xml" /> + <tool file="fastq/fastq_manipulation.xml" /> + <tool file="fastq/fastq_to_fasta.xml" /> </section> <section name="NGS: Mapping" id="ngs_mapping"> <label text="Illumina" id="illumina"/> diff -r d6d156b04767 -r f0e32644688b tools/fastq/fastq_filter.xml --- a/tools/fastq/fastq_filter.xml Wed Mar 03 14:34:31 2010 -0500 +++ b/tools/fastq/fastq_filter.xml Wed Mar 03 15:18:09 2010 -0500 @@ -16,7 +16,7 @@ <param name="paired_end" label="This is paired end data" type="boolean" truevalue="paired_end" falsevalue="single_end" checked="False"/> <repeat name="fastq_filters" title="Quality Filter on a Range of Bases" help="The above settings do not apply to these filters."> <conditional name="offset_type"> - <param name="base_offset_type" type="select" label="Define Base Offsets as" help="Absolute for e.g. fixed length reads.<br>Percentage for e.g. variable length reads."> + <param name="base_offset_type" type="select" label="Define Base Offsets as" help="Use Absolute for fixed length reads (Illumina, SOLiD)<br>Use Percentage for variable length reads (Roche/454)"> <option value="offsets_absolute" selected="true">Absolute Values</option> <option value="offsets_percent">Percentage of Read Length</option> </param> diff -r d6d156b04767 -r f0e32644688b tools/fastq/fastq_groomer.xml --- a/tools/fastq/fastq_groomer.xml Wed Mar 03 14:34:31 2010 -0500 +++ b/tools/fastq/fastq_groomer.xml Wed Mar 03 15:18:09 2010 -0500 @@ -317,7 +317,7 @@ When converting, if a quality score falls outside of the target score range, it will be coerced to the closest available value (i.e. the minimum or maximum). -When converting between Solexa and the other formats, quality scores are mapped between Solexa and PHRED scales using the equations found in Cock PJ, Fields CJ, Goto N, Heuer ML, Rice PM. The Sanger FASTQ file format for sequences with quality scores, and the Solexa/Illumina FASTQ variants. Nucleic Acids Res. 2009 Dec 16. +When converting between Solexa and the other formats, quality scores are mapped between Solexa and PHRED scales using the equations found in `Cock PJ, Fields CJ, Goto N, Heuer ML, Rice PM. The Sanger FASTQ file format for sequences with quality scores, and the Solexa/Illumina FASTQ variants. Nucleic Acids Res. 2009 Dec 16.`_ When converting between color space (csSanger) and base/sequence space (Sanger, Illumina, Solexa) formats, adapter bases are lost or gained; if gained, the base 'G' is used as the adapter. You cannot convert a color space read to base space if there is no adapter present in the color space sequence. Any masked or ambiguous nucleotides in base space will be converted to 'N's when determining color space encoding. @@ -340,5 +340,8 @@ Diagram adapted from http://en.wikipedia.org/wiki/FASTQ_format + +.. _Cock PJ, Fields CJ, Goto N, Heuer ML, Rice PM. The Sanger FASTQ file format for sequences with quality scores, and the Solexa/Illumina FASTQ variants. Nucleic Acids Res. 2009 Dec 16.: http://www.ncbi.nlm.nih.gov/pubmed/20015970 + </help> </tool> diff -r d6d156b04767 -r f0e32644688b tools/fastq/fastq_manipulation.xml --- a/tools/fastq/fastq_manipulation.xml Wed Mar 03 14:34:31 2010 -0500 +++ b/tools/fastq/fastq_manipulation.xml Wed Mar 03 15:18:09 2010 -0500 @@ -89,25 +89,25 @@ </when> <when value="trim"> <conditional name="offset_type"> - <param name="base_offset_type" type="select" label="Define Base Offsets as" help="Absolute for e.g. fixed length reads.<br>Percentage for e.g. variable length reads."> + <param name="base_offset_type" type="select" label="Define Base Offsets as" help="Use Absolute for fixed length reads (Illumina, SOLiD)<br>Use Percentage for variable length reads (Roche/454)"> <option value="offsets_absolute" selected="true">Absolute Values</option> <option value="offsets_percent">Percentage of Read Length</option> </param> <when value="offsets_absolute"> - <param name="left_column_offset" label="Absolute Left Base Offset" value="0" type="integer" help="Values start at 0, increasing from the left"> + <param name="left_column_offset" label="Offset from 5' end" value="0" type="integer" help="Values start at 0, increasing from the left"> <validator type="in_range" message="Base Offsets must be positive" min="0" max="inf"/> <validator type="expression" message="An integer is required.">int( float( value ) ) == float( value )</validator> </param> - <param name="right_column_offset" label="Absolute Right Base Offset" value="0" type="integer" help="Values start at 0, increasing from the right"> + <param name="right_column_offset" label="Offset from 3' end" value="0" type="integer" help="Values start at 0, increasing from the right"> <validator type="in_range" message="Base Offsets must be positive" min="0" max="inf"/> <validator type="expression" message="An integer is required.">int( float( value ) ) == float( value )</validator> </param> </when> <when value="offsets_percent"> - <param name="left_column_offset" label="Percentage Left Base Offset" value="0" type="float"> + <param name="left_column_offset" label="Offset from 5' end" value="0" type="float"> <validator type="in_range" message="Base Offsets must be between 0 and 100" min="0" max="100"/> </param> - <param name="right_column_offset" label="Percentage Right Base Offset" value="0" type="float"> + <param name="right_column_offset" label="Offset from 3' end" value="0" type="float"> <validator type="in_range" message="Base Offsets must be between 0 and 100" min="0" max="100"/> </param> </when> diff -r d6d156b04767 -r f0e32644688b tools/fastq/fastq_trimmer.xml --- a/tools/fastq/fastq_trimmer.xml Wed Mar 03 14:34:31 2010 -0500 +++ b/tools/fastq/fastq_trimmer.xml Wed Mar 03 15:18:09 2010 -0500 @@ -4,7 +4,7 @@ <inputs> <param name="input_file" type="data" format="fastqsanger,fastqcssanger" label="FASTQ File"/> <conditional name="offset_type"> - <param name="base_offset_type" type="select" label="Define Base Offsets as"> + <param name="base_offset_type" type="select" label="Define Base Offsets as" help="Use Absolute for fixed length reads (Illumina, SOLiD)<br>Use Percentage for variable length reads (Roche/454)"> <option value="offsets_absolute" selected="true">Absolute Values</option> <option value="offsets_percent">Percentage of Read Length</option> </param>

1 0

[hg] galaxy 3473: Changes for some FASTQ tools. Move several opt...
by Greg Von Kuster 03 Mar '10

03 Mar '10

details: http://www.bx.psu.edu/hg/galaxy/rev/d6d156b04767 changeset: 3473:d6d156b04767 user: Dan Blankenberg <dan(a)bx.psu.edu> date: Wed Mar 03 14:34:31 2010 -0500 description: Changes for some FASTQ tools. Move several options of the Groomer tool under an advanced options conditional. Update help for groomer, filter and manipulation tools. diffstat: tools/fastq/fastq_filter.xml | 10 +- tools/fastq/fastq_groomer.xml | 277 ++++++++++++++++++------------------ tools/fastq/fastq_manipulation.xml | 2 +- 3 files changed, 142 insertions(+), 147 deletions(-) diffs (526 lines): diff -r bfcf6a3249c7 -r d6d156b04767 tools/fastq/fastq_filter.xml --- a/tools/fastq/fastq_filter.xml Wed Mar 03 14:30:32 2010 -0500 +++ b/tools/fastq/fastq_filter.xml Wed Mar 03 14:34:31 2010 -0500 @@ -16,7 +16,7 @@ <param name="paired_end" label="This is paired end data" type="boolean" truevalue="paired_end" falsevalue="single_end" checked="False"/> <repeat name="fastq_filters" title="Quality Filter on a Range of Bases" help="The above settings do not apply to these filters."> <conditional name="offset_type"> - <param name="base_offset_type" type="select" label="Define Base Offsets as"> + <param name="base_offset_type" type="select" label="Define Base Offsets as" help="Absolute for e.g. fixed length reads.<br>Percentage for e.g. variable length reads."> <option value="offsets_absolute" selected="true">Absolute Values</option> <option value="offsets_percent">Percentage of Read Length</option> </param> @@ -289,15 +289,15 @@ <help> This tool allows you to build complex filters to be applied to each read in a FASTQ file. -Basic Options: +**Basic Options:** * You can specify a minimum and maximum read lengths. * You can specify minimum and maximum per base quality scores, with optionally specifying the number of bases that are allowed to deviate from this range (default of 0 deviant bases). * If your data is paired-end, select the proper checkbox; this will cause each read to be internally split down the middle and filters applied to each half using the offsets specified. -Advance Options: +**Advance Options:** * You can specify any number of advanced filters. - * Offsets are defined, starting at zero, increasing from the ends of the reads. For example, a quality string of "ABCDEFG", with offsets of 1 and 1 specified will yield "BCDEF". - * You can specify either absolute offset values, or percentage offset values. When using the percent-based method, offsets are rounded to the nearest integer. + * 5' and 3' offsets are defined, starting at zero, increasing from the respective end of the reads. For example, a quality string of "ABCDEFG", with 5' and 3' offsets of 1 and 1, respectively, specified will yield "BCDEF". + * You can specify either absolute offset values, or percentage offset values. *Absolute Values* based offsets are useful for fixed length reads (e.g. Illumina or SOLiD data). *Percentage of Read Length* based offsets are useful for variable length reads (e.g. 454 data). When using the percent-based method, offsets are rounded to the nearest integer. * The user specifies the aggregating action (min, max, sum, mean) to perform on the quality score values found between the specified offsets to be used with the user defined comparison operation and comparison value. * If a set of offsets is specified that causes the remaining quality score list to be of length zero, then the read will **pass** the quality filter unless the size range filter is used to remove these reads. diff -r bfcf6a3249c7 -r d6d156b04767 tools/fastq/fastq_groomer.xml --- a/tools/fastq/fastq_groomer.xml Wed Mar 03 14:30:32 2010 -0500 +++ b/tools/fastq/fastq_groomer.xml Wed Mar 03 14:34:31 2010 -0500 @@ -1,6 +1,17 @@ -<tool id="fastq_groomer" name="FASTQ Groomer" version="1.0.1"> +<tool id="fastq_groomer" name="FASTQ Groomer" version="1.0.2"> <description>convert between various FASTQ quality formats</description> - <command interpreter="python">fastq_groomer.py '$input_file' '$input_type' '$output_file' '$output_type' '$force_quality_encoding' '$summarize_input'</command> + <command interpreter="python">fastq_groomer.py '$input_file' '$input_type' '$output_file' +#if str( $options_type['options_type_selector'] ) == 'basic': +#if str( $input_type ) == 'cssanger': +'cssanger' +#else: +'sanger' +#end if +'ascii' 'summarize_input' +#else: +'${options_type.output_type}' '${options_type.force_quality_encoding}' '${options_type.summarize_input}' +#end if +</command> <inputs> <param name="input_file" type="data" format="fastq" label="File to groom" /> <param name="input_type" type="select" label="Input FASTQ quality scores type"> @@ -9,63 +20,110 @@ <option value="sanger" selected="True">Sanger</option> <option value="cssanger">Color Space Sanger</option> </param> - <param name="output_type" type="select" label="Output FASTQ quality scores type"> - <option value="solexa">Solexa</option> - <option value="illumina">Illumina 1.3+</option> - <option value="sanger" selected="True">Sanger (recommended)</option> - <option value="cssanger">Color Space Sanger</option> + <conditional name="options_type"> + <param name="options_type_selector" type="select" label="Advanced Options"> + <option value="basic" selected="True">Hide Advanced Options</option> + <option value="advanced">Show Advanced Options</option> </param> - <param name="force_quality_encoding" type="select" label="Force Quality Score encoding"> - <option value="None">Use Source Encoding</option> - <option value="ascii" selected="True">ASCII</option> - <option value="decimal">Decimal</option> - </param> - <param name="summarize_input" type="select" label="Summarize input data"> - <option value="summarize_input" selected="True">Summarize Input</option> - <option value="dont_summarize_input">Do not Summarize Input (faster)</option> - </param> + <when value="basic"> +  + </when> + <when value="advanced"> + <param name="output_type" type="select" label="Output FASTQ quality scores type" help="Galaxy tools are designed to work with the Sanger Quality score format."> + <option value="solexa">Solexa</option> + <option value="illumina">Illumina 1.3+</option> + <option value="sanger" selected="True">Sanger (recommended)</option> + <option value="cssanger">Color Space Sanger</option> + </param> + <param name="force_quality_encoding" type="select" label="Force Quality Score encoding"> + <option value="None">Use Source Encoding</option> + <option value="ascii" selected="True">ASCII</option> + <option value="decimal">Decimal</option> + </param> + <param name="summarize_input" type="select" label="Summarize input data"> + <option value="summarize_input" selected="True">Summarize Input</option> + <option value="dont_summarize_input">Do not Summarize Input (faster)</option> + </param> + </when> + </conditional> </inputs> <outputs> - <data name="output_file" format="fastq"> + <data name="output_file" format="fastqsanger"> <change_format> - <when input="output_type" value="solexa" format="fastqsolexa" /> - <when input="output_type" value="illumina" format="fastqillumina" /> - <when input="output_type" value="sanger" format="fastqsanger" /> - <when input="output_type" value="cssanger" format="fastqcssanger" /> + <when input="input_type" value="cssanger" format="fastqcssanger" /> + <when input="options_type.output_type" value="solexa" format="fastqsolexa" /> + <when input="options_type.output_type" value="illumina" format="fastqillumina" /> + <when input="options_type.output_type" value="sanger" format="fastqsanger" /> + <when input="options_type.output_type" value="cssanger" format="fastqcssanger" /> </change_format> </data> </outputs> <tests>   +  + <test> + <param name="input_file" value="sanger_full_range_original_sanger.fastqsanger" ftype="fastq" /> + <param name="input_type" value="sanger" /> + <param name="options_type_selector" value="basic" /> + <output name="output_file" file="sanger_full_range_original_sanger.fastqsanger" /> + </test> + <test> + <param name="input_file" value="sanger_full_range_as_cssanger.fastqcssanger" ftype="fastq" /> + <param name="input_type" value="cssanger" /> + <param name="options_type_selector" value="basic" /> + <output name="output_file" file="sanger_full_range_as_cssanger.fastqcssanger" /> + </test> + <test> + <param name="input_file" value="illumina_full_range_original_illumina.fastqillumina" ftype="fastq" /> + <param name="input_type" value="illumina" /> + <param name="options_type_selector" value="basic" /> + <output name="output_file" file="illumina_full_range_as_sanger.fastqsanger" /> + </test> + <test> + <param name="input_file" value="solexa_full_range_original_solexa.fastqsolexa" ftype="fastq" /> + <param name="input_type" value="solexa" /> + <param name="options_type_selector" value="basic" /> + <output name="output_file" file="solexa_full_range_as_sanger.fastqsanger" /> + </test> + <test> + <param name="input_file" value="sanger_full_range_as_illumina.fastqillumina" ftype="fastq" /> + <param name="input_type" value="sanger" /> + <param name="options_type_selector" value="basic" /> + <output name="output_file" file="sanger_full_range_as_illumina.fastqillumina" /> + </test>  <test> - <param name="input_file" value="illumina_full_range_original_illumina.fastqillumina" ftype="fastqillumina" /> + <param name="input_file" value="illumina_full_range_original_illumina.fastqillumina" ftype="fastq" /> <param name="input_type" value="illumina" /> + <param name="options_type_selector" value="advanced" /> <param name="output_type" value="illumina" /> <param name="force_quality_encoding" value="None" /> <param name="summarize_input" value="summarize_input" /> <output name="output_file" file="illumina_full_range_original_illumina.fastqillumina" /> </test> <test> - <param name="input_file" value="illumina_full_range_original_illumina.fastqillumina" ftype="fastqillumina" /> + <param name="input_file" value="illumina_full_range_original_illumina.fastqillumina" ftype="fastq" /> <param name="input_type" value="illumina" /> + <param name="options_type_selector" value="advanced" /> <param name="output_type" value="sanger" /> <param name="force_quality_encoding" value="None" /> <param name="summarize_input" value="summarize_input" /> <output name="output_file" file="illumina_full_range_as_sanger.fastqsanger" /> </test> <test> - <param name="input_file" value="illumina_full_range_original_illumina.fastqillumina" ftype="fastqillumina" /> + <param name="input_file" value="illumina_full_range_original_illumina.fastqillumina" ftype="fastq" /> <param name="input_type" value="illumina" /> + <param name="options_type_selector" value="advanced" /> <param name="output_type" value="solexa" /> <param name="force_quality_encoding" value="None" /> <param name="summarize_input" value="summarize_input" /> <output name="output_file" file="illumina_full_range_as_solexa.fastqsolexa" /> </test> <test> - <param name="input_file" value="illumina_full_range_original_illumina.fastqillumina" ftype="fastqillumina" /> + <param name="input_file" value="illumina_full_range_original_illumina.fastqillumina" ftype="fastq" /> <param name="input_type" value="illumina" /> + <param name="options_type_selector" value="advanced" /> <param name="output_type" value="cssanger" /> <param name="force_quality_encoding" value="None" /> <param name="summarize_input" value="summarize_input" /> @@ -73,32 +131,36 @@ </test>  <test> - <param name="input_file" value="sanger_full_range_original_sanger.fastqsanger" ftype="fastqsanger" /> + <param name="input_file" value="sanger_full_range_original_sanger.fastqsanger" ftype="fastq" /> <param name="input_type" value="sanger" /> + <param name="options_type_selector" value="advanced" /> <param name="output_type" value="sanger" /> <param name="force_quality_encoding" value="None" /> <param name="summarize_input" value="summarize_input" /> <output name="output_file" file="sanger_full_range_original_sanger.fastqsanger" /> </test> <test> - <param name="input_file" value="sanger_full_range_original_sanger.fastqsanger" ftype="fastqsanger" /> + <param name="input_file" value="sanger_full_range_original_sanger.fastqsanger" ftype="fastq" /> <param name="input_type" value="sanger" /> + <param name="options_type_selector" value="advanced" /> <param name="output_type" value="illumina" /> <param name="force_quality_encoding" value="None" /> <param name="summarize_input" value="summarize_input" /> <output name="output_file" file="sanger_full_range_as_illumina.fastqillumina" /> </test> <test> - <param name="input_file" value="sanger_full_range_original_sanger.fastqsanger" ftype="fastqsanger" /> + <param name="input_file" value="sanger_full_range_original_sanger.fastqsanger" ftype="fastq" /> <param name="input_type" value="sanger" /> + <param name="options_type_selector" value="advanced" /> <param name="output_type" value="solexa" /> <param name="force_quality_encoding" value="None" /> <param name="summarize_input" value="summarize_input" /> <output name="output_file" file="sanger_full_range_as_solexa.fastqsolexa" /> </test> <test> - <param name="input_file" value="sanger_full_range_original_sanger.fastqsanger" ftype="fastqsanger" /> + <param name="input_file" value="sanger_full_range_original_sanger.fastqsanger" ftype="fastq" /> <param name="input_type" value="sanger" /> + <param name="options_type_selector" value="advanced" /> <param name="output_type" value="cssanger" /> <param name="force_quality_encoding" value="None" /> <param name="summarize_input" value="summarize_input" /> @@ -106,32 +168,36 @@ </test>  <test> - <param name="input_file" value="solexa_full_range_original_solexa.fastqsolexa" ftype="fastqsolexa" /> + <param name="input_file" value="solexa_full_range_original_solexa.fastqsolexa" ftype="fastq" /> <param name="input_type" value="solexa" /> + <param name="options_type_selector" value="advanced" /> <param name="output_type" value="solexa" /> <param name="force_quality_encoding" value="None" /> <param name="summarize_input" value="summarize_input" /> <output name="output_file" file="solexa_full_range_original_solexa.fastqsolexa" /> </test> <test> - <param name="input_file" value="solexa_full_range_original_solexa.fastqsolexa" ftype="fastqsolexa" /> + <param name="input_file" value="solexa_full_range_original_solexa.fastqsolexa" ftype="fastq" /> <param name="input_type" value="solexa" /> + <param name="options_type_selector" value="advanced" /> <param name="output_type" value="illumina" /> <param name="force_quality_encoding" value="None" /> <param name="summarize_input" value="summarize_input" /> <output name="output_file" file="solexa_full_range_as_illumina.fastqillumina" /> </test> <test> - <param name="input_file" value="solexa_full_range_original_solexa.fastqsolexa" ftype="fastqsolexa" /> + <param name="input_file" value="solexa_full_range_original_solexa.fastqsolexa" ftype="fastq" /> <param name="input_type" value="solexa" /> + <param name="options_type_selector" value="advanced" /> <param name="output_type" value="sanger" /> <param name="force_quality_encoding" value="None" /> <param name="summarize_input" value="summarize_input" /> <output name="output_file" file="solexa_full_range_as_sanger.fastqsanger" /> </test> <test> - <param name="input_file" value="solexa_full_range_original_solexa.fastqsolexa" ftype="fastqsolexa" /> + <param name="input_file" value="solexa_full_range_original_solexa.fastqsolexa" ftype="fastq" /> <param name="input_type" value="solexa" /> + <param name="options_type_selector" value="advanced" /> <param name="output_type" value="cssanger" /> <param name="force_quality_encoding" value="None" /> <param name="summarize_input" value="summarize_input" /> @@ -139,32 +205,36 @@ </test>  <test> - <param name="input_file" value="sanger_full_range_as_cssanger.fastqcssanger" ftype="fastqcssanger" /> + <param name="input_file" value="sanger_full_range_as_cssanger.fastqcssanger" ftype="fastq" /> <param name="input_type" value="cssanger" /> + <param name="options_type_selector" value="advanced" /> <param name="output_type" value="cssanger" /> <param name="force_quality_encoding" value="None" /> <param name="summarize_input" value="summarize_input" /> <output name="output_file" file="sanger_full_range_as_cssanger.fastqcssanger" /> </test> <test> - <param name="input_file" value="sanger_full_range_as_cssanger.fastqcssanger" ftype="fastqcssanger" /> + <param name="input_file" value="sanger_full_range_as_cssanger.fastqcssanger" ftype="fastq" /> <param name="input_type" value="cssanger" /> + <param name="options_type_selector" value="advanced" /> <param name="output_type" value="sanger" /> <param name="force_quality_encoding" value="None" /> <param name="summarize_input" value="summarize_input" /> <output name="output_file" file="sanger_full_range_original_sanger.fastqsanger" /> </test> <test> - <param name="input_file" value="sanger_full_range_as_cssanger.fastqcssanger" ftype="fastqcssanger" /> + <param name="input_file" value="sanger_full_range_as_cssanger.fastqcssanger" ftype="fastq" /> <param name="input_type" value="cssanger" /> + <param name="options_type_selector" value="advanced" /> <param name="output_type" value="illumina" /> <param name="force_quality_encoding" value="None" /> <param name="summarize_input" value="summarize_input" /> <output name="output_file" file="sanger_full_range_as_illumina.fastqillumina" /> </test> <test> - <param name="input_file" value="sanger_full_range_as_cssanger.fastqcssanger" ftype="fastqcssanger" /> + <param name="input_file" value="sanger_full_range_as_cssanger.fastqcssanger" ftype="fastq" /> <param name="input_type" value="cssanger" /> + <param name="options_type_selector" value="advanced" /> <param name="output_type" value="solexa" /> <param name="force_quality_encoding" value="None" /> <param name="summarize_input" value="summarize_input" /> @@ -172,24 +242,27 @@ </test>  <test> - <param name="input_file" value="wrapping_original_sanger.fastqsanger" ftype="fastqsanger" /> + <param name="input_file" value="wrapping_original_sanger.fastqsanger" ftype="fastq" /> <param name="input_type" value="sanger" /> + <param name="options_type_selector" value="advanced" /> <param name="output_type" value="sanger" /> <param name="force_quality_encoding" value="None" /> <param name="summarize_input" value="summarize_input" /> <output name="output_file" file="wrapping_as_sanger.fastqsanger" /> </test> <test> - <param name="input_file" value="wrapping_original_sanger.fastqsanger" ftype="fastqsanger" /> + <param name="input_file" value="wrapping_original_sanger.fastqsanger" ftype="fastq" /> <param name="input_type" value="sanger" /> + <param name="options_type_selector" value="advanced" /> <param name="output_type" value="illumina" /> <param name="force_quality_encoding" value="None" /> <param name="summarize_input" value="summarize_input" /> <output name="output_file" file="wrapping_as_illumina.fastqillumina" /> </test> <test> - <param name="input_file" value="wrapping_original_sanger.fastqsanger" ftype="fastqsanger" /> + <param name="input_file" value="wrapping_original_sanger.fastqsanger" ftype="fastq" /> <param name="input_type" value="sanger" /> + <param name="options_type_selector" value="advanced" /> <param name="output_type" value="solexa" /> <param name="force_quality_encoding" value="None" /> <param name="summarize_input" value="summarize_input" /> @@ -198,16 +271,18 @@   <test> - <param name="input_file" value="sanger_full_range_as_decimal_sanger.fastqsanger" ftype="fastqsanger" /> + <param name="input_file" value="sanger_full_range_as_decimal_sanger.fastqsanger" ftype="fastq" /> <param name="input_type" value="sanger" /> + <param name="options_type_selector" value="advanced" /> <param name="output_type" value="sanger" /> <param name="force_quality_encoding" value="ascii" /> <param name="summarize_input" value="summarize_input" /> <output name="output_file" file="sanger_full_range_original_sanger.fastqsanger" /> </test> <test> - <param name="input_file" value="sanger_full_range_original_sanger.fastqsanger" ftype="fastqsanger" /> + <param name="input_file" value="sanger_full_range_original_sanger.fastqsanger" ftype="fastq" /> <param name="input_type" value="sanger" /> + <param name="options_type_selector" value="advanced" /> <param name="output_type" value="sanger" /> <param name="force_quality_encoding" value="decimal" /> <param name="summarize_input" value="summarize_input" /> @@ -215,16 +290,18 @@ </test>  <test> - <param name="input_file" value="solexa_full_range_as_decimal_solexa.fastqsolexa" ftype="fastqsolexa" /> + <param name="input_file" value="solexa_full_range_as_decimal_solexa.fastqsolexa" ftype="fastq" /> <param name="input_type" value="solexa" /> + <param name="options_type_selector" value="advanced" /> <param name="output_type" value="solexa" /> <param name="force_quality_encoding" value="ascii" /> <param name="summarize_input" value="summarize_input" /> <output name="output_file" file="solexa_full_range_original_solexa.fastqsolexa" /> </test> <test> - <param name="input_file" value="solexa_full_range_original_solexa.fastqsolexa" ftype="fastqsolexa" /> + <param name="input_file" value="solexa_full_range_original_solexa.fastqsolexa" ftype="fastq" /> <param name="input_type" value="solexa" /> + <param name="options_type_selector" value="advanced" /> <param name="output_type" value="solexa" /> <param name="force_quality_encoding" value="decimal" /> <param name="summarize_input" value="summarize_input" /> @@ -236,6 +313,8 @@ This tool offers several conversions options relating to the FASTQ format. +When using *Basic* options, the output will be *sanger* formatted or *cssanger* formatted (when the input is Color Space Sanger). + When converting, if a quality score falls outside of the target score range, it will be coerced to the closest available value (i.e. the minimum or maximum). When converting between Solexa and the other formats, quality scores are mapped between Solexa and PHRED scales using the equations found in Cock PJ, Fields CJ, Goto N, Heuer ML, Rice PM. The Sanger FASTQ file format for sequences with quality scores, and the Solexa/Illumina FASTQ variants. Nucleic Acids Res. 2009 Dec 16. @@ -244,106 +323,22 @@ ----- -**Examples** +**Quality Score Comparison** -1. Converting the Solexa FASTQ data:: +:: - @Solexa scores from -5 to 62 inclusive (in that order) - ACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGT - + - ;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~ - @Solexa scores from 62 to -5 inclusive (in that order) - TGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCA - + - ~}|{zyxwvutsrqponmlkjihgfedcba`_^]\[ZYXWVUTSRQPONMLKJIHGFEDCBA@?>=<; + SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS + ...............................IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII + ..........................XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~ + | | | | | | + 33 59 64 73 104 126 + + S - Sanger Phred+33, 93 values (0, 93) (0 to 60 expected in raw reads) + I - Illumina 1.3 Phred+64, 62 values (0, 62) (0 to 40 expected in raw reads) + X - Solexa Solexa+64, 67 values (-5, 62) (-5 to 40 expected in raw reads) -- will produce the following Sanger FASTQ data:: - - @Solexa scores from -5 to 62 inclusive (in that order) - ACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGT - + - ""##$$%%&&'()*++,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_ - @Solexa scores from 62 to -5 inclusive (in that order) - TGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCA - + - _^]\[ZYXWVUTSRQPONMLKJIHGFEDCBA@?>=<;:9876543210/.-,++*)('&&%%$$##"" - -- will produce the following Illumina 1.3+ FASTQ data:: - - @Solexa scores from -5 to 62 inclusive (in that order) - ACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGT - + - AABBCCDDEEFGHIJJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~ - @Solexa scores from 62 to -5 inclusive (in that order) - TGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCA - + - ~}|{zyxwvutsrqponmlkjihgfedcba`_^]\[ZYXWVUTSRQPONMLKJJIHGFEEDDCCBBAA - -2. Converting the Illumina 1.3+ FASTQ data:: - - @Illumina PHRED scores from 0 to 62 inclusive (in that order) - ACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACG - + - @ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~ - @Illumina PHRED scores from 62 to 0 inclusive (in that order) - GCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCA - + - ~}|{zyxwvutsrqponmlkjihgfedcba`_^]\[ZYXWVUTSRQPONMLKJIHGFEDCBA@ - -- will produce the following Sanger FASTQ data:: - - @Illumina PHRED scores from 0 to 62 inclusive (in that order) - ACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACG - + - !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_ - @Illumina PHRED scores from 62 to 0 inclusive (in that order) - GCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCA - + - _^]\[ZYXWVUTSRQPONMLKJIHGFEDCBA@?>=<;:9876543210/.-,+*)('&%$#"! - -- will produce the following Solexa FASTQ data:: - - @Illumina PHRED scores from 0 to 62 inclusive (in that order) - ACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACG - + - ;;>@BCEFGHJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~ - @Illumina PHRED scores from 62 to 0 inclusive (in that order) - GCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCA - + - ~}|{zyxwvutsrqponmlkjihgfedcba`_^]\[ZYXWVUTSRQPONMLKJHGFECB@>;; - -3. Converting standard Sanger FASTQ:: - - @Sanger PHRED scores from 0 to 93 inclusive (in that order) - ACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTAC - + - !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~ - @Sanger PHRED scores from 93 to 0 inclusive (in that order) - CATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCA - + - ~}|{zyxwvutsrqponmlkjihgfedcba`_^]\[ZYXWVUTSRQPONMLKJIHGFEDCBA@?>=<;:9876543210/.-,+*)('&%$#"! - -- will produce the following Solexa FASTQ data:: - - @Sanger PHRED scores from 0 to 93 inclusive (in that order) - ACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTAC - + - ;;>@BCEFGHJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - @Sanger PHRED scores from 93 to 0 inclusive (in that order) - CATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCA - + - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~}|{zyxwvutsrqponmlkjihgfedcba`_^]\[ZYXWVUTSRQPONMLKJHGFECB@>;; - -- will produce the following Illumina 1.3+ FASTQ data:: - - @Sanger PHRED scores from 0 to 93 inclusive (in that order) - ACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTACGTAC - + - @ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - @Sanger PHRED scores from 93 to 0 inclusive (in that order) - CATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCATGCA - + - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~}|{zyxwvutsrqponmlkjihgfedcba`_^]\[ZYXWVUTSRQPONMLKJIHGFEDCBA@ +Diagram adapted from http://en.wikipedia.org/wiki/FASTQ_format </help> </tool> diff -r bfcf6a3249c7 -r d6d156b04767 tools/fastq/fastq_manipulation.xml --- a/tools/fastq/fastq_manipulation.xml Wed Mar 03 14:30:32 2010 -0500 +++ b/tools/fastq/fastq_manipulation.xml Wed Mar 03 14:34:31 2010 -0500 @@ -89,7 +89,7 @@ </when> <when value="trim"> <conditional name="offset_type"> - <param name="base_offset_type" type="select" label="Define Base Offsets as"> + <param name="base_offset_type" type="select" label="Define Base Offsets as" help="Absolute for e.g. fixed length reads.<br>Percentage for e.g. variable length reads."> <option value="offsets_absolute" selected="true">Absolute Values</option> <option value="offsets_percent">Percentage of Read Length</option> </param>

1 0

[hg] galaxy 3472: Enhance change_format tag of tool outputs to a...
by Greg Von Kuster 03 Mar '10

03 Mar '10

details: http://www.bx.psu.edu/hg/galaxy/rev/bfcf6a3249c7 changeset: 3472:bfcf6a3249c7 user: Dan Blankenberg <dan(a)bx.psu.edu> date: Wed Mar 03 14:30:32 2010 -0500 description: Enhance change_format tag of tool outputs to allow the use of Grouping Constructs. Objects can be accessed using the previously accepted bare name or using the same style as used within templates (e.g. the tool command tag). e.g. <outputs> <data name="output_file" format="fastqsanger"> <change_format> <when input="input_type" value="cssanger" format="fastqcssanger" /> <when input="options_type.output_type" value="solexa" format="fastqsolexa" /> <when input="options_type.output_type" value="illumina" format="fastqillumina" /> <when input="options_type.output_type" value="sanger" format="fastqsanger" /> <when input="options_type.output_type" value="cssanger" format="fastqcssanger" /> </change_format> </data> </outputs> or <outputs> <data name="output_file" format="fastqsanger"> <change_format> <when input="$input_type" value="cssanger" format="fastqcssanger" /> <when input="${options_type.output_type}" value="solexa" format="fastqsolexa" /> <when input="${options_type.output_type}" value="illumina" format="fastqillumina" /> <when input="${options_type.output_type}" value="sanger" format="fastqsanger" /> <when input="${options_type.output_type}" value="cssanger" format="fastqcssanger" /> </change_format> </data> </outputs> where 'options_type' is the name of the grouping parameter and 'output_type' is the name of a parameter found in this group and 'input_type' is the name of a parameter not found within a group. diffstat: lib/galaxy/tools/actions/__init__.py | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diffs (27 lines): diff -r d51de35b53d8 -r bfcf6a3249c7 lib/galaxy/tools/actions/__init__.py --- a/lib/galaxy/tools/actions/__init__.py Wed Mar 03 13:51:29 2010 -0500 +++ b/lib/galaxy/tools/actions/__init__.py Wed Mar 03 14:30:32 2010 -0500 @@ -213,12 +213,20 @@ ext = input_ext #process change_format tags if output.change_format: + params = make_dict_copy( incoming ) #FIXME: The wrapping of inputs should only be done once per call to execute; currently happens here and possibly when generating output dataset name + wrap_values( tool.inputs, params ) for change_elem in output.change_format: for when_elem in change_elem.findall( 'when' ): - check = incoming.get( when_elem.get( 'input' ), None ) + check = when_elem.get( 'input', None ) if check is not None: - if check == when_elem.get( 'value', None ): - ext = when_elem.get( 'format', ext ) + try: + if '$' not in check: + #allow a simple name or more complex specifications + check = '${%s}' % check + if str( fill_template( check, context = params ) ) == when_elem.get( 'value', None ): + ext = when_elem.get( 'format', ext ) + except: #bad tag input value; possibly referencing a param within a different conditional when block or other nonexistent grouping construct + continue else: check = when_elem.get( 'input_dataset', None ) if check is not None:

1 0

[hg] galaxy 3471: Fixed broken functional tests
by Greg Von Kuster 03 Mar '10

03 Mar '10

details: http://www.bx.psu.edu/hg/galaxy/rev/d51de35b53d8 changeset: 3471:d51de35b53d8 user: rc date: Wed Mar 03 13:51:29 2010 -0500 description: Fixed broken functional tests diffstat: test/base/twilltestcase.py | 16 +++++++++++----- test/functional/test_forms_and_requests.py | 18 +++++++++--------- 2 files changed, 20 insertions(+), 14 deletions(-) diffs (109 lines): diff -r 0291f870f2c9 -r d51de35b53d8 test/base/twilltestcase.py --- a/test/base/twilltestcase.py Wed Mar 03 13:40:26 2010 -0500 +++ b/test/base/twilltestcase.py Wed Mar 03 13:51:29 2010 -0500 @@ -1281,12 +1281,12 @@ def check_request_grid(self, state, request_name, deleted=False): self.home() self.visit_url('%s/requests/list?sort=create_time&f-state=%s&f-deleted=%s' \ - % (self.url, state, str(deleted))) + % (self.url, state.replace(' ', '+'), str(deleted))) self.check_page_for_string( request_name ) def check_request_admin_grid(self, state, request_name, deleted=False): self.home() self.visit_url('%s/requests_admin/list?sort=create_time&f-state=%s&f-deleted=%s' \ - % (self.url, state, str(deleted))) + % (self.url, state.replace(' ', '+'), str(deleted))) self.check_page_for_string( request_name ) def create_request_type( self, name, desc, request_form_id, sample_form_id, states ): self.home() @@ -1327,14 +1327,20 @@ self.check_page_for_string( new_desc ) def add_samples( self, request_id, request_name, samples ): self.home() - self.visit_url( "%s/requests/list?sort=-create_time&operation=show_request&id=%s" % ( self.url, self.security.encode_id( request_id ) )) + url = "%s/requests/list?sort=-create_time&operation=show_request&id=%s" % ( self.url, self.security.encode_id( request_id ) ) + self.visit_url( url ) self.check_page_for_string( 'Sequencing Request "%s"' % request_name ) + self.check_page_for_string( 'There are no samples.' ) + # this redundant stmt below is add so that the second form in + # the page gets selected + tc.fv( "2", "request_id", request_id ) for sample_index, sample in enumerate(samples): tc.submit( "add_sample_button" ) + self.check_page_for_string( 'Sequencing Request "%s"' % request_name ) sample_name, fields = sample - tc.fv( "1", "sample_%i_name" % sample_index, sample_name ) + tc.fv( "2", "sample_%i_name" % sample_index, sample_name ) for field_index, field_value in enumerate(fields): - tc.fv( "1", "sample_%i_field_%i" % ( sample_index, field_index ), field_value ) + tc.fv( "2", "sample_%i_field_%i" % ( sample_index, field_index ), field_value ) tc.submit( "save_samples_button" ) for sample_name, fields in samples: self.check_page_for_string( sample_name ) diff -r 0291f870f2c9 -r d51de35b53d8 test/functional/test_forms_and_requests.py --- a/test/functional/test_forms_and_requests.py Wed Mar 03 13:40:26 2010 -0500 +++ b/test/functional/test_forms_and_requests.py Wed Mar 03 13:51:29 2010 -0500 @@ -231,12 +231,12 @@ request_one.desc+' (Re-described)', fields) sa_session.refresh( request_one ) # check if the request is showing in the 'new' filter - self.check_request_grid(state='New', request_name=request_one.name) + self.check_request_grid(state=request_one.states.NEW, request_name=request_one.name) # submit the request self.submit_request( request_one.id, request_one.name ) sa_session.refresh( request_one ) # check if the request is showing in the 'submitted' filter - self.check_request_grid(state='Submitted', request_name=request_one.name) + self.check_request_grid(state=request_one.states.SUBMITTED, request_name=request_one.name) # check if the request's state is now set to 'submitted' assert request_one.state is not request_one.states.SUBMITTED, "The state of the request '%s' should be set to '%s'" \ % ( request_one.name, request_one.states.SUBMITTED ) @@ -245,7 +245,7 @@ # goto admin manage requests page self.logout() self.login( email='test(a)bx.psu.edu' ) - self.check_request_admin_grid(state='Submitted', request_name=request_one.name) + self.check_request_admin_grid(state=request_one.states.SUBMITTED, request_name=request_one.name) self.visit_url( "%s/requests_admin/list?sort=-create_time&operation=show_request&id=%s" \ % ( self.url, self.security.encode_id( request_one.id ) )) self.check_page_for_string( 'Sequencing Request "%s"' % request_one.name ) @@ -261,9 +261,9 @@ self.logout() self.login( email='test1(a)bx.psu.edu' ) # check if the request's state is now set to 'complete' -# self.check_request_grid(state='Complete', request_name=request_one.name) -# assert request_one.state is not request_one.states.COMPLETE, "The state of the request '%s' should be set to '%s'" \ -# % ( request_one.name, request_one.states.COMPLETE ) + self.check_request_grid(state='Complete', request_name=request_one.name) + assert request_one.state is not request_one.states.COMPLETE, "The state of the request '%s' should be set to '%s'" \ + % ( request_one.name, request_one.states.COMPLETE ) def test_040_admin_create_request_on_behalf_of_regular_user( self ): """Testing creating and submitting a request as an admin on behalf of a regular user""" self.logout() @@ -281,7 +281,7 @@ galaxy.model.Request.table.c.deleted==False ) ) \ .first() # check if the request is showing in the 'new' filter - self.check_request_admin_grid(state='New', request_name=request_two.name) + self.check_request_admin_grid(state=request_two.states.NEW, request_name=request_two.name) # check if the request's state is now set to 'new' assert request_two.state is not request_two.states.NEW, "The state of the request '%s' should be set to '%s'" \ % ( request_two.name, request_two.states.NEW ) @@ -294,7 +294,7 @@ self.submit_request_as_admin( request_two.id, request_two.name ) sa_session.refresh( request_two ) # check if the request is showing in the 'submitted' filter - self.check_request_admin_grid(state='Submitted', request_name=request_two.name) + self.check_request_admin_grid(state=request_two.states.SUBMITTED, request_name=request_two.name) # check if the request's state is now set to 'submitted' assert request_two.state is not request_two.states.SUBMITTED, "The state of the request '%s' should be set to '%s'" \ % ( request_two.name, request_two.states.SUBMITTED ) @@ -308,7 +308,7 @@ self.reject_request( request_two.id, request_two.name, "Rejection test comment" ) sa_session.refresh( request_two ) # check if the request is showing in the 'rejected' filter - self.check_request_admin_grid(state='Rejected', request_name=request_two.name) + self.check_request_admin_grid(state=request_two.states.REJECTED, request_name=request_two.name) # check if the request's state is now set to 'submitted' assert request_two.state is not request_two.states.REJECTED, "The state of the request '%s' should be set to '%s'" \ % ( request_two.name, request_two.states.REJECTED )

1 0

← Newer
1
...
11
12
13
14
15
16
17
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

galaxy-dev March 2010