1
1
import glob
2
2
3
3
import pandas as pd
4
+ import pandas .DataFrame as df
4
5
5
- import Matrix
6
6
from Class .Match import Match
7
7
from Class .Port import Port
8
8
@@ -12,7 +12,7 @@ def __init__(self, matchList: [Match] = [Match], outPortList: [Port] = [Port], i
12
12
self .matchList = matchList
13
13
self .portListDict = {str : [Port ]}
14
14
self .portDict = {str : Port }
15
- self .matrixDict = {str : Matrix } # in,out,match
15
+ self .dfDict = {str : df } # in,out,match
16
16
17
17
def learn_folder (self , path2folder = '..\excel\learn/220-母线&线路-第一套合并单元&第一套合并单元' ):
18
18
for filename in glob .iglob (path2folder + '**/*.xls' , recursive = True ):
@@ -29,9 +29,9 @@ def learn_excel(self, path2excel):
29
29
inPort = Port (row [1 ]['开入端子描述' ], row [1 ]['开入端子引用' ])
30
30
match = Match (outPort , inPort )
31
31
self .matchList .append (match )
32
- matrix = self .matrixDict .get ('开出' , Matrix )
32
+ df = self .dfDict .get ('开出' , df )
33
33
key = row [1 ]['开出端子描述' ] + row [1 ]['开出端子引用' ]
34
- port = matrix .get (key )
34
+ port = df .get (key )
35
35
except RuntimeError :
36
36
print (row [1 ])
37
37
print (dir (self .matchList ))
@@ -46,11 +46,11 @@ def load_excel(self, path2excel='..\excel\learn/220-母线&线路-第一套合
46
46
portList .append (port )
47
47
key2 = row [1 ][title + '端子描述' ] + title + row [1 ][title + '端子引用' ]
48
48
self .portDict [key2 ] = port
49
- matrix = self .matrixDict .get (title , Matrix )
49
+ df = self .dfDict .get (title , df )
50
50
if sheetName == '已配置' :
51
- matrix [key2 ] = matrix .get (key2 , {object : float })
51
+ df [key2 ] = df .get (key2 , {object : float })
52
52
else : # new
53
- for done in matrix :
53
+ for done in df :
54
54
done [key2 ] = done .get (key2 , float ) # is autoFill metaData useful?
55
55
self .portListDict [key ] = portList
56
56
except RuntimeError :
0 commit comments