Support DCP standard

.appveyor.yml

@@ -9,7 +9,7 @@ configuration: Release
 install:
   - git submodule update --init
   - cd dependencies
-  - download-dependencies.py discount fmilibrary qwt zeromq cppzmq msgpack-c katex tclap fmi4c
+  - download-dependencies.py discount fmilibrary qwt zeromq cppzmq msgpack-c katex tclap fmi4c xerces asio zlib libzip dcplib
   - cd ..
 build_script:
 # Remove sh.exe from PATH so that CMake works
@@ -19,6 +19,10 @@ build_script:
   - setupDiscount.bat
   - setupFMILibrary.bat
   - setupFmi4c.bat
+  - setupXerces.bat
+  - setupZlib.bat
+  - setupLibzip.bat
+  - setupDCPLib.bat
 #  - setupHDF5.bat (takes to long to build)
   - setupKatex.bat
   - setupTclap.bat

.github/workflows/ci-build.yaml

@@ -33,7 +33,7 @@ jobs:
       - name: Download dependencies
         shell: cmd
         working-directory: dependencies
-        run: python download-dependencies.py fmilibrary tclap qwt fmi4c
+        run: python download-dependencies.py fmilibrary tclap qwt fmi4c xerces asio zlib libzip dcplib
 
       - name: Build dependencies
         shell: cmd
@@ -44,6 +44,10 @@ jobs:
             call setupFMILibrary.bat
             call setupQwt.bat
             call setupFmi4c.bat
+            call setupXerces.bat
+            call setupZlib.bat
+            call setupLibzip.bat
+            call setupDCPLib.bat
 
       - name: Configure
         working-directory: hopsan-build
@@ -67,7 +71,7 @@ jobs:
       - name: Install Packages
         run: |
           sudo apt-get update
-          sudo apt-get install qt5-default qtbase5-dev qtbase5-private-dev libqt5webkit5-dev libqt5svg5-dev libqt5opengl5-dev libhdf5-dev libmarkdown2-dev libmsgpack-dev libqwt-qt5-dev libzmq3-dev
+          sudo apt-get install qt5-default qtbase5-dev qtbase5-private-dev libqt5webkit5-dev libqt5svg5-dev libqt5opengl5-dev libhdf5-dev libmarkdown2-dev libmsgpack-dev libqwt-qt5-dev libzmq3-dev zlib1g zipcmp ziptool zipmerge
 
       - name: Checkout
         uses: actions/checkout@v3
@@ -85,7 +89,7 @@ jobs:
       - name: Download dependencies
         shell: bash
         working-directory: dependencies
-        run: ./download-dependencies.py fmilibrary tclap fmi4c
+        run: ./download-dependencies.py fmilibrary tclap fmi4c xerces asio dcplib libzip
 
       - name: Build dependencies
         shell: bash
@@ -94,6 +98,9 @@ jobs:
           ./setupFMILibrary.sh
           ./setupTclap.sh
           ./setupFmi4c.sh
+          ./setupXerces.sh
+          ./setupDCPLib.sh
+          ./setupLibzip.sh
 
       - name: Configure
         working-directory: hopsan-build

.gitmodules

@@ -10,3 +10,6 @@
 [submodule "HopsanCore/dependencies/sundials"]
 	path = HopsanCore/dependencies/sundials
 	url = https://github.com/LLNL/sundials
+[submodule "hopsandcp/dependencies/DCPLib"]
+	path = hopsandcp/dependencies/DCPLib
+	url = https://github.com/modelica/DCPLib

CMakeLists.txt

@@ -7,11 +7,20 @@ cmake_policy(SET CMP0079 NEW)
 set(HOPSANCORE_INSTALL_DST "HopsanCore")
 message(WARNING "Hopsan CMake support is still experimental, but should be  working for for GCC / MinGW and limited MSVC build")
 
