- changed "#include <Policies/...>" to "#include <SimCoreFactory/Poli…

…cies/...>" git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@21929 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Aug 20, 2014 · 518d93a · 518d93a
1 parent 49aaadd
commit 518d93a
Show file tree

Hide file tree

Showing 26 changed files with 47 additions and 47 deletions.
diff --git a/SimulationRuntime/cpp/Core/SimController/Configuration.cpp b/SimulationRuntime/cpp/Core/SimController/Configuration.cpp
@@ -1,5 +1,5 @@
 #include "Modelica.h"
-#include <Policies/FactoryConfig.h>
+#include <SimCoreFactory/Policies/FactoryConfig.h>
 #include <OMCFactory/OMCFactory.h>
 #include "Configuration.h"
 #include "LibrariesConfig.h"

diff --git a/SimulationRuntime/cpp/Core/SimController/Configuration.h b/SimulationRuntime/cpp/Core/SimController/Configuration.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <Policies/FactoryPolicy.h>
+#include <SimCoreFactory/Policies/FactoryPolicy.h>
 
 
 

diff --git a/SimulationRuntime/cpp/Core/SimController/FactoryExport.cpp b/SimulationRuntime/cpp/Core/SimController/FactoryExport.cpp
@@ -12,7 +12,7 @@
 #elif defined(SIMSTER_BUILD)
 
 #include "Modelica.h"
-#include <Policies/FactoryConfig.h>
+#include <SimCoreFactory/Policies/FactoryConfig.h>
 #include <SimController/ISimController.h>
 #include "SimController.h"
 /*Simster factory*/
