Mercurial > hg > segmentation

changeset 6:719b4ff8e9c9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updating annotations
author miitan
date Thu, 09 Apr 2015 19:22:39 +0100
parents 237799544386
children 294f66d285af
files annotation/qupujicheng_annotation_30/1bawangbieji02.csv annotation/qupujicheng_annotation_30/1yuzhoufeng01.csv annotation/qupujicheng_annotation_30/1yuzhoufeng02.csv annotation/qupujicheng_annotation_30/2kongchengji_xipimanban.csv annotation/qupujicheng_annotation_30/2lilingbei.csv annotation/qupujicheng_annotation_30/2wenzhaoguan.csv annotation/qupujicheng_annotation_30/2xucepaocheng.csv annotation/qupujicheng_annotation_30/3dayushajia_xipikuaisanyan.csv annotation/qupujicheng_annotation_30/4qingguance.csv annotation/qupujicheng_annotation_30/4yaoqi.csv annotation/qupujicheng_annotation_30/5suolinnang.csv annotation/qupujicheng_annotation_30/6liuyuexue.csv annotation/qupujicheng_annotation_30/6zhuofangcao_erhuangmanbanyuanban.csv annotation/qupujicheng_annotation_30/6zhuofangcao_xipimanban.csv annotation/qupujicheng_annotation_30/7jinyunu01.csv annotation/qupujicheng_annotation_30/7jinyunu04.csv annotation/qupujicheng_annotation_30/7jinyunu06.csv annotation/qupujicheng_annotation_30/7longfengchengxiang.csv annotation/qupujicheng_annotation_30/7sangyuanjizi.csv annotation/qupujicheng_annotation_30/8zuozhaidaoma01.csv annotation/qupujicheng_annotation_30/8zuozhaidaoma02.csv annotation/qupujicheng_annotation_30/9shangtiantai_erhaungkuaisanyan.csv annotation/qupujicheng_annotation_30/9shangtiantai_erhuangsanyan.csv annotation/qupujicheng_annotation_30/9shangtiantai_erhuangyuanban.csv
diffstat 24 files changed, 230 insertions(+), 397 deletions(-) [+]
line wrap: on
line diff
--- a/annotation/qupujicheng_annotation_30/1bawangbieji02.csv	Thu Apr 09 17:54:49 2015 +0100
+++ b/annotation/qupujicheng_annotation_30/1bawangbieji02.csv	Thu Apr 09 19:22:39 2015 +0100
@@ -1,24 +1,38 @@
 0.285170068,s
-8.475283446,New Point
 10.762448979,New Point
-25.338775510,New Point
+13.560453514,New Point
+18.982312925,New Point
+21.530702947,New Point
+23.893333333,New Point
+30.586485260,New Point
+32.449886621,New Point
 33.991836734,New Point
+37.923990929,New Point
 39.787755102,a
 51.362539682,s
 59.721723356,a
 76.556190476,s
-82.709478458,New Point
+83.406077097,New Point
+85.449433106,New Point
 87.183673469,a
-114.081496598,s
+93.889886621,New Point
+98.168163265,New Point
+114.481496598,s
+118.726530612,New Point
 123.771428571,a
 139.395918367,s
 147.073469387,a
-183.208163265,s
+156.270294784,New Point
+170.195918367,New Point
+186.220408163,New Point
 189.844897959,s 
 195.330612244,New Point
+197.973333333,New Point
+201.412244897,New Point
+205.489795918,New Point
 206.669387755,a
 216.783673469,New Point
 222.040816326,New Point
-236.538775510,New Point
+229.134512471,New Point
 256.946938775,New Point
 256.975238095,end
--- a/annotation/qupujicheng_annotation_30/1yuzhoufeng01.csv	Thu Apr 09 17:54:49 2015 +0100
+++ b/annotation/qupujicheng_annotation_30/1yuzhoufeng01.csv	Thu Apr 09 19:22:39 2015 +0100
@@ -1,24 +1,26 @@
 0.000000000,s
 1.502040816,New Point
 24.171972789,a
-34.220408163,New Point
+32.565986394,New Point
 35.918367346,New Point
 40.930612244,New Point
 50.039002267,s
-60.975600907,New Point
+62.682267573,New Point
 66.037551020,New Point
 73.932335600,a
-95.532471655,s
+86.749750566,New Point
+96.132471655,s
 99.673469387,New Point
 117.516190476,a
-125.779591836,New Point
+128.998458049,New Point
 137.240816326,New Point
-150.595918367,New Point
-155.722448979,New Point
+151.498594104,New Point
+157.651882086,New Point
 166.997913832,p
 174.219319727,s
 181.951564625,a
-186.693877551,New Point
+188.975600907,New Point
+196.638185941,New Point
 204.163265306,New Point
 217.417414965,p
 224.153832199,end
--- a/annotation/qupujicheng_annotation_30/1yuzhoufeng02.csv	Thu Apr 09 17:54:49 2015 +0100
+++ b/annotation/qupujicheng_annotation_30/1yuzhoufeng02.csv	Thu Apr 09 19:22:39 2015 +0100
@@ -1,53 +1,58 @@
 0.000000000,p
 9.534421768,s
 12.767346938,New Point
+16.342857142,New Point
 28.506122448,New Point
+34.644172335,New Point
 38.171428571,New Point
 41.795918367,a
-51.689795918,New Point
-72.848979591,New Point
+57.051428571,New Point
 76.347210884,s
 87.477551020,New Point
-90.975782312,New Point
 94.458775510,a
 102.726530612,New Point
 136.576371882,s
-144.489795918,New Point
 155.461224489,New Point
 159.053061224,New Point
 162.725442176,a
 179.461224489,New Point
 194.253061224,New Point
 200.228571428,New Point
-208.653061224,New Point
 228.065623582,s