+include(CheckCXXCompilerFlag)
+if (MINGW)
+  check_cxx_compiler_flag("Wa,-mbig-obj" COMPILER_HAS_MBIG_OBJ)
+  if (${COMPILER_HAS_MBIG_OBJ})
+    set(CMAKE_CXX_FLAGS -Wa,-mbig-obj)
+  endif()
+endif ()
+
 enable_testing()
 
 add_subdirectory(doc)
 add_subdirectory(HopsanCore)
 add_subdirectory(componentLibraries)
+add_subdirectory(hopsandcp)
 add_subdirectory(HopsanCLI)
 add_subdirectory(HopsanGUI)
 add_subdirectory(HopsanGenerator)

Common.prf

@@ -13,10 +13,12 @@ CONFIG(debug, debug|release) {
 # O3 = highest optimization level for speed
 CONFIG(debug, debug|release) {
   #QMAKE_CXXFLAGS += -Og
+  QMAKE_CXXFLAGS += -v -Wa,-mbig-obj
 }
 CONFIG(release, debug|release) {
-  QMAKE_CXXFLAGS += -O3
+  QMAKE_CXXFLAGS += -O3 -v -Wa,-mbig-obj
 }
+message("QMAKE_CXXFLAGS: $${QMAKE_CXXFLAGS}")
 
 # Enable C++14
 CONFIG += c++14

HopsanCore/HopsanCore.pro

@@ -213,6 +213,7 @@ HEADERS += \
     include/ComponentUtilities/TempDirectoryHandle.h \
     include/Parameters.h \
     include/Components/DummyComponent.hpp \
+    include/Components/DcpComponent.hpp \
     include/ComponentUtilities/EquationSystemSolver.h \
     $${PWD}/dependencies/rapidxml/hopsan_rapidxml.hpp \
     include/CoreUtilities/MultiThreadingUtilities.h \

HopsanCore/include/Components/DcpComponent.hpp

@@ -0,0 +1,149 @@
+/*-----------------------------------------------------------------------------
+
+ Copyright 2017 Hopsan Group
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+
+ The full license is available in the file LICENSE.
+ For details about the 'Hopsan Group' or information about Authors and
+ Contributors see the HOPSANGROUP and AUTHORS files that are located in
+ the Hopsan source code root directory.
+
+-----------------------------------------------------------------------------*/
+
+//!
+//! @file   DcpComponent.hpp
+//! @author Robert Braun <[email protected]>
+//! @date   2021-02-09
+//!
+//! @brief Contains a wrapper component for DCP servers
+//!
+//$Id$
+
+#ifndef DCPCOMPONENT_HPP
+#define DCPCOMPONENT_HPP
+
+#include "ComponentEssentials.h"
+
+namespace hopsan {
+
+    class DcpComponent : public ComponentSignal
+    {
+    private:
+        //Parameters
+        HString mDcpFile;
+        HString mVariables;
+        HString mValueRefs;
+        HString mLastVariables;
+
+        //Internal variables
+        std::vector<Port*> mPorts;
+        std::vector<double*> mInputs;
+        std::vector<double*> mOutputs;
+        std::vector<double> mParameters;
+
+    public:
+        static Component *Creator()
+        {
+            return new DcpComponent();
+        }
+
+        void configure()
+        {
+            addConstant("dcpFile", "", "", "", mDcpFile);
+            addConstant("valueRefs", "vr1,vr2,vr3...", "", "", mValueRefs);
+            addConstant("variables", "in1,in2;out1,out2;par1,par2...", "", "", mVariables);
+            setReconfigurationParameter("variables");
+            // Do nothing
+        }
+
+        void reconfigure()
+        {
+            if(mVariables == mLastVariables) {
+                return; //Path did not change, do nothing
+            }
+            mLastVariables = mVariables;
+
+
+            for(size_t i=0; i<mPorts.size(); ++i) {
+                removePort(mPorts[i]->getName());
+            }
+            std::vector<HString> parameters;
+            this->getParameterNames(parameters);
+            for(size_t i=0; i<parameters.size(); ++i) {
+                if(parameters[i] != "hopsan::HString" && parameters[i] != "dcpFile" && parameters[i] != "variables" && parameters[i] != "valueRefs") {
+                    this->unRegisterParameter(parameters[i]);
+                }
+            }
+            mPorts.clear();
+            mInputs.clear();
+            mOutputs.clear();
+            mParameters.clear();
+
+            HVector<HString> splitVariables = mVariables.split(';');
+            HVector<HString> splitInputs = splitVariables[0].split(',', HString::SkipEmptyParts);
+            HVector<HString> splitOutputs = splitVariables[1].split(',', HString::SkipEmptyParts);
+            HVector<HString> splitParameters = splitVariables[2].split(',', HString::SkipEmptyParts);
+
+            //The split function will return a single-element vector with an
+            //empty string if delimiter was not found, clear vector in this case
+            if(splitInputs.size() == 1 && splitInputs[0] == "") {
+                splitInputs.clear();
+            }
+            if(splitOutputs.size() == 1 && splitOutputs[0] == "") {
+                splitOutputs.clear();
+            }
+            if(splitParameters.size() == 1 && splitParameters[0] == "") {
+                splitParameters.clear();
+            }
+            HVector<HString> splitValueRefs = mValueRefs.split(',', HString::SkipEmptyParts);
+
+            if(splitValueRefs.size() != splitInputs.size()+splitOutputs.size()+splitParameters.size()) {
+                addErrorMessage("Number of value references does not equal number of variables");
+                return;
+            }
+
+            for(size_t i=0; i<splitInputs.size(); ++i) {
+                addDebugMessage("Input: "+HString(splitInputs[i]));
+                mInputs.push_back(new double(0.0));
+                mPorts.push_back(addInputVariable(splitInputs[i], splitValueRefs[i], "", (*mInputs.back()), &mInputs.back()));
+            }
+
+            for(size_t i=0; i<splitOutputs.size(); ++i) {
+                addDebugMessage("Output: "+HString(splitOutputs[i]));
+                mOutputs.push_back(new double(0.0));
+                mPorts.push_back(addOutputVariable(splitOutputs[i], splitValueRefs[i+splitInputs.size()], "", (*mOutputs.back()), &mOutputs.back()));
+            }
+
+            for(size_t i=0; i<splitParameters.size(); ++i) {
+                addDebugMessage("Parameter: "+HString(splitParameters[i]));
+                mParameters.push_back(0.0);
+                addConstant(splitParameters[i], splitValueRefs[i+splitInputs.size()+splitOutputs.size()], "", mParameters.back(), mParameters.back());
+            }
+        }
+
+        void initialize()
+        {
+            // Do nothing
+        }
+
+
+        void simulateOneTimestep()
+        {
+            // Do nothing
+        }
+    };
+}
+
+#endif // DCPCOMPONENT_HPP

HopsanCore/include/HString.h

@@ -39,6 +39,8 @@ class HOPSANCORE_DLLAPI HString
     size_t mSize;
 
 public:
+    enum SplitBehaviorEnumT { KeepEmptyParts, SkipEmptyParts };
+
     static const size_t npos;
 
     HString();
@@ -74,7 +76,7 @@ class HOPSANCORE_DLLAPI HString
     bool toBool(bool *isOK) const;
 
     HString substr(const size_t pos, const size_t len=npos) const;
-    HVector<HString> split(const char delim) const;
+    HVector<HString> split(const char delim, SplitBehaviorEnumT behaviour = KeepEmptyParts) const;
 
     size_t find_first_of(const char c, size_t pos = 0) const;
     size_t rfind(const char c, size_t pos = npos) const;
@@ -122,6 +124,18 @@ inline HString operator+(HString lhs, const char rhs)
   return lhs;
 }
 
