[Erp5-report] r28543 - in /erp5/trunk/products/ERP5: Capacity/GLPK.py Tool/SimulationTool.py
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Aug 21 12:16:20 CEST 2009
Author: tatuya
Date: Fri Aug 21 12:16:15 2009
New Revision: 28543
URL: http://svn.erp5.org?rev=28543&view=rev
Log:
Searching both Numeric and numpy library for using buildout.
It is planned that using numpy instead of Numeric.
Modified:
erp5/trunk/products/ERP5/Capacity/GLPK.py
erp5/trunk/products/ERP5/Tool/SimulationTool.py
Modified: erp5/trunk/products/ERP5/Capacity/GLPK.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Capacity/GLPK.py?rev=28543&r1=28542&r2=28543&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Capacity/GLPK.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Capacity/GLPK.py [utf8] Fri Aug 21 12:16:15 2009
@@ -26,7 +26,10 @@
#
##############################################################################
-from Numeric import *
+try:
+ from numpy import shape, array
+except ImportError:
+ from Numeric import shape, array
MODEL_HEAD = """
/* The number of samples. */
Modified: erp5/trunk/products/ERP5/Tool/SimulationTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Tool/SimulationTool.py?rev=28543&r1=28542&r2=28543&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Tool/SimulationTool.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Tool/SimulationTool.py [utf8] Fri Aug 21 12:16:15 2009
@@ -39,7 +39,10 @@
from zLOG import LOG
from Products.ERP5.Capacity.GLPK import solve
-from Numeric import zeros, resize
+try:
+ from numpy import zeros, resize
+except ImportError:
+ from Numeric import zeros, resize
from DateTime import DateTime
from Products.ERP5 import DeliverySolver
More information about the Erp5-report
mailing list