-233.991836734,New Point
+233.499863945,New Point
+249.242993197,New Point
+252.400907029,New Point
 255.605260770,a
 264.587755102,New Point
 268.963265306,New Point
 286.302040816,s
+308.941496598,New Point
 312.195918367,New Point
 315.605623582,a
-321.665306122,New Point
+323.755827664,New Point
 347.559183673,New Point
 369.893877551,New Point
-390.907936507,New Point
-414.429750566,New Point
+427.595464852,New Point
 442.155102040,New Point
-452.897959183,p
+453.597959183,p
 462.077097505,s
 481.953378684,New Point
 485.668571428,a
-496.790929705,New Point
 499.855963718,New Point
-511.651700680,New Point
+513.834376417,New Point
+523.482267573,New Point
+533.791927437,New Point
 539.535464852,a
 563.943038548,New Point
 578.083990929,a
+589.142857142,New Point
 603.457823129,s
-612.031564625,New Point
 620.390748299,a
-632.097959183,New Point
-661.954467120,p
+626.857142857,New Point
+636.179591836,New Point
+651.820408163,New Point
+658.236734693,New Point
+665.355102040,New Point
 671.196009070,New Point
+676.914285714,New Point
 682.248707482,end
--- a/annotation/qupujicheng_annotation_30/2kongchengji_xipimanban.csv	Thu Apr 09 17:54:49 2015 +0100
+++ b/annotation/qupujicheng_annotation_30/2kongchengji_xipimanban.csv	Thu Apr 09 19:22:39 2015 +0100
@@ -1,26 +1,34 @@
 0.000000000,p
 10.777551020,s
+15.348390022,New Point
 34.253061224,a
 62.879637188,New Point
 71.331700680,New Point
+77.252789115,New Point
 83.940136054,New Point
 103.738775510,s
 120.685714285,a
-139.087528344,New Point
+142.013242630,New Point
 154.991836734,s
 173.627210884,a
+183.205442176,New Point
 187.361814058,New Point
-191.738775510,s
+192.138775510,s
+196.696235827,New Point
+203.522902494,New Point
 207.248979591,a
-231.967346938,s
+234.080362811,New Point
 249.142857142,a
 262.553287981,s
 272.602267573,a
-277.893877551,New Point
+280.589931972,New Point
 293.221587301,s
+297.877188208,New Point
 307.014240362,a
+317.370340136,New Point
+328.469478458,New Point
 341.484263038,s
-351.134693877,New Point
+347.463401360,New Point
 353.407709750,p
 355.102766439,New Point
 358.817959183,s
--- a/annotation/qupujicheng_annotation_30/2lilingbei.csv	Thu Apr 09 17:54:49 2015 +0100
+++ b/annotation/qupujicheng_annotation_30/2lilingbei.csv	Thu Apr 09 19:22:39 2015 +0100
@@ -8,7 +8,6 @@
 112.440816326,New Point
 134.907936507,s
 152.253242630,a
-168.293877551,New Point
 169.828571428,New Point
 187.434557823,s
 202.210975056,a
@@ -16,51 +15,66 @@
 209.289795918,New Point
 219.275782312,s
 233.674013605,a
-258.073469387,New Point
+262.008163265,New Point
 270.489251700,s
 280.903401360,New Point
 284.072925170,a
 287.904217687,New Point
 290.818321995,New Point
-290.944195011,1.2
-299.073015873,s
+299.820408163,New Point
 310.334693877,a
+314.497959183,New Point
+320.065306122,New Point
+324.130612244,New Point
 331.766712018,New Point
-335.447074829,New Point
-339.487346938,New Point
-345.045578231,s
+341.975510204,New Point
+345.420408163,New Point
+353.583673469,New Point
 356.702040816,a
 367.069387755,s
 382.579591836,a
-386.194285714,New Point
-400.312018140,New Point
-405.791927437,New Point
+391.379591836,New Point
+401.551020408,New Point
 415.660408163,New Point
-419.816780045,New Point
+420.114285714,New Point
 425.893877551,s
 434.987755102,a
+461.975510204,New Point
+479.967346938,New Point
 497.162448979,New Point
-529.972244897,New Point
+535.196734693,New Point
 545.088435374,p
-554.422857142,New Point
-556.698412698,New Point
+555.771428571,New Point
 560.761904761,s
 568.018140589,a
 581.090975056,s
 587.522902494,a
+591.983673469,New Point
+598.008163265,New Point
+602.514285714,New Point
+609.959183673,New Point
+617.257142857,New Point
+632.016326530,New Point
+639.493877551,New Point
+646.987755102,New Point
+654.302040816,New Point
 661.559727891,New Point
-677.418956916,New Point
-690.631111111,New Point
+688.310204081,New Point
+690.277551020,New Point
 702.055328798,p
 710.344852607,New Point
+713.020408163,New Point
 717.148299319,s
 723.498956916,a
+727.885714285,New Point
+732.236734693,New Point
 745.499863945,p+s
-749.679455782,New Point
 752.372970521,a
-756.761541950,New Point
+757.093877551,New Point
 763.497188208,s
+765.567346938,New Point
 772.202811791,New Point
+774.987755102,New Point
 781.036734693,p
 783.348390022,New Point
 786.824489795,s
@@ -73,14 +87,17 @@
 839.447800453,New Point
 849.983673469,s
 854.734693877,a
-865.129070294,New Point
 871.746757369,New Point
+875.369070294,New Point
+883.031655328,New Point
 899.036734693,p
 901.096780045,New Point
-928.889795918,a
+908.155646258,New Point
+928.391836734,New Point
 942.824489795,p
 945.497959183,a
-954.665215419,New Point
-961.004263038,New Point
+956.505396825,New Point
+967.987664399,New Point
 971.710204081,p
+984.200997732,New Point
 984.489795918,end
