exceeddata-sdk-vdata 2.8.2.1__tar.gz → 2.8.2.2__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 1.1
2
2
  Name: exceeddata-sdk-vdata
3
- Version: 2.8.2.1
3
+ Version: 2.8.2.2
4
4
  Summary: ExceedData vData SDK for Python
5
5
  Home-page: http://www.smartsct.com
6
6
  Author: Nick Xie
@@ -32,6 +32,6 @@
32
32
 
33
33
  name = 'vdata'
34
34
 
35
- __version__ = "2.8.2.1"
35
+ __version__ = "2.8.2.2"
36
36
  __author__ = 'Nick Xie'
37
- __credits__ = 'Smart Software for Car Technologies Inc'
37
+ __credits__ = 'Smart Software for Car Technologies Inc'
@@ -31,7 +31,7 @@
31
31
  # of the copyright holder.
32
32
  #
33
33
  # Author: Nick Xie
34
- # Version: 2.8.2.1
34
+ # Version: 2.8.2.2
35
35
  #
36
36
  # Note: for specification flag compatibility, it is rare that vsw uses snappy.
37
37
  # Uncomment the following if used and python-snappy is installed.
@@ -288,10 +288,45 @@ class VDataBucket(object):
288
288
 
289
289
  def getStartTime(self):
290
290
  return self.startTime
291
-
291
+
292
+ def setStartTime(self, time):
293
+ t = str(time)
294
+ if len(t) > 13:
295
+ self.startTime = int(time / int(round(pow(10, len(t) - 13))))
296
+ else:
297
+ self.startTime = time
298
+
292
299
  def getEndTime(self):
293
300
  return self.endTime
294
301
 
302
+ def setEndTime(self, time):
303
+ t = str(time)
304
+ if len(t) > 13:
305
+ self.endTime = int(time / int(round(pow(10, len(t) - 13))))
306
+ else:
307
+ self.endTime = time
308
+
309
+ def getCycle(self):
310
+ return self.cycle
311
+
312
+ def setCycle(self, cycle):
313
+ self.cycle = cycle
314
+
315
+ def isLiving(self):
316
+ return self.living
317
+
318
+ def setLiving(self, living):
319
+ self.living = living
320
+
321
+ def getCrc(self):
322
+ return self.crc
323
+
324
+ def setCrc(self, crc):
325
+ self.crc = crc
326
+
327
+ def setNoTime(self, notime):
328
+ self.notime = notime
329
+
295
330
  def addSeriesBucket(self, seriesBucket):
296
331
  self.seriesBuckets.append(seriesBucket)
297
332
 
@@ -1066,6 +1101,18 @@ class VDataUtils:
1066
1101
  def isAllSignalQueueMode(mode):
1067
1102
  return "all" == VDataUtils.getSignalQueueMode(mode)
1068
1103
 
1104
+ def insertion_order_set_list(names):
1105
+ if (names is None or len(names) == 0):
1106
+ return []
1107
+
1108
+ st = set(names)
1109
+ ns = []
1110
+ for nm in names:
1111
+ if (nm in st):
1112
+ ns.append(nm)
1113
+ st.remove(nm)
1114
+ return ns
1115
+
1069
1116
  class VDataDecodeUtils:
1070
1117
  def sortAddDecoder(decoders, decoder):
1071
1118
  size = len(decoders)
@@ -2686,15 +2733,16 @@ class VDataSignalFilter:
2686
2733
  '''
2687
2734
  The constructor of the filter.
2688
2735
  '''
2689
- self._signals = {}
2690
- self._prefixes = {}
2736
+ self._signals = set()
2737
+ self._prefixes = set()
2738
+ self._signal_names = []
2691
2739
 
2692
2740
  def getSignals(self):
2693
2741
  '''
2694
2742
  Get the set of signal names to filter on.
2695
2743
 
2696
2744
  Returns:
2697
- array_like(str)
2745
+ set(str)
2698
2746
  '''
2699
2747
  return self._signals
2700
2748
 
@@ -2706,31 +2754,41 @@ class VDataSignalFilter:
2706
2754
  signals (array_like(str)): signal names
