每个组合的排列数计算方式修改

phxb/utils/getarray.py

@@ -48,13 +48,13 @@ def getAllArrayNumber(m,n):
     total = 0
     allArray = getAllArray(m,n)
     for item in allArray:
-        total = getitemIndexArrayNumber(allArray[item],n)+total
+        total = getitemIndexArrayNumber(allArray[item],m,n)+total
         print("total=",total)
     return total
 #获取单个组合的各边重复项
-def getitemIndexArray(itemIndex,n):
+def getitemIndexArray(itemIndex,m,n):
     a = {};
-    for item in range(n):
+    for item in range(m):
         index = 0;
         indexNum = 0;
         while(index < n):
@@ -65,9 +65,9 @@ def getitemIndexArray(itemIndex,n):
     print("a=",a)
     return a
 #获取单个组合的各边重复项的排列数
-def getitemIndexArrayNumber(itemIndex,n):
+def getitemIndexArrayNumber(itemIndex,m,n):
     itemIndexArrayNumber = 0;
-    a = getitemIndexArray(itemIndex,n)
+    a = getitemIndexArray(itemIndex,m,n)
     for item in a:
         intItem = int(a[item])
         if(intItem > 1):