--- a/annotation/qupujicheng_annotation_30/2wenzhaoguan.csv	Thu Apr 09 17:54:49 2015 +0100
+++ b/annotation/qupujicheng_annotation_30/2wenzhaoguan.csv	Thu Apr 09 19:22:39 2015 +0100
@@ -1,38 +1,41 @@
 0.000000000,p
 2.514285714,s
-6.896326530,New Point
 27.265306122,a
 36.455328798,New Point
 49.926530612,s
 61.061224489,a
 88.751020408,s
-112.105941043,New Point
+105.186394557,New Point
 117.028571428,a
 125.945034013,New Point
+135.778684807,New Point
 154.285714285,s
 164.081632653,a
 167.090793650,New Point
 170.480907029,New Point
 180.604081632,s
 191.085714285,a
-195.488798185,New Point
+201.084807256,New Point
 205.403718820,New Point
+218.325623582,New Point
 222.493605442,New Point
 232.431746031,New Point
 235.102040816,New Point
 246.386938775,New Point
-262.478367346,New Point
-275.086802721,New Point
+252.191927437,New Point
+263.093696145,New Point
+269.026394557,New Point
 282.076009070,New Point
 290.690612244,New Point
-298.956916099,New Point
+298.424489795,New Point
 312.912108843,New Point
 327.192380952,New Point
 329.746575963,New Point
-349.994376417,New Point
+347.338775510,New Point
 365.319546485,New Point
 370.172517006,New Point
-377.463582766,New Point
+382.481632653,New Point
+395.885714285,New Point
 416.333786848,s
 440.761179138,a
 447.169886621,New Point
@@ -41,37 +44,33 @@
 481.767619047,s
 486.204081632,New Point
 491.624489795,New Point
-505.763265306,New Point
+499.379591836,New Point
 513.446439909,s+p
 520.312743764,a
 526.563265306,New Point
+528.530612244,New Point
 559.967346938,New Point
-564.489795918,New Point
 567.281632653,New Point
-569.061224489,New Point
-574.008163265,New Point
-576.424489795,New Point
 584.081632653,p
 595.313197278,s
 601.861224489,a
 607.159183673,New Point
 615.886077097,s
+626.546938775,New Point
 635.808798185,a
-641.404081632,New Point
-645.355102040,New Point
+643.632653061,New Point
 657.200000000,s+p
-659.911111111,s
 663.836734693,a
 678.889795918,New Point
-688.179591836,New Point
 703.289795918,p+s
 709.714285714,a
-712.063129251,New Point
+719.040725623,New Point
+726.459501133,New Point
+733.007528344,New Point
 741.738231292,p
 753.835827664,s
 760.198095238,a
+774.211337868,New Point
 777.357641723,a
-780.004716553,New Point
-788.050430839,New Point
-795.428571428,a+p
+806.870204081,New Point
 806.987755102,end
--- a/annotation/qupujicheng_annotation_30/2xucepaocheng.csv	Thu Apr 09 17:54:49 2015 +0100
+++ b/annotation/qupujicheng_annotation_30/2xucepaocheng.csv	Thu Apr 09 19:22:39 2015 +0100
@@ -3,15 +3,11 @@
 14.895600907,s
 21.292698412,a
 32.496326530,s
-36.768798185,a
 42.980136054,New Point
-47.763446712,s
 52.082358276,a
-66.385850340,New Point
-71.563900226,New Point
+69.543764172,New Point
 80.051247165,p
 90.604263038,s
-96.362811791,a
 116.576553287,p
 119.652426303,New Point
 121.951201814,New Point
@@ -22,14 +18,12 @@
 159.799727891,s
 164.072199546,a
 169.946848072,New Point
-178.306031746,New Point
 181.835464852,p
 193.201632653,s
-194.971428571,New Point
 209.600000000,New Point
 239.026213151,New Point
 246.089795918,New Point
-249.289433106,a+p
 250.311111111,New Point
 262.106122448,p
+267.958276643,New Point
 268.167256235,end
--- a/annotation/qupujicheng_annotation_30/3dayushajia_xipikuaisanyan.csv	Thu Apr 09 17:54:49 2015 +0100
+++ b/annotation/qupujicheng_annotation_30/3dayushajia_xipikuaisanyan.csv	Thu Apr 09 19:22:39 2015 +0100
@@ -1,18 +1,15 @@
 0.000000000,p
-3.227573696,New Point
 7.453605442,s
 25.193650793,a
-37.523446712,New Point
 41.540498866,s
 53.521995464,a
 67.802267573,s
 78.661224489,a
+89.048526077,New Point
 95.680000000,s
 109.044897959,a
-117.655510204,New Point
 124.818866213,New Point
 137.717551020,New Point
-142.236734693,s
 151.657142857,a
 164.089795918,p+s
 176.783673469,a
--- a/annotation/qupujicheng_annotation_30/4qingguance.csv	Thu Apr 09 17:54:49 2015 +0100
+++ b/annotation/qupujicheng_annotation_30/4qingguance.csv	Thu Apr 09 19:22:39 2015 +0100
@@ -16,17 +16,19 @@
 219.310204081,s
 231.828027210,New Point
 244.807981859,a
-254.583582766,New Point
+258.159455782,New Point
+277.362358276,New Point
 289.191836734,s
-299.351655328,New Point
 311.635011337,a
 320.528253968,New Point
 324.243446712,New Point
+342.656870748,New Point
 375.118367346,s
 400.587755102,a
 408.926621315,New Point
 412.850793650,New Point
-428.152743764,New Point
+430.846258503,New Point
+456.736507936,New Point
 473.129795918,New Point
 481.600000000,s
 497.012244897,a
--- a/annotation/qupujicheng_annotation_30/4yaoqi.csv	Thu Apr 09 17:54:49 2015 +0100
+++ b/annotation/qupujicheng_annotation_30/4yaoqi.csv	Thu Apr 09 19:22:39 2015 +0100
@@ -4,32 +4,29 @@
 36.873287981,New Point
 47.066848072,s
 58.816145124,a