+inline HString join(HVector<HString> &vec, const char delim) {
+    HString ret;
+    for(size_t i=0; i<vec.size(); ++i) {
+        ret.append(vec[i]);
+        ret.append(delim);
+    }
+    if(ret.size() > 0) {
+        ret.erase(ret.size()-1,1);
+    }
+    return ret;
+}
+
 }
 
 #endif // HSTRING_H

HopsanCore/include/HVector.hpp

@@ -132,6 +132,18 @@ class HVector
         mpDataArray[prevSize] = data;
     }
 
+    //! @brief Append data
+    //! @note This function is slow, it will reallocate all array memory every time
+    //! @param [in] data Data to append
+    void append(const HVector<T> &data)
+    {
+        size_t prevSize = mSize;
+        resize(prevSize+data.size());
+        for(int i=0; i<data.size(); ++i) {
+            mpDataArray[prevSize+i] = data[i];
+        }
+    }
+
     //! @brief Assign from C-array
     //! param [in] pData A pointer to the array
     //! param [in] count The number of elements to copy from the array

HopsanCore/include/HopsanEssentials.h

@@ -33,6 +33,7 @@
 #define HopsanEssentials_H
 
 #define HOPSAN_BUILTIN_TYPENAME_DUMMYCOMPONENT "DummyComponent"
