合并成功版本

apps/cnf-path-computing/businessInCloud/src/main/java/top/ninwoo/test/CsvMerge/Wteg.java

@@ -22,14 +22,15 @@ public class Wteg {
         String str2;
 
         //测试时间
-        str = ReadFile.date+" 5-00-00";
+        /*str = ReadFile.date+" 5-00-00";
         int[][] topo = TopoRequire(str);
         str1 = ReadFile.date+" 5-00-20";
         int[][] topo1 = TopoRequire(str1);
         str2 = ReadFile.date+" 5-00-40";
-        int[][] topo2 = TopoRequire(str2);
+        int[][] topo2 = TopoRequire(str2);*/
+
         //动态获取当前时间topo
-/*        Date current = new Date();
+        Date current = new Date();
         Date current1 = new Date(current.getTime()+ (long)DoMap.slot);
         Date current2 = new Date(current1.getTime()+ (long)DoMap.slot);
         SimpleDateFormat sdf = new SimpleDateFormat(
@@ -39,7 +40,7 @@ public class Wteg {
         str2 = sdf.format(current2);
         int[][] topo = TopoRequire(str);
         int[][] topo1 = TopoRequire(str1);
-        int[][] topo2 = TopoRequire(str2);*/
+        int[][] topo2 = TopoRequire(str2);
 
 
         //获得单时隙连接矩阵  0或MAXWEIGHT

apps/cnf-path-computing/businessInCloud/src/main/java/top/ninwoo/test/doMap/DoMap.java

@@ -112,7 +112,7 @@ public class DoMap {
             n2 = dev - N_STABLE*slotnum;
             //1组装最短路矩阵
 
-
+//          上方文本公式输出，下方csv文件输出
 //            double[][] edgeWeight = WTEG();
 
             double[][] edgeWeight = Wteg.getWteg();

apps/cnf-weixingsim/src/test/java/top/ninwoo/WxTests.java

@@ -29,6 +29,7 @@ public class WxTests {
     @Autowired
     private ClusterService clusterService;
 
+
     @Resource
     private NetworkService networkService;