-67.404081632,New Point
-78.008163265,New Point
+73.467936507,New Point
+87.216326530,New Point
 97.959092970,p
 106.302040816,New Point
 115.613696145,s
-120.424489795,New Point
+120.930612244,New Point
 128.556507936,a
 142.391836734,p
-146.204081632,New Point
 149.551020408,New Point
 158.708390022,s
 169.308299319,a
 181.510385487,a
-202.432653061,New Point
 208.865034013,p
 217.106575963,s
-225.257142857,New Point
 227.694875283,a
-229.959183673,New Point
 236.244897959,New Point
+240.721269841,New Point
+244.796371882,New Point
 254.454331065,p
 263.640816326,New Point
 267.911836734,s
 277.640997732,a
 292.457142857,New Point
-306.253061224,New Point
-313.306122448,New Point
 314.444625850,p
+318.775147392,New Point
 318.937687074,end
--- a/annotation/qupujicheng_annotation_30/5suolinnang.csv	Thu Apr 09 17:54:49 2015 +0100
+++ b/annotation/qupujicheng_annotation_30/5suolinnang.csv	Thu Apr 09 19:22:39 2015 +0100
@@ -16,18 +16,19 @@
 189.355102040,a
 200.573968253,New Point
 219.567891156,New Point
+234.951111111,New Point
 245.620680272,New Point
-256.510839002,New Point
-260.902040816,s
+262.971428571,New Point
 270.883990929,New Point
 279.254784580,a
-301.836190476,New Point
-306.526621315,New Point
-324.754285714,New Point
+295.746938775,New Point
+320.351020408,New Point
+330.628571428,New Point
+338.351020408,New Point
 357.993650793,s
 372.378412698,a
 379.948117913,New Point
-392.115374149,New Point
+387.715192743,New Point
 405.665306122,s
 422.677551020,a
 430.080000000,New Point
@@ -35,6 +36,8 @@
 461.601088435,s
 470.367346938,a 
 489.801723356,New Point
+494.468934240,New Point
 499.438004535,New Point
-519.616145124,New Point
+504.825034013,New Point
+524.800000000,New Point
 525.072834467,end
--- a/annotation/qupujicheng_annotation_30/6liuyuexue.csv	Thu Apr 09 17:54:49 2015 +0100
+++ b/annotation/qupujicheng_annotation_30/6liuyuexue.csv	Thu Apr 09 19:22:39 2015 +0100
@@ -1,77 +1,59 @@
 0.000000000,p
-1.828571428,s
+9.636281179,New Point
 12.817414965,New Point
+20.886349206,New Point
 27.376326530,a
-31.091519274,New Point
 38.359365079,New Point
 42.329977324,New Point
-52.686077097,New Point
 62.043718820,s
-66.710929705,New Point
+68.162176870,New Point
 86.610430839,a
-93.460317460,New Point
 96.177052154,New Point
 102.028480725,New Point
-120.023945578,New Point
-124.667936507,New Point
 136.351020408,s
-147.678911564,New Point
 167.276553287,a
-174.706938775,New Point
-181.254965986,New Point
 184.064580498,New Point
-194.629659863,New Point
-198.182312925,New Point
 201.084807256,a
-204.892879818,New Point
-208.654512471,New Point
 213.507482993,New Point
-217.849614512,New Point
 239.289795918,s
+250.008163265,New Point
 263.128526077,a
 272.764807256,New Point
 277.757097505,New Point
 296.391111111,s
 319.947755102,a
-328.074739229,New Point
+330.938775510,New Point
 349.831836734,New Point
 356.960362811,New Point
-366.225124716,New Point
 370.404716553,New Point
 390.155102040,s
 408.555102040,New Point
+426.889795918,New Point
 443.710113378,a
-457.322448979,New Point
-461.371428571,New Point
-470.138775510,New Point
+458.824489795,New Point
 473.567346938,New Point
+485.551020408,New Point
 494.057142857,New Point
 507.959727891,New Point
 514.995374149,New Point
 520.034104308,New Point
 528.880907029,New Point
-539.376326530,New Point
 543.068299319,New Point
 549.848526077,New Point
+563.461224489,New Point
 568.238730158,New Point
-584.632018140,New Point
+577.420408163,New Point
 589.647528344,New Point
-595.661496598,New Point
 598.378231292,New Point
-608.873650793,New Point
 612.495963718,New Point
-620.692607709,New Point
 624.570340136,New Point
-684.826122448,New Point
+638.318367346,New Point
+646.955102040,New Point
 692.419047619,s
 697.713197278,New Point
-702.519727891,New Point
-711.877369614,New Point
 715.406802721,a
-721.490430839,New Point
-729.060136054,New Point
 731.567891156,New Point
-743.131428571,New Point
-752.117551020,New Point
+754.764625850,New Point
 769.625396825,p
+776.939682539,New Point
 777.287981859,end
--- a/annotation/qupujicheng_annotation_30/6zhuofangcao_erhuangmanbanyuanban.csv	Thu Apr 09 17:54:49 2015 +0100
+++ b/annotation/qupujicheng_annotation_30/6zhuofangcao_erhuangmanbanyuanban.csv	Thu Apr 09 19:22:39 2015 +0100
@@ -3,82 +3,56 @@
 10.541859410,New Point
 20.921179138,New Point
 28.702040816,a
-35.062131519,New Point
 47.967346938,s
-52.291337868,New Point
 58.235646258,a
-71.308480725,New Point
 84.195555555,s
-94.226575963,New Point
+95.759092970,New Point
 103.270748299,New Point
 109.014603174,a
-117.968979591,New Point
-125.561904761,New Point
+121.510022675,New Point
+126.688072562,New Point
 139.176689342,s
-146.566530612,a
-153.228480725,New Point
-157.651882086,New Point
+148.236190476,New Point
 161.802448979,New Point
