Explorar el Código

Moving __name__ part to the bottom of the runSolver to help with main being aware of functions that are defined later in the file

Andrej hace 2 años
padre
commit
2e81ae9e2a
Se han modificado 1 ficheros con 5 adiciones y 4 borrados
  1. 5 4
      pythonScripts/runSolver.py

+ 5 - 4
pythonScripts/runSolver.py

@@ -172,10 +172,6 @@ def read3D(fName):
 
 
    return new_data.reshape(shape),lut,lutSE
    return new_data.reshape(shape),lut,lutSE
 
 
-if __name__=="__main__":
-    parFiles=sys.argv[1].split(';')
-    jobDir=sys.argv[2]
-    main(parFiles,jobDir)
 
 
 def loadSolutionFromRef(setup):
 def loadSolutionFromRef(setup):
    
    
@@ -228,3 +224,8 @@ def getStartPoint(setup):
       return 0,numpy.array([]),numpy.array([]),[],[]
       return 0,numpy.array([]),numpy.array([]),[],[]
    t,sol,se,sOut,qt,lut,lutSE=loadSolutionFromRef(setup)
    t,sol,se,sOut,qt,lut,lutSE=loadSolutionFromRef(setup)
    return t[-1],sol[-1],sOut[-1],lut,lutSE
    return t[-1],sol[-1],sOut[-1],lut,lutSE
+
+if __name__=="__main__":
+    parFiles=sys.argv[1].split(';')
+    jobDir=sys.argv[2]
+    main(parFiles,jobDir)