ADTLib

commit 0b54c143748d3a4c7debdf49d52bd0d4a15f927f
parent 1a1636939cdc46aa90079606fa1e76b502f0f867
Author: Samikshan Bairagya <[email protected]>
Date:   Fri, 13 Oct 2017 01:36:02 +0530

Make some changes to make ADT execute correctly

Trying to install ADTLib using pip was working fine, but executing
it wasn't working. The installed library was missing the 'files/'
directory. Also, this commit replaces xrange with range, which
makes it compatible with python3.x

Signed-off-by: Samikshan Bairagya <[email protected]>

Diffstat:
M
ADTLib/utils/__init__.py
 | 
8
++++----
M
setup.py
 | 
2
+-

2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ADTLib/utils/__init__.py b/ADTLib/utils/__init__.py
@@ -330,7 +330,7 @@ class SA:
          self.locations=range(size)
          self.dif=size%self.batch_size
          if self.dif>0:
-             for i in xrange(self.batch_size-self.dif):
+             for i in range(self.batch_size-self.dif):
                  self.locations=np.append(self.locations,0)
          self.location_new=np.reshape(self.locations,[-1,self.batch_size])     
          return self.location_new
@@ -340,11 +340,11 @@ class SA:
          with tf.Session() as sess:
              self.saver.restore(sess, self.save_location+'/'+self.filename)
              self.test_out=[];
-             for i in xrange(len(data)):
+             for i in range(len(data)):
                  self.test_len=len(data[i])
                  self.test_locations=self.locations_create(self.test_len)
-                 for k in xrange(len(self.test_locations)):
-                    for j in xrange(self.batch_size):
+                 for k in range(len(self.test_locations)):
+                    for j in range(self.batch_size):
                         self.batch[j]=data[i][self.test_locations[k,j]]
                     if k == 0:
                         self.test_out.append(sess.run(self.pred, feed_dict={self.x_ph: np.expand_dims(self.batch,0),self.dropout_ph:1}))                                    
diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@ from distutils.core import setup
 from setuptools import find_packages
 import glob
 
-package_data = ['files/*'] 
+package_data = ['ADTLib/files/*'] 
 scripts = glob.glob('bin/*')               
 
 setup(