DSS C-API 0.10.7rc4 and minor changes.

Author: PMeira

.travis.yml

@@ -7,7 +7,7 @@ matrix:
       sudo: required
       env: 
         - DOCKER_IMAGE=pmeira/manylinux_wheel_cmake_fpc320
-        - DSS_CAPI_TAG=0.10.7rc1
+        - DSS_CAPI_TAG=0.10.7rc4
         - LINUX_X64=1
         - CONDA_SUBDIR=linux-64
       services:
@@ -32,7 +32,7 @@ matrix:
       sudo: required
       env: 
         - DOCKER_IMAGE=pmeira/manylinux_wheel_cmake_fpc320_i686
-        - DSS_CAPI_TAG=0.10.7rc1
+        - DSS_CAPI_TAG=0.10.7rc4
         - CONDA_SUBDIR=linux-32
       services:
         - docker
@@ -52,7 +52,7 @@ matrix:
     - name: "osx_x64"
       os: osx
       env: 
-        - DSS_CAPI_TAG=0.10.7rc1
+        - DSS_CAPI_TAG=0.10.7rc4
       script: 
         - export TRAVIS_TAG_DSS_PYTHON=$TRAVIS_TAG
         - export TRAVIS_TAG=

appveyor.yml

@@ -3,7 +3,7 @@ skip_non_tags: false
 image: Visual Studio 2019
 clone_folder: c:\projects\dss_python
 environment:
-  DSS_CAPI_TAG: 0.10.7rc1
+  DSS_CAPI_TAG: 0.10.7rc4
   DSS_CAPI_PATH: c:\projects\dss_capi
   ANACONDA_API_TOKEN: 
     secure: Pcm5IXFi4ZUsi1ue5QvPNASDo1Ns1REYbAwDJXRd3FRn2CfKbNPgnPda6fxoN6wG

dss/__init__.py

@@ -6,4 +6,4 @@
 from .v7 import *
 from .patch_dss_com import patch_dss_com
 
-__version__ = '0.10.7rc2'
+__version__ = '0.10.7rc4'

dss/dss_capi_gr/IBus.py

@@ -237,12 +237,24 @@ def LineList(self):
     @property
     def AllPCEatBus(self):
         '''Returns an array with the names of all PCE connected to the active bus'''
-        return self.CheckForError(self._get_string_array(self._lib.Bus_Get_AllPCEatBus))
+        result = self.CheckForError(self._get_string_array(self._lib.Bus_Get_AllPCEatBus))
+        if result:
+            result.append('') #TODO: remove this -- added for full compatibility with COM
+        else:
+            result = ['None']
+
+        return result
 
     @property
     def AllPDEatBus(self):
         '''Returns an array with the names of all PDE connected to the active bus'''
-        return self.CheckForError(self._get_string_array(self._lib.Bus_Get_AllPDEatBus))
+        result = self.CheckForError(self._get_string_array(self._lib.Bus_Get_AllPDEatBus))
+        if result:
+            result.append('') #TODO: remove this -- added for full compatibility with COM
+        else:
+            result = ['None']
+
+        return result
 
     def __getitem__(self, index):
         if isinstance(index, int):

dss/dss_capi_gr/IMeters.py

@@ -250,3 +250,12 @@ def Totals(self):
         '''(read-only) Totals of all registers of all meters'''
         self.CheckForError(self._lib.Meters_Get_Totals_GR())
         return self._get_float64_gr_array()
+
+    @property
+    def ZonePCE(self):
+        '''Returns the list of all PCE within the area covered by the energy meter'''
+        result = self.CheckForError(self._get_string_array(self._lib.Meters_Get_ZonePCE))
+        if not result:
+            result = ['NONE'] #TODO: remove
+            
+        return result

dss/dss_capi_ir/IBus.py

@@ -222,12 +222,24 @@ def LineList(self):
     @property
     def AllPCEatBus(self):
         '''Returns an array with the names of all PCE connected to the active bus'''
-        return self.CheckForError(self._get_string_array(self._lib.Bus_Get_AllPCEatBus))
+        result = self.CheckForError(self._get_string_array(self._lib.Bus_Get_AllPCEatBus))
+        if result:
+            result.append('') #TODO: remove this -- added for full compatibility with COM
+        else:
+            result = ['None']
+
+        return result
 
     @property
     def AllPDEatBus(self):
         '''Returns an array with the names of all PDE connected to the active bus'''
-        return self.CheckForError(self._get_string_array(self._lib.Bus_Get_AllPDEatBus))
+        result = self.CheckForError(self._get_string_array(self._lib.Bus_Get_AllPDEatBus))
+        if result:
+            result.append('') #TODO: remove this -- added for full compatibility with COM
+        else:
+            result = ['None']
+
+        return result
 
     def __getitem__(self, index):
         if isinstance(index, int):

dss/dss_capi_ir/IMeters.py

@@ -245,3 +245,13 @@ def TotalCustomers(self):
     def Totals(self):
         '''(read-only) Totals of all registers of all meters'''
         return self._get_float64_array(self._lib.Meters_Get_Totals)