@@ -26,7 +26,7 @@ extern "C" void BOOST_EXTENSION_EXPORT_DECL extension_export_simcontroller(boost
  #elif defined(OMC_BUILD)
 
 #include "Modelica.h"
-#include <Policies/FactoryConfig.h>
+#include <SimCoreFactory/Policies/FactoryConfig.h>
 #include <OMCFactory/OMCFactory.h>
 #include <SimController/ISimController.h>
 #include "SimController.h"

diff --git a/SimulationRuntime/cpp/Core/SimController/Initialization.cpp b/SimulationRuntime/cpp/Core/SimController/Initialization.cpp
@@ -1,5 +1,5 @@
 #include "Modelica.h"
-#include <Policies/FactoryConfig.h>
+#include <SimCoreFactory/Policies/FactoryConfig.h>
 #include <OMCFactory/OMCFactory.h>
 #include  "Initialization.h"
 

diff --git a/SimulationRuntime/cpp/Core/SimController/SimController.cpp b/SimulationRuntime/cpp/Core/SimController/SimController.cpp
@@ -1,5 +1,5 @@
 #include "Modelica.h"
-#include <Policies/FactoryConfig.h>
+#include <SimCoreFactory/Policies/FactoryConfig.h>
 #include <OMCFactory/OMCFactory.h>
 #include <SimController/ISimController.h>
 #include "SimController.h"

diff --git a/SimulationRuntime/cpp/Core/SimController/SimController.h b/SimulationRuntime/cpp/Core/SimController/SimController.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "SimManager.h"
-#include <Policies/FactoryPolicy.h>
+#include <SimCoreFactory/Policies/FactoryPolicy.h>
 
 #ifdef ANALYZATION_MODE
 #include <boost/function.hpp>

diff --git a/SimulationRuntime/cpp/Core/SimController/SimManager.cpp b/SimulationRuntime/cpp/Core/SimController/SimManager.cpp
@@ -1,6 +1,6 @@
 
 #include "Modelica.h"
-#include <Policies/FactoryConfig.h>
+#include <SimCoreFactory/Policies/FactoryConfig.h>
 #include <OMCFactory/OMCFactory.h>
 #include "SimManager.h"
 /*

diff --git a/SimulationRuntime/cpp/Core/SimulationSettings/Factory.cpp b/SimulationRuntime/cpp/Core/SimulationSettings/Factory.cpp
@@ -1,5 +1,5 @@
 #include "Modelica.h"
-#include <Policies/FactoryConfig.h>
+#include <SimCoreFactory/Policies/FactoryConfig.h>
 #include <OMCFactory/OMCFactory.h>
 #include "Factory.h"
 #include "GlobalSettings.h"

diff --git a/SimulationRuntime/cpp/Core/SimulationSettings/Factory.h b/SimulationRuntime/cpp/Core/SimulationSettings/Factory.h
@@ -2,11 +2,11 @@
 
 #ifdef ANALYZATION_MODE
 #include <SimulationSettings/ISettingsFactory.h>
-#include <Policies/StaticSolverSettingsOMCFactory.h>
+#include <SimCoreFactory/Policies/StaticSolverSettingsOMCFactory.h>
 class  SettingsFactory : public ISettingsFactory
                        , public StaticSolverSettingsOMCFactory<OMCFactory>
 #else
-#include <Policies/FactoryPolicy.h>
+#include <SimCoreFactory/Policies/FactoryPolicy.h>
 class  SettingsFactory : public ISettingsFactory
                        , public SolverSettingsPolicy
 #endif

diff --git a/SimulationRuntime/cpp/Core/SimulationSettings/FactoryExport.cpp b/SimulationRuntime/cpp/Core/SimulationSettings/FactoryExport.cpp
@@ -26,7 +26,7 @@ extern "C" void BOOST_EXTENSION_EXPORT_DECL extension_export_simulation_settings
 #elif defined(OMC_BUILD)
 
 #include "Modelica.h"
-#include <Policies/FactoryConfig.h>
+#include <SimCoreFactory/Policies/FactoryConfig.h>
 #include <OMCFactory/OMCFactory.h>
 #include "Factory.h"
 

diff --git a/SimulationRuntime/cpp/Core/Solver/FactoryExport.cpp b/SimulationRuntime/cpp/Core/Solver/FactoryExport.cpp
@@ -7,7 +7,7 @@
 #elif defined(OMC_BUILD)
 
 #include "Modelica.h"
-#include <Policies/FactoryConfig.h>
+#include <SimCoreFactory/Policies/FactoryConfig.h>
 #include <OMCFactory/OMCFactory.h>
 #include "FactoryExport.h"
 

diff --git a/SimulationRuntime/cpp/Core/System/AlgLoopSolverFactory.cpp b/SimulationRuntime/cpp/Core/System/AlgLoopSolverFactory.cpp
@@ -1,6 +1,6 @@
 
 #include "Modelica.h"
-#include <Policies/FactoryConfig.h>
+#include <SimCoreFactory/Policies/FactoryConfig.h>
 #include <OMCFactory/OMCFactory.h>
 #include <System/AlgLoopSolverFactory.h>
 

diff --git a/SimulationRuntime/cpp/Core/System/FactoryExport.cpp b/SimulationRuntime/cpp/Core/System/FactoryExport.cpp
@@ -11,7 +11,7 @@
 
 #elif defined(SIMSTER_BUILD)
 #include "Modelica.h"
-#include <Policies/FactoryConfig.h>
+#include <SimCoreFactory/Policies/FactoryConfig.h>
 #include <OMCFactory/OMCFactory.h>
 #include "FactoryExport.h"
 #include "ModelicaSystem.h"
@@ -28,7 +28,7 @@ extern "C" void BOOST_EXTENSION_EXPORT_DECL extension_export_system(boost::exten
 
 #elif defined(OMC_BUILD)
 #include "Modelica.h"
-#include <Policies/FactoryConfig.h>
+#include <SimCoreFactory/Policies/FactoryConfig.h>
 #include <OMCFactory/OMCFactory.h>
 #include "FactoryExport.h"
 #include <System/AlgLoopSolverFactory.h>

diff --git a/SimulationRuntime/cpp/Core/System/SystemDefaultImplementation.cpp b/SimulationRuntime/cpp/Core/System/SystemDefaultImplementation.cpp
@@ -1,6 +1,6 @@
 #include "Modelica.h"
 #include "FactoryExport.h"
-#include <Policies/FactoryConfig.h>
+#include <SimCoreFactory/Policies/FactoryConfig.h>
 #include <System/EventHandling.h>
 #include <System/SystemDefaultImplementation.h>
 #include <System/AlgLoopSolverFactory.h>

diff --git a/SimulationRuntime/cpp/Include/Core/System/AlgLoopSolverFactory.h b/SimulationRuntime/cpp/Include/Core/System/AlgLoopSolverFactory.h
@@ -10,7 +10,7 @@ non-linear) system of the Form F(x)=0.
 #include <SimCoreFactory/Policies/StaticLinSolverOMCFactory.h>
 class AlgLoopSolverFactory : public IAlgLoopSolverFactory, public StaticNonLinSolverOMCFactory<OMCFactory>, public StaticLinSolverOMCFactory<OMCFactory>
 #else
-#include <Policies/FactoryPolicy.h>
+#include <SimCoreFactory/Policies/FactoryPolicy.h>
 class AlgLoopSolverFactory : public IAlgLoopSolverFactory, public NonLinSolverPolicy, public LinSolverPolicy
 #endif
 {

diff --git a/SimulationRuntime/cpp/Include/FMU/FMUWrapper.cpp b/SimulationRuntime/cpp/Include/FMU/FMUWrapper.cpp
@@ -6,7 +6,7 @@
 #include <SimulationSettings/ISettingsFactory.h>
 #include <Solver/ISolver.h>
 #include <DataExchange/SimData.h>
-#include <Policies/FactoryConfig.h>
+#include <SimCoreFactory/Policies/FactoryConfig.h>
 /*end workarround*/
 #include "FMU/FMUWrapper.h"
 #include "System/AlgLoopSolverFactory.h"

diff --git a/SimulationRuntime/cpp/Include/SimCoreFactory/OMCFactory/StaticOMCFactory.h b/SimulationRuntime/cpp/Include/SimCoreFactory/OMCFactory/StaticOMCFactory.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Modelica.h>
-#include <Policies/FactoryConfig.h>
+#include <SimCoreFactory/Policies/FactoryConfig.h>
 #include <SimCoreFactory/OMCFactory/OMCFactory.h>
 #include <Core/SimController/SimController.h>
 #include <Core/SimulationSettings/ISimControllerSettings.h>

diff --git a/SimulationRuntime/cpp/Include/SimCoreFactory/Policies/FactoryPolicy.h b/SimulationRuntime/cpp/Include/SimCoreFactory/Policies/FactoryPolicy.h
@@ -3,10 +3,10 @@
 #if defined(__vxworks)
 
       /*Policy include*/
-    #include <Policies/SolverVxWorksFactory.h>
-    #include <Policies/SolverSettingsVxWorksFactory.h>
-    #include <Policies/SystemVxWorksFactory.h>
-    #include <Policies/NonLinSolverVxWorksFactory.h>
+    #include <SimCoreFactory/Policies/SolverVxWorksFactory.h>
+    #include <SimCoreFactory/Policies/SolverSettingsVxWorksFactory.h>
+    #include <SimCoreFactory/Policies/SystemVxWorksFactory.h>
+    #include <SimCoreFactory/Policies/NonLinSolverVxWorksFactory.h>
     /*Policy defines*/
     typedef SystemVxWorksFactory<VxWorksFactory> SimControllerPolicy;
     typedef SolverVxWorksFactory<VxWorksFactory> ConfigurationPolicy;
@@ -18,11 +18,11 @@
 
       /*Policy include*/
 
-    #include <Policies/SolverFactory.h>
-    #include <Policies/SolverSettingsFactory.h>
-    #include <Policies/SystemFactory.h>
-    #include <Policies/NonLinSolverFactory.h>
-  #include <Policies/LinSolverFactory.h>
+    #include <SimCoreFactory/Policies/SolverFactory.h>
+    #include <SimCoreFactory/Policies/SolverSettingsFactory.h>
+    #include <SimCoreFactory/Policies/SystemFactory.h>
+    #include <SimCoreFactory/Policies/NonLinSolverFactory.h>
+  #include <SimCoreFactory/Policies/LinSolverFactory.h>
     /*Policy defines*/
     typedef SystemFactory<GenericFactory> SimControllerPolicy;
     typedef SolverFactory<GenericFactory> ConfigurationPolicy;
@@ -33,11 +33,11 @@
 #elif defined(OMC_BUILD) && !defined(ANALYZATION_MODE)
    /*Policy include*/
 
-    #include <Policies/SolverOMCFactory.h>
-    #include <Policies/SolverSettingsOMCFactory.h>
-    #include <Policies/SystemOMCFactory.h>
-    #include <Policies/NonLinSolverOMCFactory.h>
-  #include <Policies/LinSolverOMCFactory.h>
+    #include <SimCoreFactory/Policies/SolverOMCFactory.h>
+    #include <SimCoreFactory/Policies/SolverSettingsOMCFactory.h>
+    #include <SimCoreFactory/Policies/SystemOMCFactory.h>
+    #include <SimCoreFactory/Policies/NonLinSolverOMCFactory.h>
+  #include <SimCoreFactory/Policies/LinSolverOMCFactory.h>
     /*Policy defines*/
     typedef SystemOMCFactory<OMCFactory> SimControllerPolicy;
     typedef SolverOMCFactory<OMCFactory> ConfigurationPolicy;
@@ -49,11 +49,11 @@
 
    /*Policy include*/
 
-    #include <Policies/StaticSolverOMCFactory.h>
-    #include <Policies/StaticSolverSettingsOMCFactory.h>
-    #include <Policies/StaticSystemOMCFactory.h>
-    #include <Policies/StaticLinSolverOMCFactory.h>
-    #include <Policies/StaticNonLinSolverOMCFactory.h>
+    #include <SimCoreFactory/Policies/StaticSolverOMCFactory.h>
+    #include <SimCoreFactory/Policies/StaticSolverSettingsOMCFactory.h>
+    #include <SimCoreFactory/Policies/StaticSystemOMCFactory.h>
+    #include <SimCoreFactory/Policies/StaticLinSolverOMCFactory.h>
+    #include <SimCoreFactory/Policies/StaticNonLinSolverOMCFactory.h>
     /*Policy defines*/
     typedef StaticSystemOMCFactory<OMCFactory> SimControllerPolicy;
     typedef StaticSolverOMCFactory<OMCFactory> ConfigurationPolicy;

diff --git a/SimulationRuntime/cpp/Include/SimCoreFactory/Policies/StaticLinSolverOMCFactory.h b/SimulationRuntime/cpp/Include/SimCoreFactory/Policies/StaticLinSolverOMCFactory.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Policies/LinSolverOMCFactory.h>
+#include <SimCoreFactory/Policies/LinSolverOMCFactory.h>
 #include <Solver/UmfPack/UmfPack.h>
 #include <Solver/UmfPack/UmfPackSettings.h>
 #include <Solver/IAlgLoopSolver.h>

diff --git a/SimulationRuntime/cpp/Include/SimCoreFactory/Policies/StaticNonLinSolverOMCFactory.h b/SimulationRuntime/cpp/Include/SimCoreFactory/Policies/StaticNonLinSolverOMCFactory.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Policies/NonLinSolverOMCFactory.h>
+#include <SimCoreFactory/Policies/NonLinSolverOMCFactory.h>
 #include <Solver/Newton/Newton.h>
 #include <Solver/Kinsol/Kinsol.h>
 #include <Solver/Kinsol/KinsolSettings.h>

diff --git a/SimulationRuntime/cpp/Include/SimCoreFactory/Policies/StaticSolverOMCFactory.h b/SimulationRuntime/cpp/Include/SimCoreFactory/Policies/StaticSolverOMCFactory.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Policies/SolverOMCFactory.h>
+#include <SimCoreFactory/Policies/SolverOMCFactory.h>
 #include <SimulationSettings/ISettingsFactory.h>
 #include <Solver/ISolver.h>
 #include <Solver/ISolverSettings.h>

diff --git a/SimulationRuntime/cpp/Include/SimCoreFactory/Policies/StaticSolverSettingsOMCFactory.h b/SimulationRuntime/cpp/Include/SimCoreFactory/Policies/StaticSolverSettingsOMCFactory.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Policies/SolverSettingsOMCFactory.h>
+#include <SimCoreFactory/Policies/SolverSettingsOMCFactory.h>
 #include <Solver/SolverSettings.h>
 #include <boost/shared_ptr.hpp>
 #include <SimulationSettings/IGlobalSettings.h>

diff --git a/SimulationRuntime/cpp/Include/SimCoreFactory/Policies/StaticSystemOMCFactory.h b/SimulationRuntime/cpp/Include/SimCoreFactory/Policies/StaticSystemOMCFactory.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <System/IAlgLoopSolverFactory.h>
-#include <Policies/SystemOMCFactory.h>
+#include <SimCoreFactory/Policies/SystemOMCFactory.h>
 #include <System/AlgLoopSolverFactory.h>
 #include <SimController/ISimData.h>
 

diff --git a/SimulationRuntime/cpp/SimCoreFactory/OMCFactory/OMCFactory.cpp b/SimulationRuntime/cpp/SimCoreFactory/OMCFactory/OMCFactory.cpp
@@ -1,5 +1,5 @@
 #include "Modelica.h"
-#include <Policies/FactoryConfig.h>
+#include <SimCoreFactory/Policies/FactoryConfig.h>
 #include <OMCFactory/OMCFactory.h>
 #include <SimController/ISimController.h>
 

diff --git a/SimulationRuntime/cpp/Solver/Euler/Euler.cpp b/SimulationRuntime/cpp/Solver/Euler/Euler.cpp
@@ -1,5 +1,5 @@
 #include "Modelica.h"
-#include <Policies/FactoryConfig.h>
+#include <SimCoreFactory/Policies/FactoryConfig.h>
 #include <OMCFactory/OMCFactory.h>
 #include "Euler.h"
 #include "EulerSettings.h"

diff --git a/SimulationRuntime/cpp/Solver/Euler/FactoryExport.cpp b/SimulationRuntime/cpp/Solver/Euler/FactoryExport.cpp
@@ -31,7 +31,7 @@ extern "C" void BOOST_EXTENSION_EXPORT_DECL extension_export_euler(boost::extens
 
 #elif defined(OMC_BUILD)
 #include "Modelica.h"
-#include <Policies/FactoryConfig.h>
+#include <SimCoreFactory/Policies/FactoryConfig.h>
 #include <OMCFactory/OMCFactory.h>
 #include "Euler.h"
 #include "EulerSettings.h"