+#define HOPSAN_BUILTIN_TYPENAME_DCPCOMPONENT "DcpComponent"
 #define HOPSAN_BUILTIN_TYPENAME_MISSINGCOMPONENT "MissingComponent"
 #define HOPSAN_BUILTIN_TYPENAME_SUBSYSTEM "Subsystem"
 #define HOPSAN_BUILTIN_TYPENAME_CONDITIONALSUBSYSTEM "ConditionalSubsystem"

HopsanCore/src/HString.cpp

@@ -523,19 +523,21 @@ HString HString::substr(const size_t pos, const size_t len) const
     return sub;
 }
 
-HVector<HString> HString::split(const char delim) const
-{
-  HVector<HString> parts;
-  size_t b = 0;
-  while (true)
-  {
-    size_t e = find(delim, b);
-    parts.append(substr(b,e-b));
-    if (e == npos)
+HVector<HString> HString::split(const char delim, SplitBehaviorEnumT behaviour) const
+{
+    HVector<HString> parts;
+    size_t b = 0;
+    while (true)
     {
-      break;
+        size_t e = find(delim, b);
+        if(behaviour == KeepEmptyParts || !substr(b,e-b).empty()) {
+            parts.append(substr(b,e-b));
+        }
+        if (e == npos)
+        {
+            break;
+        }
+        b=e+1;
     }
-    b=e+1;
-  }
-  return parts;
+    return parts;
 }

HopsanCore/src/HopsanEssentials.cpp

@@ -34,6 +34,7 @@
 #include "HopsanCoreVersion.h"
 #include "CoreUtilities/ClassFactoryStatusCheck.hpp"
 #include "Components/DummyComponent.hpp"
+#include "Components/DcpComponent.hpp"
 #include "CoreUtilities/HmfLoader.h"
 #include "CoreUtilities/LoadExternal.h"
 #include "CoreUtilities/HopsanCoreMessageHandler.h"
@@ -103,6 +104,7 @@ HopsanEssentials::HopsanEssentials()
     // Make sure that internal Nodes and Components register
     register_default_nodes(mpNodeFactory);
     mpComponentFactory->registerCreatorFunction(HOPSAN_BUILTIN_TYPENAME_DUMMYCOMPONENT, DummyComponent::Creator);
+    mpComponentFactory->registerCreatorFunction(HOPSAN_BUILTIN_TYPENAME_DCPCOMPONENT, DcpComponent::Creator);
     mpComponentFactory->registerCreatorFunction(HOPSAN_BUILTIN_TYPENAME_MISSINGCOMPONENT, DummyComponent::Creator);
     mpComponentFactory->registerCreatorFunction(HOPSAN_BUILTIN_TYPENAME_SUBSYSTEM, ComponentSystem::Creator);
     mpComponentFactory->registerCreatorFunction(HOPSAN_BUILTIN_TYPENAME_CONDITIONALSUBSYSTEM, ConditionalComponentSystem::Creator);