Browse Source

移动部分函数到libs中。

liuyuqi-dellpc 7 years ago
parent
commit
cad2165614
4 changed files with 20 additions and 27 deletions
  1. 20 14
      code/main.py
  2. 0 10
      code/save_result.py
  3. 0 2
      libs/save_conf.py
  4. 0 1
      libs/score.py

+ 20 - 14
code/main.py

@@ -10,27 +10,30 @@ import numpy as np,pandas as pd
 import matplotlib.pyplot as plt
 
 # 数据预览
-import pandas as pd
-import matplotlib.pyplot as plt
 from configparser import ConfigParser
+import libs.save_conf
+
 
 # step1: 数据参数初始化
+def getConfig():
+    cf = ConfigParser()
+    config_path = "../conf/config.ini"
+    section_name = "data_file_name"
+    cf.read(config_path)
 
-cf = ConfigParser()
-config_path = "../conf/config.ini"
-section_name = "data_file_name"
-cf.read(config_path)
+    app_interference = cf.get(section_name, "app_interference")
+    app_resources = cf.get(section_name, "app_resources")
+    instance_deploy = cf.get(section_name, "instance_deploy")
+    machine_resources = cf.get(section_name, "machine_resources")
 
-app_interference = cf.get(section_name, "app_interference")
-app_resources = cf.get(section_name, "app_resources")
-instance_deploy = cf.get(section_name, "instance_deploy")
-machine_resources = cf.get(section_name, "machine_resources")
 
-#Wij矩阵表示第i个instance实例部署到j主机上
-Wij_size = np.zeros((68219, 6000))
-Wij = np.zeros_like(Wij_size)
 
 def getWij():
+    global machine_resources
+    # Wij矩阵表示第i个instance实例部署到j主机上
+    Wij_size = np.zeros((68219, 6000))
+    Wij = np.zeros_like(Wij_size)
+
     # inst_26195, app_147, machine_1149
     df3=pd.read_csv("../data/instance.csv", header=None,names=list(["instanceid", "appid", "machineid","disk"]))
     df2 = pd.read_csv(machine_resources, header=None, names=list(
@@ -43,5 +46,8 @@ def getWij():
                 pass
 
 
+def save_conf():
+    libs.save_conf.write()
+
 if __name__ == '__main__':
-    pass
+    save_conf()

+ 0 - 10
code/save_result.py

@@ -1,10 +0,0 @@
-# 导出数据结果
-import datetime
-
-import pandas as pd
-
-head = ["instance", "machine"]
-data = [["ss","aa" ],["ss","aa" ],["ss","aa" ],["ss","aa" ]]
-
-df = pd.DataFrame(data, columns=head)
-df.to_csv(("../submit/submit_" + datetime.datetime.now().strftime('%Y%m%d_%H%M%S') + ".csv"), header=None, index=False)

+ 0 - 2
code/save_conf.py → libs/save_conf.py

@@ -49,5 +49,3 @@ def read():
     cf.read(config_file)
     print(cf.get(section_name, "app_interference"))
 
-
-write()

+ 0 - 1
code/score.py → libs/score.py

@@ -14,7 +14,6 @@ flag = True
 alpha = 10
 beta = 0.5
 
-
 def getScore():
     '''
     计算得分