|
@@ -328,7 +328,7 @@ def validar_combinacion(comb, patrones, compatibilidad_df, restricciones_df):
|
|
|
if sis == "Sismo":
|
|
if sis == "Sismo":
|
|
|
if comb[iter]:
|
|
if comb[iter]:
|
|
|
for jter, _ in enumerate(comb):
|
|
for jter, _ in enumerate(comb):
|
|
|
- if restricciones_df.loc[jter,"Tipo"] == "Variable":
|
|
|
|
|
|
|
+ if (restricciones_df.loc[jter,"Tipo"] == "Variable") and comb[jter] != 0:
|
|
|
num_var += 1
|
|
num_var += 1
|
|
|
if num_var > 1:
|
|
if num_var > 1:
|
|
|
return False
|
|
return False
|
|
@@ -730,8 +730,8 @@ for i in range(comboNames[0]):
|
|
|
if "ELU_ACC" in comboNames[1][i]: patron.append(comboNames[1][i])
|
|
if "ELU_ACC" in comboNames[1][i]: patron.append(comboNames[1][i])
|
|
|
for i, name in enumerate(patron):
|
|
for i, name in enumerate(patron):
|
|
|
ret = SapModel.RespCombo.SetCaseList(combo_name, 1, name, 1)
|
|
ret = SapModel.RespCombo.SetCaseList(combo_name, 1, name, 1)
|
|
|
- printProgressBar(i+1, comboNames[0], prefix = 'Creando combo envolvente ELU ACC:', suffix = 'Completado', length = 50)
|
|
|
|
|
-n=i
|
|
|
|
|
|
|
+ printProgressBar(n+i+1, comboNames[0], prefix = 'Creando combo envolvente ELU ACC:', suffix = 'Completado', length = 50)
|
|
|
|
|
+n+=i
|
|
|
|
|
|
|
|
combo_name = "3. ENV ELU SIS"
|
|
combo_name = "3. ENV ELU SIS"
|
|
|
ret = SapModel.RespCombo.Add(combo_name, 1)
|
|
ret = SapModel.RespCombo.Add(combo_name, 1)
|
|
@@ -741,8 +741,8 @@ for i in range(comboNames[0]):
|
|
|
if "ELU_SIS" in comboNames[1][i]: patron.append(comboNames[1][i])
|
|
if "ELU_SIS" in comboNames[1][i]: patron.append(comboNames[1][i])
|
|
|
for i, name in enumerate(patron):
|
|
for i, name in enumerate(patron):
|
|
|
ret = SapModel.RespCombo.SetCaseList(combo_name, 1, name, 1)
|
|
ret = SapModel.RespCombo.SetCaseList(combo_name, 1, name, 1)
|
|
|
- printProgressBar(i+1, comboNames[0], prefix = 'Creando combo envolvente ELU ACC:', suffix = 'Completado', length = 50)
|
|
|
|
|
-n=i
|
|
|
|
|
|
|
+ printProgressBar(n+i+1, comboNames[0], prefix = 'Creando combo envolvente ELU ACC:', suffix = 'Completado', length = 50)
|
|
|
|
|
+n+=i
|
|
|
|
|
|
|
|
combo_name = "4. ENV ELS C"
|
|
combo_name = "4. ENV ELS C"
|
|
|
ret = SapModel.RespCombo.Add(combo_name, 1)
|
|
ret = SapModel.RespCombo.Add(combo_name, 1)
|