-165.000997732,New Point
 170.550566893,New Point
-178.323446712,New Point
-188.993015873,New Point
+179.884988662,New Point
 195.559183673,New Point
-201.534693877,New Point
-209.942857142,New Point
-221.159183673,New Point
-237.338775510,New Point
-245.453061224,New Point
-250.987755102,New Point
-257.393197278,New Point
-266.727619047,New Point
-272.068208616,New Point
-279.080634920,New Point
-284.440816326,New Point
-299.020408163,New Point
-308.506122448,New Point
+211.440907029,New Point
+227.114376417,New Point
+243.066485260,New Point
+258.577414965,New Point
+273.531065759,New Point
+285.582222222,New Point
+300.768072562,New Point
 311.297959183,New Point
-316.277551020,New Point
-322.612244897,New Point
 333.508208616,s
-338.269387755,New Point
 341.126530612,New Point
-343.836734693,New Point
-346.889795918,New Point
 349.583673469,New Point
 361.893877551,a
-365.665306122,New Point
-370.318367346,New Point
 373.012244897,New Point
-376.620408163,New Point
-383.657142857,New Point
-389.959183673,New Point
-394.808163265,New Point
+387.076643990,New Point
+397.339863945,New Point
 406.171428571,New Point
-423.412244897,s
-433.910204081,New Point
+424.356281179,New Point
 442.130612244,a
 445.273469387,New Point
 449.648979591,New Point
 451.526530612,New Point
 459.871201814,New Point
-464.863492063,New Point
-475.033832199,New Point
-481.600000000,p 
+464.886712018,New Point
 485.355102040,a
 490.730521541,a
 499.298684807,New Point
-510.897052154,a 
 514.809614512,New Point
 519.732244897,New Point
 529.949024943,New Point
 533.966077097,New Point
-545.761814058,New Point
 547.944489795,p
 553.261859410,New Point
 562.433741496,a
 576.574693877,New Point
 579.988027210,New Point
 589.322448979,p
+594.106122448,New Point
 594.384399092,end
 18815.944852607,New Point
--- a/annotation/qupujicheng_annotation_30/6zhuofangcao_xipimanban.csv	Thu Apr 09 17:54:49 2015 +0100
+++ b/annotation/qupujicheng_annotation_30/6zhuofangcao_xipimanban.csv	Thu Apr 09 19:22:39 2015 +0100
@@ -3,40 +3,27 @@
 5.893877551,New Point
 10.497959183,s
 30.098866213,a
-33.018775510,New Point
-36.832653061,New Point
+39.493877551,New Point
 52.514285714,s
-56.881632653,New Point
 61.453061224,New Point
 69.257142857,a
-72.897959183,New Point
-75.902040816,New Point
+77.469387755,New Point
 86.130612244,s
 90.840816326,New Point
 100.995918367,a
-104.114285714,New Point
-108.065306122,New Point
+109.273469387,New Point
 117.175510204,s
-121.142857142,New Point
 126.285714285,New Point
 133.820408163,a
-137.061224489,New Point
-141.436734693,New Point
-147.911111111,New Point
-162.992471655,New Point
-165.941405895,New Point
+142.334693877,New Point
+148.261224489,New Point
+163.265306122,New Point
 180.302040816,s
-185.097868480,New Point
 194.857142857,a
-197.648253968,New Point
-200.318548752,New Point
 202.579591836,New Point
 207.836734693,New Point
-227.771428571,New Point
 232.906122448,s
 235.893877551,New Point
 246.995918367,a
-252.097959183,New Point
-256.914285714,New Point
-259.500952380,a 
+263.640816326,New Point
 263.871564625,end
--- a/annotation/qupujicheng_annotation_30/7jinyunu01.csv	Thu Apr 09 17:54:49 2015 +0100
+++ b/annotation/qupujicheng_annotation_30/7jinyunu01.csv	Thu Apr 09 19:22:39 2015 +0100
@@ -1,26 +1,18 @@
 0.000000000,p
 2.623854875,s
 18.436643990,a
-22.360816326,New Point
-26.612244897,New Point
 29.861224489,New Point
 48.343945578,s
-52.685714285,New Point
 61.983673469,New Point
 67.020408163,New Point
 72.121179138,a
-76.897959183,New Point
 89.404081632,New Point
-98.800907029,s
 99.461224489,New Point
 113.800997732,a
-117.469387755,New Point
 124.693877551,New Point
-128.351020408,New Point
 132.114285714,New Point
-136.008163265,New Point
 140.424489795,New Point
 145.012244897,New Point
-151.324444444,s
 153.763265306,New Point
+156.897233560,New Point
 157.175873015,end
--- a/annotation/qupujicheng_annotation_30/7jinyunu04.csv	Thu Apr 09 17:54:49 2015 +0100
+++ b/annotation/qupujicheng_annotation_30/7jinyunu04.csv	Thu Apr 09 19:22:39 2015 +0100
@@ -5,24 +5,17 @@
 13.653333333,a
 22.267936507,New Point
 27.353106575,New Point
-30.696780045,New Point
-36.861678004,New Point
 38.545124716,a
-40.240181405,New Point
-42.875646258,New Point
-44.884172335,New Point
-50.422131519,New Point
+45.209251700,New Point
+51.153560090,New Point
 60.882721088,New Point
-64.029024943,New Point
+64.412154195,New Point
 69.474104308,s
 72.724897959,New Point
 75.743492063,a 
-85.101133786,New Point
 94.481995464,New Point
 99.195646258,New Point
-104.106666666,New Point
 112.338140589,New Point
-118.839727891,New Point
 121.208163265,s
 125.399365079,New Point
 128.325079365,New Point
@@ -35,29 +28,23 @@
 161.912743764,p
 164.977777777,New Point
 170.306757369,a
-176.924444444,New Point
-187.477913832,New Point
-190.124988662,New Point
 194.548390022,New Point
 197.787573696,a
 206.355736961,New Point
 209.060861678,New Point
 211.336417233,New Point
 217.094965986,New Point