2707
2755
  '''
2708
2756
  if (signals is not None):
2709
- self._signals = signals
2757
+ self._signal_names = VDataUtils.insertion_order_set_list(signals)
2758
+ self._signals = set(self._signal_names)
2710
2759
  else:
2711
- self._signals = {}
2760
+ self._signals = set()
2712
2761
 
2713
2762
  def getPrefixes(self):
2714
2763
  '''
2715
2764
  Get the set of signal prefixes to match on
2716
2765
 
2717
2766
  Returns:
2718
- array_like(str)
2767
+ set(str)
2719
2768
  '''
2720
2769
  return self._prefixes
2721
2770
 
2722
2771
  def setPrefixes(self, prefixes):
2723
2772
  '''
2724
- Set the set of signal prefixes to match on.
2773
+ Set the list of signal prefixes to match on.
2725
2774
 
2726
2775
  Args:
2727
2776
  prefixes (array_like(str)): signal prefixes
2728
2777
  '''
2729
2778
  if (prefixes is not None):
2730
- self._prefixes = prefixes
2779
+ self._prefixes = set(prefixes)
2731
2780
  else:
2732
- self._prefixes = {}
2733
-
2781
+ self._prefixes = set()
2782
+
2783
+ def getSignalNames(self):
2784
+ '''
2785
+ Get an ordered list of signal names that is same as the order of the signal name filter.
2786
+
2787
+ Returns:
2788
+ array_like(str)
2789
+ '''
2790
+ return self._signal_names
2791
+
2734
2792
  def isEmpty(self):
2735
2793
  '''
2736
2794
  True if no filter at all, otherwise False.
@@ -3351,11 +3409,11 @@ class VDataDecoder:
3351
3409
  seriesMetas.append(mt)
3352
3410
 
3353
3411
  bucket = VDataBucket()
3354
- bucket.startTime = bucketStartTime
3355
- bucket.endTime = bucketEndTime
3356
- bucket.cycle = bucketCycle
3357
- bucket.living = living
3358
- bucket.crc = crc
3412
+ bucket.setStartTime(bucketStartTime)
3413
+ bucket.setEndTime(bucketEndTime)
3414
+ bucket.setCycle(bucketCycle)
3415
+ bucket.setLiving(living)
3416
+ bucket.setCrc(crc)
3359
3417
 
3360
3418
  for i in range(len(seriesMetas)):
3361
3419
  mt = seriesMetas[i]
@@ -3376,14 +3434,14 @@ class VDataDecoder:
3376
3434
  bucket.addSeriesBucket(seriesBucket)
3377
3435
 
3378
3436
  if (len(bucket.seriesBuckets) > 0):
3379
- if (bucket.startTime == 0): # old version with unknown start time
3437
+ if (bucket.getStartTime() == 0): # old version with unknown start time
3380
3438
  minSeriesStartTime = bucket.seriesBuckets[0].time()
3381
3439
  for i in range(1, len(bucket.seriesBuckets)):
3382
3440
  tm = bucket.seriesBuckets[i].time()
3383
3441
  if (tm < minSeriesStartTime):
3384
3442
  minSeriesStartTime = tm
3385
- bucket.startTime = minSeriesStartTime
3386
- bucket.notime = 1
3443
+ bucket.setStartTime(minSeriesStartTime)
3444
+ bucket.setNoTime(1)
3387
3445
 
3388
3446
  VDataBucketUtils.sortAddBucket(self._buckets, bucket, False, self._signalQueueMode)
3389
3447
 
@@ -3469,12 +3527,12 @@ class VDataBucketUtils:
3469
3527
  bk = buckets[i]
3470
3528
  st = bk.getStartTime()
3471
3529
  if (st == bucketStartTime):
3472
- if (bucket.crc != 0):
3530
+ if (bucket.getCrc() != 0):
3473
3531
  for j in reversed(range(i)):
3474
3532
  stbk = buckets[j]
3475
3533
  if (stbk.getStartTime() != st):
3476
3534
  break
3477
- if (bucket.crc == stbk.crc): #when non-zero CRC are identical, we know they are same
3535
+ if (bucket.getCrc() == stbk.getCrc()): #when non-zero CRC are identical, we know they are same
3478
3536
  reason = "identical"
