优化调度接口

funcDemo/funcDemo.vcxproj

@@ -149,6 +149,7 @@
     <ClCompile Include="CivHydrTest.cpp" />
     <ClCompile Include="CivTestContext.cpp" />
     <ClCompile Include="main.cpp" />
+    <ClCompile Include="main1.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="CivHydrTest.h" />

funcDemo/funcDemo.vcxproj.filters

@@ -15,15 +15,18 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="main.cpp">
-      <Filter>源文件</Filter>
-    </ClCompile>
     <ClCompile Include="CivHydrTest.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
     <ClCompile Include="CivTestContext.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
+    <ClCompile Include="main1.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="main.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="CivHydrTest.h">

pandaAlgorithm/FirstOptScheduling.cpp

+#include "FirstOptScheduling.h"
+
+FirstOptScheduling::FirstOptScheduling()
+{
+
+}
+
+FirstOptScheduling::~FirstOptScheduling()
+{
+
+}
\ No newline at end of file

pandaAlgorithm/FirstOptScheduling.h

+#pragma once
+#include "pandaAlgorithm.h"
+
+class PANDAALGORITHM_API  FirstOptScheduling
+{
+public:
+	FirstOptScheduling();
+	~FirstOptScheduling();
+
+
+};

pandaAlgorithm/OptScheduling.cpp

+#include "OptScheduling.h"
+
+OptScheduling::OptScheduling()
+{
+
+}
+
+OptScheduling::~OptScheduling()
+{
+
+}
+
+double OptScheduling::pressureDifference(const std::vector<double>& HC, const std::vector<double>& HF)
+{
+	double res = 0;
+	return res;
+}
+
+double OptScheduling::pumpPower()
+{
+	double res = 0;
+	return res;
+}
+
+
+double OptScheduling::waterProductionCost()
+{
+	double res = 0;
+	return res;
+}
\ No newline at end of file

pandaAlgorithm/OptScheduling.h

+#pragma once
+#include "pandaAlgorithm.h"
+#include <vector>
+
+class PANDAALGORITHM_API OptScheduling
+{
+public:
+	explicit OptScheduling();
+	virtual ~OptScheduling();
+
+	/**
+	* @brief 供需压差函数
+	* @param [in] HC[i]: 测压点i预测压力值
+	* @param [in] HF[I]: 测压点i要求的最低供水服务压力。
+	* @return 
+	*/
+	virtual double pressureDifference(const std::vector<double>& HC,const std::vector<double>& HF);
+
+	/**
+	* @brief 水泵供水功耗
+	* @param 
+	* @param
+	* @return 
+	*/
+	virtual double pumpPower();
+
+	/**
+	* @brief 制水成本
+	* @param 
+	* @param
+	* @return 
+	*/
+	virtual double waterProductionCost();
+};
\ No newline at end of file

pandaAlgorithm/pandaAlgorithm.vcxproj

@@ -148,11 +148,15 @@ copy genetic.h $(OutDir)..\include  /y</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="FirstOptScheduling.h" />
     <ClInclude Include="genetic.h" />
+    <ClInclude Include="OptScheduling.h" />
     <ClInclude Include="pandaAlgorithm.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="FirstOptScheduling.cpp" />
     <ClCompile Include="genetic.cpp" />
+    <ClCompile Include="OptScheduling.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

pandaAlgorithm/pandaAlgorithm.vcxproj.filters

@@ -21,10 +21,22 @@
     <ClInclude Include="pandaAlgorithm.h">
       <Filter>头文件</Filter>
     </ClInclude>
+    <ClInclude Include="OptScheduling.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+    <ClInclude Include="FirstOptScheduling.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="genetic.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
+    <ClCompile Include="OptScheduling.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="FirstOptScheduling.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file