-224.618231292,New Point
 227.543945578,New Point
 235.450340136,New Point
 242.950385487,New Point
-248.732154195,s
 250.485260770,New Point
 254.815782312,New Point
 260.643990929,a
-263.511655328,New Point
 265.009342403,New Point
 271.313560090,New Point
-275.144852607,New Point
 275.945941043,New Point
 280.102312925,a
 290.307482993,New Point
 294.800544217,p
+296.820680272,New Point
 297.192199546,end
--- a/annotation/qupujicheng_annotation_30/7jinyunu06.csv	Thu Apr 09 17:54:49 2015 +0100
+++ b/annotation/qupujicheng_annotation_30/7jinyunu06.csv	Thu Apr 09 19:22:39 2015 +0100
@@ -1,34 +1,25 @@
 0.032653061,p
-2.252335600,New Point
 9.208163265,s
-24.783673469,New Point
 27.297959183,a
-34.791836734,New Point
 38.416326530,New Point
-42.065306122,New Point
 46.702040816,New Point
 50.677551020,New Point
-56.408163265,New Point
 59.110204081,New Point
-68.963265306,p+s
 70.334693877,New Point
+75.929251700,New Point
 83.638276643,New Point
-86.714920634,New Point
 88.293877551,a
 98.986666666,New Point
 104.768435374,New Point
-116.262312925,New Point
 118.723628117,New Point
-130.333605442,New Point
+132.934240362,New Point
 153.855419501,p
 156.978503401,New Point
 161.518004535,a
-169.981678004,New Point
+170.271927437,New Point
 174.532789115,New Point
 185.504217687,New Point
 191.761995464,New Point
-205.717188208,New Point
 206.146757369,New Point
-209.632653061,p
 212.218775510,New Point
 216.456417233,end
--- a/annotation/qupujicheng_annotation_30/7longfengchengxiang.csv	Thu Apr 09 17:54:49 2015 +0100
+++ b/annotation/qupujicheng_annotation_30/7longfengchengxiang.csv	Thu Apr 09 19:22:39 2015 +0100
@@ -3,17 +3,11 @@
 14.976870748,New Point
 26.356190476,s
 34.481632653,New Point
-52.964716553,New Point
 57.492607709,New Point
-66.873469387,New Point
 68.410204081,a
-74.048435374,New Point
 79.644444444,New Point
-87.423129251,New Point
 94.365895691,New Point
-103.328798185,New Point
 105.616326530,a
-113.220498866,New Point
 117.098231292,New Point
 128.243809523,New Point
 138.285714285,s
@@ -24,8 +18,6 @@
 176.680634920,New Point
 183.832380952,New Point
 190.426848072,New Point
-200.922267573,New Point
-208.329433106,New Point
 211.046167800,New Point
 223.329523809,New Point
 235.589659863,New Point
@@ -39,36 +31,28 @@
 275.342222222,New Point
 280.264852607,New Point
 287.657142857,a
-292.246349206,New Point
-295.752562358,New Point
 297.586938775,New Point
-304.274285714,s
-307.246439909,New Point
 310.497233560,a
 320.760453514,New Point
 327.238820861,New Point
 341.867392290,New Point
-351.805532879,s
+352.641451247,New Point
 366.759183673,New Point
-373.400090702,New Point
 387.330612244,a
 396.921904761,New Point
-410.412698412,New Point
+411.062857142,New Point
+425.946848072,New Point
 442.808163265,s
 451.117278911,New Point
 459.960362811,a
-465.095691609,New Point
+470.505941043,New Point
 476.995918367,s
 482.971428571,a
 501.165260770,s
-508.540226757,New Point
 509.770884353,New Point
-526.512471655,New Point
 537.263310657,a
 546.411972789,New Point
-560.483265306,New Point
 563.362539682,New Point
-571.164444444,New Point
 572.255782312,New Point
 577.340952380,p
 580.475646258,New Point
--- a/annotation/qupujicheng_annotation_30/7sangyuanjizi.csv	Thu Apr 09 17:54:49 2015 +0100
+++ b/annotation/qupujicheng_annotation_30/7sangyuanjizi.csv	Thu Apr 09 19:22:39 2015 +0100
@@ -1,51 +1,39 @@
 0.000000000,p
 7.500045351,New Point
-20.166530612,New Point
 21.548117913,p+sp
 27.353106575,New Point
-30.441360544,New Point
 34.906122448,s
 55.507460317,a
-61.950839002,New Point
+63.738775510,New Point
 74.605714285,New Point
 83.963356009,New Point
-88.026848072,New Point
-93.878276643,New Point
-95.921632653,New Point
-98.197188208,New Point
 105.232834467,s
 118.723628117,a
-124.784036281,New Point
+126.107573696,New Point
+133.979138321,New Point
 142.942040816,New Point
 152.508662131,s
 162.609342403,a
-166.463854875,New Point
+168.785850340,New Point
 176.216235827,s
-180.628027210,New Point
 184.714739229,a
 193.942857142,New Point
 206.906122448,New Point
 214.840816326,New Point
 217.861224489,New Point
-222.236734693,New Point
+219.962630385,New Point
 225.129841269,p
 228.620408163,New Point
 233.028571428,New Point
 245.061224489,New Point
 251.564988662,s
-253.648979591,New Point
 256.391836734,New Point
 265.914920634,a
-268.685714285,New Point
-273.387755102,New Point
 275.069387755,New Point
 287.281632653,New Point
-304.251065759,s
 307.519818594,a
-310.938775510,New Point
 313.371428571,New Point
 322.316190476,p
-325.518367346,New Point
 328.146938775,New Point
 342.958730158,a
 346.367346938,New Point
@@ -53,24 +41,16 @@
 359.793197278,p
 362.971428571,s
 374.421768707,a
