Skip to content

Commit ca8fa62

Browse files
committed
no change
1 parent f2fce51 commit ca8fa62

File tree

3 files changed

+24
-24
lines changed

3 files changed

+24
-24
lines changed

test_wp_post.csv

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
215.33378976190716,201.81188850586645,10.60898494720459,-3.1388675111448228
2-
207.4156533629149,201.79031040286458,10.619364808783029,-3.140851056369752
3-
191.42142144490623,201.77844912276305,10.605507721489147,-3.1415165147143713
4-
175.42663780644884,201.77723129792184,10.611396949219438,-3.1405806559675162
5-
159.43190291169753,201.76104465871362,10.613230713506017,3.1411963579910487
6-
143.43676283276429,201.76738346266004,10.613291479935194,-3.13730248844403
7-
135.43964226915836,201.73307428425861,10.604526101807872,-3.1372293083247116
8-
133.43965962350862,201.72434761406967,10.609897548129618,3.1356803975976946
9-
131.43817571978735,201.73618103715106,10.60818733376841,3.1022724074664723
10-
130.43650596144013,201.77558724908553,10.6096427346935,3.053164848832147
11-
129.43716350105137,201.86418796661644,10.623217663352115,2.981758874534599
12-
128.45475832906587,202.02256043889196,10.606557686226711,2.888153212073027
13-
127.50008772417405,202.26982857197964,10.611634930667403,2.7830930004494596
14-
126.57554722755613,202.61624548504807,10.61474755621642,2.68153239674201
15-
125.68418078478905,203.05793878927551,10.631189557302914,2.5863101285326113
16-
124.83994451161247,203.58170053616922,10.633261431131434,2.5042524777906974
17-
123.23221356975918,204.77209297897622,10.627961250844871,2.460678214048185
18-
110.80154698308924,214.84310724562039,10.6269350207704,2.479089809569747
19-
103.97751183667394,220.16669490786359,10.646126730230025,2.479089809569747
1+
215.33378922713493,201.81188825091405,10.60898494720459,-3.1388674628234354
2+
207.41565325823706,201.7903097664661,10.619364808783029,-3.1408510799080163
3+
191.4214210078194,201.77844886259473,10.605507721489147,-3.1415164639101048
4+
175.4266373709534,201.7772302251504,10.611396949219438,-3.140580743635333
5+
159.4319026861715,201.76104498837955,10.613230713506017,3.141196304457918
6+
143.43676275858144,201.76738464853605,10.613291479935194,-3.137302315917327
7+
135.43964216735327,201.73307409027387,10.604526101807872,-3.1372291493871987
8+
133.4396594802003,201.72434710202552,10.609897548129618,3.1356802584669548
9+
131.43817566422254,201.7361808030658,10.60818733376841,3.102272447519027
10+
130.4365059989096,201.77558697115873,10.6096427346935,3.053164876672713
11+
129.43716305555228,201.8641877034682,10.623217663352115,2.9817592584352175
12+
128.45475765877168,202.02255982503527,10.606557686226711,2.888153280291491
13+
127.50008717750973,202.26982785660655,10.611634930667403,2.783093122586031
14+
126.57554687673233,202.6162445675219,10.61474755621642,2.6815322679243874
15+
125.68418110839512,203.05793768057114,10.631189557302914,2.5863100498659444
16+
124.83994420999264,203.5816999073285,10.633261431131434,2.5042530358408204
17+
123.232211364341,204.7720923706875,10.627961250844871,2.4606781954921946
18+
110.80154596882166,214.8431060543582,10.6269350207704,2.4790894163582062
19+
103.97751274215905,220.16669653527612,10.646126730230025,2.4790894163582062

wpProcess.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ def load_waypoints(self,fname):
3131
del self.th[:]
3232
del self.station[:]
3333
with open(fname,'r') as wfile:
34-
reader = csv.DictReader(wfile, CSV_HEADER)
35-
for i, wp in enumerate(reader):
34+
reader = csv.DictReader(wfile, CSV_HEADER)
35+
for i, wp in enumerate(reader):
3636
self.x.append(float(wp['x']))
3737
self.y.append( float(wp['y']) )
3838
self.z.append( float(wp['z']) )
@@ -42,7 +42,7 @@ def load_waypoints(self,fname):
4242
else:
4343
self.station.append( self.station[-1]+
4444
math.sqrt( (self.x[-1]-self.x[-2])**2+
45-
(self.y[-1]-self.y[-2])**2 ) )
45+
(self.y[-1]-self.y[-2])**2 ) )
4646

4747
def scatter_waypoints(self,ds=1): # ds- gap of station
4848
s_ = [0.0]
@@ -70,8 +70,8 @@ def scatter_waypoints(self,ds=1): # ds- gap of station
7070
def storecsv_waypoints(self,new_fname):
7171
state_zipped = zip(self.x, self.y, self.z, self.th)
7272
with open(new_fname,mode ='wb') as wfile:
73-
writer = csv.writer(wfile)
74-
writer.writerows(state_zipped)
73+
writer = csv.writer(wfile)
74+
writer.writerows(state_zipped)
7575
wfile.close()
7676

7777
def getThFromxy(self):

wp_funs.pyc

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)