+
+    @property
+    def ZonePCE(self):
+        '''Returns the list of all PCE within the area covered by the energy meter'''
+        result = self.CheckForError(self._get_string_array(self._lib.Meters_Get_ZonePCE))
+        if not result:
+            result = ['NONE'] #TODO: remove
+            
+        return result
+        

tests/validate.py

@@ -13,6 +13,7 @@
 WIN32 = (sys.platform == 'win32')
 
 COM_VLL_BROKEN = False
+NO_V9 = False
 
 # COM Output
 SAVE_COM_OUTPUT = 'save' in sys.argv
@@ -108,7 +109,7 @@ def run(self, dss, solve=False):
                             continue
                         else:
                             input_line = input_line.replace('C:\\Users\\prdu001\\OpenDSS\\Test\\', '')
-                            input_line = input_line.replace('C:\\Users\\prdu001\\OpenDSS\\Distrib\\Examples\\Scripts\\', '../Distrib/Examples/Scripts/')
+                            input_line = input_line.replace('C:\\Users\\prdu001\\OpenDSS\\Distrib\\Examples\\Scripts\\', '../Version8/Distrib/Examples/Scripts/')
                             #print(input_line)
                             dss.Text.Command = input_line
                 except StopIteration:
@@ -170,10 +171,11 @@ def validate_CktElement(self):
             for propA in fA:
                 assert propA in fB, propA
 
-        for field in ['TotalPowers']:
-            fA = getattr(A, field)
-            fB = getattr(B, field)
-            if not SAVE_COM_OUTPUT: assert np.allclose(fA, fB, atol=self.atol, rtol=self.rtol), (field, fA, fB, A.Name, B.Name)
+        if not NO_V9:
+            for field in ['TotalPowers']:
+                fA = getattr(A, field)
+                fB = getattr(B, field)
+                if not SAVE_COM_OUTPUT: assert np.allclose(fA, fB, atol=self.atol, rtol=self.rtol), (field, fA, fB, A.Name, B.Name)
 
         # Since the list of properties vary in releases, 
         # we don't check it the list is the same anymore.
@@ -282,8 +284,8 @@ def validate_Buses(self):
                 self.com.ActiveCircuit.SetActiveBus(name)
                 if not SAVE_COM_OUTPUT: assert A.Name == B.Name
 
-            if self.capi.ActiveCircuit.NumNodes < 1000:
-                for field in ('LoadList', 'LineList', 'AllPCEatBus', 'AllPDEatBus'):
+            if self.capi.ActiveCircuit.NumNodes < 1000 and not NO_V9:
+                for field in ['LoadList', 'LineList']:#, 'AllPCEatBus', 'AllPDEatBus']:
                     fB = getattr(B, field)
                     fA = output['ActiveCircuit.ActiveBus[{}].{}'.format(name, field)] if LOAD_COM_OUTPUT else getattr(A, field)
                     if SAVE_COM_OUTPUT: output['ActiveCircuit.ActiveBus[{}].{}'.format(name, field)] = fA
@@ -878,12 +880,18 @@ def validate_Meters(self):
         count = 0
         while nA != 0:
             count += 1
-            for field in 'AllBranchesInZone,AllEndElements,RegisterNames'.split(','):
+            for field in 'AllBranchesInZone,AllEndElements,RegisterNames,ZonePCE'.split(','):
+                if field == 'ZonePCE' and NO_V9:
+                    continue
+                    
                 fA = output['ActiveCircuit.Meters[{}].{}'.format(nA, field)] if LOAD_COM_OUTPUT else getattr(A, field)
                 fB = getattr(B, field)
                 if SAVE_COM_OUTPUT: output['ActiveCircuit.Meters[{}].{}'.format(nA, field)] = fA
                 if fA == ('',) and fB == [None]: continue # Comtypes and win32com results are a bit different here
-                if not SAVE_COM_OUTPUT: assert all(x[0] == x[1] for x in zip(fA, fB)), field
+                fA = [x for x in fA if x]
+                fB = [x for x in fB if x]
+                assert len(fA) == len(fB), (fA, fB)
+                if not SAVE_COM_OUTPUT: assert all(x[0] == x[1] for x in zip(fA, fB)), (field, fA, fB)
 
 
             # NOTE: CalcCurrent and AllocFactors removed since it seemed to contain (maybe?) uninitialized values in certain situations
@@ -1210,8 +1218,9 @@ def run_tests(fns):
         import dss
         com = dss.patch_dss_com(com)
         print('COM Version:', com.Version)
-        global COM_VLL_BROKEN
-        COM_VLL_BROKEN = ('Version 8.6.7.1 ' in com.Version) or ('Version 9.0.0.8 ' in com.Version) or ('Version 9.1.3.4 ' in com.Version) 
+        global COM_VLL_BROKEN, NO_V9
+        NO_V9 = ('Version 7' in com.Version) or ('Version 8' in com.Version)
+        COM_VLL_BROKEN = ('Version 7' in com.Version) or ('Version 8.6.7.1 ' in com.Version) or ('Version 9.0.0.8 ' in com.Version) or ('Version 9.1.3.4 ' in com.Version) 
     else:
         com = None