-377.926530612,New Point
-382.791836734,New Point
 387.412244897,New Point
 391.983673469,New Point
 397.420408163,New Point
-407.823673469,s
 410.877097505,a
-413.844897959,New Point
-421.790476190,p+a
 423.363265306,New Point
 429.824580498,a
-434.008163265,New Point
-444.278231292,p
 445.485714285,New Point
 448.586303854,s
 453.973333333,a
 459.820408163,New Point
 470.575600907,p
-474.546938775,New Point
 479.020408163,New Point
 480.049342403,end
--- a/annotation/qupujicheng_annotation_30/8zuozhaidaoma01.csv	Thu Apr 09 17:54:49 2015 +0100
+++ b/annotation/qupujicheng_annotation_30/8zuozhaidaoma01.csv	Thu Apr 09 19:22:39 2015 +0100
@@ -1,19 +1,16 @@
 0.000000000,p
 8.637823129,s
 12.770975056,New Point
-22.500136054,New Point
 25.425850340,a
 32.740136054,New Point
 36.826848072,New Point
 43.444535147,New Point
-49.861224489,p
-53.127256235,New Point
+52.268117913,New Point
 62.438458049,New Point
 70.240362811,s
 81.037641723,a
 85.472653061,New Point
 93.129433106,s
-97.256780045,New Point
 101.865941043,a
 107.485170068,New Point
 111.699591836,s
@@ -22,17 +19,15 @@
 131.993832199,New Point
 135.441995464,New Point
 140.991564625,New Point
-144.904126984,New Point
+146.400000000,New Point
 150.511746031,s
 153.553560090,New Point
 160.728526077,a
 166.011065759,New Point
-172.303673469,s
+173.665306122,New Point
 180.529342403,a
-182.056054421,New Point
-186.653605442,New Point
+187.624489795,New Point
 191.680725623,s
-196.266666666,New Point
 200.544943310,a
 205.879727891,New Point
 210.622403628,s
@@ -42,21 +37,16 @@
 246.027029478,New Point
 252.737596371,New Point
 255.837460317,New Point
-264.962902494,New Point
 270.373151927,p
 278.453696145,New Point
 289.146485260,s
 298.152925170,a
-310.497233560,New Point
 313.399727891,New Point
 320.934603174,New Point
 326.351020408,p
 335.644444444,New Point
-338.469387755,s
 343.436734693,a
-349.738956916,New Point
 352.163265306,New Point
 357.250612244,New Point
-367.444897959,p
 368.593560090,New Point
 368.914285714,end
--- a/annotation/qupujicheng_annotation_30/8zuozhaidaoma02.csv	Thu Apr 09 17:54:49 2015 +0100
+++ b/annotation/qupujicheng_annotation_30/8zuozhaidaoma02.csv	Thu Apr 09 19:22:39 2015 +0100
@@ -1,25 +1,18 @@
 0.023219954,p
 14.512471655,s
-21.513287981,New Point
-25.507120181,New Point
 28.398004535,a
 34.818321995,New Point
 38.057505668,New Point
 47.310657596,New Point
-51.536689342,New Point
-54.172154195,New Point
+53.034376417,New Point
 56.359183673,New Point
-64.795283446,New Point
 68.208616780,New Point
 72.190839002,a
-80.538412698,New Point
 84.381315192,p
 94.737414965,s
 99.559183673,a
-103.828027210,New Point
 106.579591836,New Point
 111.153922902,New Point
-116.192653061,New Point
 120.400000000,p
 123.460498866,New Point
 127.384671201,New Point
@@ -28,16 +21,13 @@
 145.844535147,s
 148.702040816,a
 155.805895691,New Point
-160.008707482,New Point
+162.539682539,New Point
 169.029659863,New Point
 174.381859410,p
 179.496054421,a
 182.114104308,New Point
-185.225578231,New Point
-189.254240362,New Point
 194.002721088,New Point
 195.616507936,New Point
-199.505850340,New Point
 202.129705215,p
 203.348752834,New Point
 206.204807256,New Point
@@ -46,25 +36,19 @@
 213.263673469,New Point
 216.618956916,New Point
 218.795827664,a
-225.017233560,p
 226.986666666,New Point
 229.807891156,New Point
 231.839637188,New Point
-234.312562358,New Point
 239.444172335,New Point
 242.648526077,a
 246.816507936,New Point
-249.893151927,New Point
-252.888526077,New Point
-257.567346938,New Point
-261.497324263,p
+255.373061224,New Point
 262.780226757,New Point
 267.215238095,New Point
 274.574421768,a
 278.581405895,New Point
 288.182857142,New Point
 290.620952380,New Point
-294.370975056,New Point
 296.565260770,New Point
 300.570702947,New Point
 302.846258503,New Point
@@ -73,54 +57,41 @@
 318.032108843,New Point
 327.227210884,New Point
 329.607256235,a
-335.876643990,New Point
 338.320544217,p
 340.509024943,New Point
-348.763718820,New Point
+349.371428571,New Point
 351.271473922,New Point
 357.482811791,a
-361.476643990,New Point
 363.113650793,New Point
-365.609795918,New Point
 368.193015873,p
-369.208888888,New Point
 370.323446712,New Point
 374.679591836,a
-378.520090702,New Point
 382.769342403,New Point
-386.774784580,New Point
+387.967346938,New Point
 394.795918367,p
 399.801179138,s
-402.831383219,New Point
-405.826757369,New Point
 408.636371882,New Point
-414.987755102,p
 416.635646258,New Point
-424.710385487,New Point
 426.753741496,New Point
 432.979591836,a
 438.079274376,New Point
 442.949659863,New Point
-447.703945578,New Point
+447.575510204,New Point
 452.889795918,New Point
 456.167346938,New Point
 458.171428571,New Point
 464.865306122,p
