exceeddata-sdk-vdata 2.9.9__tar.gz → 2.9.10__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.9.9
3
+ Version: 2.9.10
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.9.9"
35
+ __version__ = "2.9.10"
36
36
  __author__ = 'Nick Xie'
37
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.9.9
34
+ # Version: 2.9.10
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.
@@ -1227,6 +1227,7 @@ class DEncoder:
1227
1227
  DELTA = 3
1228
1228
  CHIMP = 4
1229
1229
  ERASURE = 5
1230
+ PLAIN = 6
1230
1231
 
1231
1232
  class DExpand:
1232
1233
  NONE = 0
@@ -1313,7 +1314,9 @@ class VDataDecodeUtils:
1313
1314
  return value
1314
1315
 
1315
1316
  def readValueFromBitString(page, bitsToRead, bitTracker):
1317
+
1316
1318
  bitpos = bitTracker.getNumBits()
1319
+
1317
1320
  value = 0
1318
1321
  for i in range(bitsToRead):
1319
1322
  value = value * 2 if ((page[bitpos >> 3] & VDataConstants.BIT_MASKS[bitpos & 7]) == 0) else value * 2 + 1
@@ -1627,6 +1630,28 @@ class VDataFloat64XorDecode:
1627
1630
  def bits(self):
1628
1631
  return self.fltTracker.getBitValue()
1629
1632
 
1633
+ class VDataUInt8PlainDecode:
1634
+ def __init__(self, _page, _formula, _bitTracker):
1635
+ self.page = _page
1636
+ self.bitTracker = _bitTracker
1637
+ self.intTracker = IntTracker(_formula)
1638
+
1639
+ def first(self):
1640
+ self.next()
1641
+
1642
+ def next(self):
1643
+ value = int(VDataDecodeUtils.readValueFromBitString(self.page, 8, self.bitTracker))
1644
+ self.intTracker.setSignalValue(value)
1645
+
1646
+ def get(self):
1647
+ return self.intTracker.getPhysicalValue()
1648
+
1649
+ def raw(self):
1650
+ return self.intTracker.getSignalValue()
1651
+
1652
+ def bits(self):
1653
+ return self.raw()
1654
+
1630
1655
  class VDataUInt8NoneDecode:
1631
1656
  def __init__(self, _page, _formula, _bitTracker):
1632
1657
  self.page = _page
@@ -1638,8 +1663,7 @@ class VDataUInt8NoneDecode:
1638
1663
 
1639
1664
  def next(self):
1640
1665
  if (VDataDecodeUtils.readValueFromBitOne(self.page, self.bitTracker) == 0): #no data change
1641
- return
1642
-
1666
+ return
1643
1667
  value = int(VDataDecodeUtils.readValueFromBitString(self.page, 8, self.bitTracker))
1644
1668
  self.intTracker.setSignalValue(value)
1645
1669
 
@@ -1867,6 +1891,8 @@ class VDataNumberArrayDecode:
1867
1891
  if (_dtype == DType.UInt8):
1868
1892
  if (_encoder == DEncoder.XOR):
1869
1893
  return VDataUInt8XorDecode(_page, _formula, _bitTracker)
1894
+ elif (_encoder == DEncoder.PLAIN) :
1895
+ return VDataUInt8PlainDecode(_page, _formula, _bitTracker)
1870
1896
  else:
1871
1897
  return VDataUInt8NoneDecode(_page, _formula, _bitTracker)
1872
1898
  if (_dtype == DType.Float64 ):
@@ -2531,6 +2557,7 @@ class VDataSeriesDecode(object):
2531
2557
  def getSubNames(self):
2532
2558
  return None
2533
2559
 
2560
+
2534
2561
  class VDataSeriesDecodeNumber(VDataSeriesDecode):
2535
2562
  def __init__(self, data, offset, dtype, encoder):
2536
2563
  super().__init__(data, offset, dtype)
@@ -2538,6 +2565,8 @@ class VDataSeriesDecodeNumber(VDataSeriesDecode):
2538
2565
  if (dtype == DType.UInt8):
2539
2566
  if (encoder == DEncoder.XOR):
2540
2567
  self.valueDecode = VDataUInt8XorDecode(self.page, self.formula, self.bitTracker)
2568
+ elif (encoder == DEncoder.PLAIN):
2569
+ self.valueDecode = VDataUInt8PlainDecode(self.page, self.formula, self.bitTracker)
2541
2570
  else:
2542
2571
  self.valueDecode = VDataUInt8NoneDecode(self.page, self.formula, self.bitTracker)
2543
2572
  elif (dtype == DType.Float64 ):
@@ -2592,12 +2621,19 @@ class VDataSeriesDecodeNumber(VDataSeriesDecode):
2592
2621
  class VDataSeriesDecodeNumberArray(VDataSeriesDecode):
2593
2622
  def __init__(self, data, offset, dtype, encoder, length , matchLength=False):
2594
2623
  super().__init__(data, offset, DType.Array)
2595
-
2596
- self.timeDecode = VDataTimeMicrosDecode(self.page, self.bitTracker, data.getSeriesTimestampLength())
2624
+ if (encoder == DEncoder.PLAIN):
2625
+ self.timeDecode = VDataTimeDeltaDecode(self.page, self.bitTracker, data.getSeriesTimestampLength())
2626
+ self.isPlainEncode = True
2627
+ else:
2628
+ self.timeDecode = VDataTimeMicrosDecode(self.page, self.bitTracker, data.getSeriesTimestampLength())
2629
+ self.isPlainEncode = False
2597
2630
  self.valueDecode = VDataNumberArrayDecode(self.page, dtype, encoder, length, matchLength, self.formula, self.bitTracker)
2598
2631
 
2599
2632
  if (self.readCount < self.itemCount):
2600
2633
  self.timeDecode.first()
2634
+ bitPos = self.bitTracker.getNumBits()
2635
+ if(self.isPlainEncode & (bitPos %8 !=0)):
2636
+ self.bitTracker.setNumBits((bitPos//8 +1) *8 )
2601
2637
  self.valueDecode.first()
2602
2638
  self.emptied = 0
2603
2639
  self.readCount += 1
@@ -2614,6 +2650,9 @@ class VDataSeriesDecodeNumberArray(VDataSeriesDecode):
2614
2650
  def pollAndAdd(self):
2615
2651
  if (self.readCount < self.itemCount):
2616
2652
  self.timeDecode.next()
2653
+ bitPos = self.bitTracker.getNumBits()
2654
+ if(self.isPlainEncode & (bitPos %8 !=0)):
2655
+ self.bitTracker.setNumBits((bitPos//8 +1) *8 )
2617
2656
  self.valueDecode.next()
2618
2657
  self.readCount += 1
2619
2658
  else:
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 1.1
2
2
  Name: exceeddata-sdk-vdata
3
- Version: 2.9.9
3
+ Version: 2.9.10
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.9.9',
36
+ version='2.9.10',
37
37
  description='ExceedData vData SDK for Python',
38
38
  url='http://www.smartsct.com',
39
39
  author='Nick Xie',