Browse Source

增加删除列
Signed-off-by: caner <5658514@qq.com>

caner 3 years ago
parent
commit
7dced11cfa
3 changed files with 25 additions and 5 deletions
  1. BIN
      3744.xls
  2. BIN
      3745.xls
  3. 25 5
      main.py

BIN
3744.xls


BIN
3745.xls


+ 25 - 5
main.py

@@ -33,7 +33,7 @@ def R123(r):
             2*Er*K4-R1*R1-R2*R2-R3*R3+2*V*(R1*R2+R1*R3+R2*R3)
         ]
     except:
-        return ['null', 'null', 'null']
+        return ['null', 'null', 'null', 'null', 'null']
 
 # 对数据为null 的进行平均值填补
 def nullData(arr):
@@ -56,6 +56,18 @@ if __name__ == "__main__":
         files = glob.glob(os.path.join(path, "*.xls"))
         for file in files:
             array = pd.read_excel(file)  # 读取excel数据
+            try:
+                # 删除一次old
+                array.drop('单轴抗压强度', axis=1, inplace=True)
+                array.drop('弹性模量', axis=1, inplace=True)
+                array.drop('第一主应力', axis=1, inplace=True)
+                array.drop('第二主应力', axis=1, inplace=True)
+                array.drop('第三主应力', axis=1, inplace=True)
+                array.drop('岩石强度应力比', axis=1, inplace=True)
+            except:
+                print('无旧数据')
+                
+            # 获取数据
             col = array[colTitle]  # 某列
             colLen = len(col)  # 一列的长度
             rowLen = len(array.iloc[1])  # 一行的长度
@@ -71,7 +83,7 @@ if __name__ == "__main__":
                 if (i+1) < len(col):
                     K = col[i]
                     K1 = col[i+1]
-                    res = fsolve(RCE, [100, 100000000000])  # 其它参数直接用
+                    res = fsolve(RCE, [1, 1000])  # 其它参数直接用
                     rc = RCE(res)[0]
                     e = RCE(res)[1]
                     RC[i] = math.fabs(rc)  # 绝对值
@@ -116,17 +128,25 @@ if __name__ == "__main__":
             nullData(RK2)
             nullData(RK3)
 
+            # 对整体数据进行倍数计算↓
+            for G in range(colLen):
+                RC[G] = RC[G]/100
+                E[G] = E[G]
+                RK1[G] = RK1[G]/100
+                RK2[G] = RK2[G]/100
+                RK3[G] = RK3[G]/100
+
             # 计算强度
             for z in range(colLen):
                 try:
                     GRA[z] = RC[z] / RK1[z]
                 except:
                     GRA[z] = 'null'
-                    
-            # 单独对数据为null的进行平均值计算                    
+
+            # 单独对数据为null的进行平均值计算
             nullData(GRA)
 
-                # 保存excel
+            # 保存excel
             array.insert(rowLen, '单轴抗压强度', RC)
             array.insert(rowLen+1, '弹性模量', E)
             array.insert(rowLen+2, '第一主应力', RK1)