3479
3537
  logger.warn("Keep " + reason + " bucket " + str(stbk) + " discard bucket " + str(bucket))
3480
3538
  return
@@ -3502,16 +3560,16 @@ class VDataBucketUtils:
3502
3560
  st = bk.getStartTime()
3503
3561
  if (bk.intersects(bucket)):
3504
3562
  if (st == bucketStartTime):
3505
- if (not bucket.living): # bucket is final
3506
- if (bk.living or bk.cycle >= bucket.cycle):
3507
- reason = "final" if bk.living else ("higher freq" if bk.cycle > bucket.cycle else "later")
3563
+ if (not bucket.isLiving()): # bucket is final
3564
+ if (bk.isLiving() or bk.getCycle() >= bucket.getCycle()):
3565
+ reason = "final" if bk.isLiving() else ("higher freq" if bk.getCycle() > bucket.getCycle() else "later")
3508
3566
  logger.warn("Keep " + reason + " bucket " + str(bucket) + " discard bucket " + str(bk))
3509
3567
  buckets[i] = bucket.merge(bk)
3510
3568
  return
3511
- elif (bk.living): # bucket is living and bk is living
3569
+ elif (bk.isLiving()): # bucket is living and bk is living
3512
3570
  bucketEndTime = bucket.getEndTime()
3513
3571
  et = bk.getEndTime()
3514
- if (bucketEndTime > et or (bucketEndTime == et and bk.cycle > bucket.cycle)):
3572
+ if (bucketEndTime > et or (bucketEndTime == et and bk.getCycle() > bucket.getCycle())):
3515
3573
  reason = "longer" if bucketEndTime > et else "higher freq"
3516
3574
  logger.warn("Keep " + reason + " bucket " + str(bucket) + " discard bucket " + str(bk))
3517
3575
  buckets[i] = bucket.merge(bk)
@@ -3523,18 +3581,18 @@ class VDataBucketUtils:
3523
3581
  bk.merge(bucket)
3524
3582
  logger.warn("Keep bucket " + str(bk) + " discard bucket" + str(bucket))
3525
3583
  else:
3526
- if (dropMultiFileIntersects and not bucket.living):
3584
+ if (dropMultiFileIntersects and not bucket.isLiving()):
3527
3585
  logger.warn("Keep final bucket " + str(bucket) + " discard bucket " + str(bk))
3528
3586
  buckets[i] = bucket.merge(bk)
3529
3587
  return
3530
- if (bucket.living):
3588
+ if (bucket.isLiving()):
3531
3589
  if (bk.getEndTime() != 0 and bucket.getEndTime() > bk.getEndTime()): #overlapping living, lets do extra
3532
3590
  logger.warn("Add bucket " + str(bucket) + ", but only start from the last bucket's end time of " + str(bk.getEndTime()))
3533
- bucket.startTime = bk.getEndTime() + 1
3591
+ bucket.setStartTime(bk.getEndTime() + 1)
3534
3592
  buckets.insert(i + 1, bucket)
3535
3593
  return
3536
3594
  else:
3537
- if (bk.living): #we cannot be completely sure how much living bucket actually covers so we keep both
3595
+ if (bk.isLiving()): #we cannot be completely sure how much living bucket actually covers so we keep both
3538
3596
  logger.warn("Add bucket " + str(bucket) + ", also keep living bucket " + str(bk))
3539
3597
  buckets.insert(i + (1 if st < bucketStartTime else 0), bucket)
3540
3598
  return
@@ -3558,8 +3616,8 @@ class VDataBucketUtils:
3558
3616
  _qetime = (queryEndTime if queryEndTime > 0 else meta._queryEndTime) if queryFilter else 0 #override if provided
3559
3617
  for b in range(len(buckets)):
3560
3618
  bucket = buckets[b]
3561
- letime = 0 if b == 0 else buckets[b - 1].endTime # last end time
3562
- cetime = sys.maxsize - 1 if bucket.living else bucket.endTime # current end time
3619
+ letime = 0 if b == 0 else buckets[b - 1].getEndTime() # last end time
3620
+ cetime = sys.maxsize - 1 if bucket.isLiving() else bucket.getEndTime() # current end time
3563
3621
  qstime = max(_qstime, (0 if b == 0 else (0 if letime <= 0 else letime + 1)))