-465.987755102,New Point
 469.559183673,New Point
 476.208163265,New Point
 477.995918367,New Point
 481.523809523,a
 489.073469387,New Point
-492.224489795,New Point
 497.355102040,p
 502.228571428,New Point
-512.244897959,New Point
 516.228571428,New Point
 517.746938775,New Point
 519.743854875,New Point
 522.646349206,New Point
-524.538775510,New Point
 526.454421768,New Point
 533.246258503,New Point
 533.501678004,end
--- a/annotation/qupujicheng_annotation_30/9shangtiantai_erhaungkuaisanyan.csv	Thu Apr 09 17:54:49 2015 +0100
+++ b/annotation/qupujicheng_annotation_30/9shangtiantai_erhaungkuaisanyan.csv	Thu Apr 09 19:22:39 2015 +0100
@@ -1,24 +1,23 @@
 0.000000000,p
 2.809614512,s
-7.848344671,New Point
-13.200544217,New Point
+9.299591836,New Point
 21.989297052,a
-26.226938775,New Point
+27.109297052,New Point
 35.863219954,s
 39.996371882,New Point
 43.281995464,a
+53.812244897,New Point
 59.686893424,New Point
 63.645895691,s
 69.318367346,a 
 75.174603174,New Point
 80.462403628,s
 85.124353741,a
-97.542857142,New Point
-103.061224489,New Point
+92.310204081,New Point
+103.869387755,New Point
 107.567346938,New Point
 109.763265306,New Point
 113.861224489,New Point
-126.168253968,s
 129.142857142,New Point
 132.424489795,New Point
 135.869387755,end
--- a/annotation/qupujicheng_annotation_30/9shangtiantai_erhuangsanyan.csv	Thu Apr 09 17:54:49 2015 +0100
+++ b/annotation/qupujicheng_annotation_30/9shangtiantai_erhuangsanyan.csv	Thu Apr 09 19:22:39 2015 +0100
@@ -1,57 +1,38 @@
 0.000000000,p
-5.363809523,New Point
 8.228571428,s
 15.092970521,New Point
-21.873197278,New Point
 25.936689342,New Point
 33.343854875,New Point
-42.492517006,New Point
 51.014240362,a
-56.796009070,New Point
-69.984943310,s
-75.673832199,New Point
+58.560725623,New Point
 79.992743764,a
 92.577959183,New Point
-94.087256235,New Point
-102.922448979,New Point
 105.963265306,s
 111.513832199,New Point
 115.914013605,New Point
 124.528616780,New Point
-126.722902494,New Point
 130.147845804,New Point
-131.842902494,a
-137.914920634,New Point
-145.089886621,New Point
+139.110748299,New Point
 149.891836734,s
-154.993197278,New Point
-158.418140589,New Point
 160.030612244,a
 166.034285714,New Point
 172.512244897,s
 176.413605442,New Point
 182.160544217,a
-184.714739229,New Point
-189.753469387,New Point
-200.016689342,New Point
-205.554648526,New Point
-209.865306122,New Point
-216.050068027,New Point
-222.412335600,New Point
-225.059410430,New Point
-228.519183673,New Point
+191.216326530,New Point
+200.945487528,New Point
+206.634376417,New Point
 231.084988662,New Point
-233.708843537,s
 236.460408163,New Point
 242.253786848,New Point
 244.796371882,New Point
 248.488344671,New Point
 250.984489795,New Point
 254.069387755,a
-260.295691609,New Point
-266.634739229,New Point
+260.897959183,New Point
 268.120816326,New Point
 272.834467120,New Point
+275.167346938,New Point
 285.570612244,p
 290.504852607,New Point
 294.011065759,end
--- a/annotation/qupujicheng_annotation_30/9shangtiantai_erhuangyuanban.csv	Thu Apr 09 17:54:49 2015 +0100
+++ b/annotation/qupujicheng_annotation_30/9shangtiantai_erhuangyuanban.csv	Thu Apr 09 19:22:39 2015 +0100
@@ -2,64 +2,41 @@
 2.205895691,New Point
 5.503129251,a
 13.119274376,New Point
-20.921179138,New Point
-28.579591836,s
+22.244716553,New Point
 36.000000000,a
 39.477551020,New Point
 44.440816326,New Point
 47.902040816,New Point
 53.583673469,New Point
-57.877551020,New Point
+59.216326530,New Point
 68.514285714,New Point
 73.910204081,New Point
-82.432653061,New Point
-87.795918367,New Point
 89.624489795,New Point
 93.159183673,New Point
-98.881632653,New Point
-102.367346938,New Point
 104.906122448,New Point
 116.065306122,New Point
-120.922448979,New Point
-124.489795918,New Point
-134.987755102,New Point
-142.261224489,New Point
+122.236734693,New Point
+136.408163265,New Point
 150.922448979,New Point
-154.440816326,New Point
-160.310204081,New Point
-165.281632653,New Point
-169.338775510,New Point
+166.693877551,New Point
 171.322448979,New Point
-173.395918367,New Point
 175.444897959,New Point
 179.542857142,New Point
-181.444897959,New Point
 183.273469387,New Point
 190.538775510,New Point
 198.762811791,New Point
-206.448616780,New Point
-209.763265306,New Point
-211.237732426,New Point
-218.482358276,New Point
-223.358548752,New Point
+207.363265306,New Point
+216.816326530,New Point
 226.086893424,New Point
-230.669387755,New Point
 234.857142857,New Point
-242.179591836,New Point
 244.244897959,New Point
-247.485714285,New Point
+249.861224489,New Point
 255.951020408,New Point
-261.551020408,New Point
 264.481632653,New Point
-268.440816326,New Point
 269.730612244,New Point
 276.201360544,New Point
-283.097687074,s
 288.925895691,New Point
-295.787392290,New Point
 301.441451247,a
-304.059501133,New Point
-307.844353741,New Point
 313.213968253,p
 318.775147392,New Point
 322.375510204,end