3564
3622
  qetime = min(_qetime, cetime) if _qetime > 0 else cetime
3565
3623
 
@@ -3586,7 +3644,7 @@ class VDataSeriesSpec:
3586
3644
  class VDataSeriesUtils:
3587
3645
  def seriesToColumns(series, signalFilter, columnExpandMode, qualifiedExpandName):
3588
3646
  if (signalFilter.hasNameFilterOnly()):
3589
- return list(signalFilter.getSignals())
3647
+ return signalFilter.getSignalNames()
3590
3648
 
3591
3649
  allcols = []
3592
3650
  if (columnExpandMode == DExpand.NONE):
@@ -3610,7 +3668,7 @@ class VDataSeriesUtils:
3610
3668
 
3611
3669
  # no filter
3612
3670
  if (signalFilter.isEmpty()):
3613
- return VDataSeriesUtils.__insertion_order_set_list(allcols)
3671
+ return VDataUtils.insertion_order_set_list(allcols)
3614
3672
 
3615
3673
  selected = []
3616
3674
  smap = signalFilter.getSignals()
@@ -3619,19 +3677,7 @@ class VDataSeriesUtils:
3619
3677
  if (VDataSeriesUtils.containsSignal(smap, spfx, col)):
3620
3678
  selected.append(col)
3621
3679
 
3622
- return VDataSeriesUtils.__insertion_order_set_list(selected)
3623
-
3624
- def __insertion_order_set_list(names):
3625
- if (names is None or len(names) == 0):
3626
- return []
3627
-
3628
- st = set(names)
3629
- ns = []
3630
- for nm in names:
3631
- if (nm in st):
3632
- ns.append(nm)
3633
- st.remove(nm)
3634
- return ns
3680
+ return VDataUtils.insertion_order_set_list(selected)
3635
3681
 
3636
3682
  def seriesToTemplate(series, columns, columnExpandMode, qualifiedExpandName):
3637
3683
  templateable = {}
@@ -4358,7 +4404,7 @@ class VDataReader:
4358
4404
 
4359
4405
  if (meta.queryEndTime() == 0):
4360
4406
  dbuckets = decoder.buckets()
4361
- if (len(dbuckets) > 0 and dbuckets[len(dbuckets) - 1].living):
4407
+ if (len(dbuckets) > 0 and dbuckets[len(dbuckets) - 1].isLiving()):
4362
4408
  objectEndTime = objectEndTime + self._livingDataBuffer
4363
4409
  self._frame.setStartTime(objectStartTime)
4364
4410
  self._frame.setEndTime(objectEndTime)
@@ -4381,7 +4427,7 @@ class VDataReader:
4381
4427
 
4382
4428
  if (name[len(name) - 1] == '*'):
4383
4429
  while(1):
4384
- name = name.substring(0, len(name) - 1)
4430
+ name = name[0:len(name) - 1]
4385
4431
  if (len(name) == 0 or name[len(name) - 1] != '*'):
4386
4432
  break
4387
4433
 
@@ -4392,8 +4438,8 @@ class VDataReader:
4392
4438
  else:
4393
4439
  fsignals.append(name)
4394
4440
 
4395
- signalFilter.setSignals(set(fsignals))
4396
- signalFilter.setPrefixes(set(fprefixes))
4441
+ signalFilter.setSignals(fsignals)
4442
+ signalFilter.setPrefixes(fprefixes)
4397
4443
  return signalFilter
4398
4444
 
4399
4445
  def df(self):
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 1.1
2
2
  Name: exceeddata-sdk-vdata
3
- Version: 2.8.2.1
3
+ Version: 2.8.2.2
4
4
  Summary: ExceedData vData SDK for Python
5
5
  Home-page: http://www.smartsct.com
6
6
  Author: Nick Xie
@@ -33,7 +33,7 @@
33
33
  from setuptools import setup
34
34
 
35
35
  setup(name='exceeddata-sdk-vdata',
36
- version='2.8.2.1',
36
+ version='2.8.2.2',
37
37
  description='ExceedData vData SDK for Python',
38
38
  url='http://www.smartsct.com',
39
39
  author='Nick Xie',