Fix paths for command line client

Author: kpeeters

core/CMakeLists.txt

@@ -51,6 +51,7 @@ SET(ALGORITHM_SRC_FILES
 	algorithms/expand_delta.cc
 	algorithms/expand_diracbar.cc
 	algorithms/expand_power.cc
+	algorithms/explicit_indices.cc
 	algorithms/factor_in.cc
 	algorithms/factor_out.cc
 	algorithms/fierz.cc

core/cadabra2.in

@@ -232,7 +232,7 @@ if __name__ == '__main__':
             #print('executing '+rs)
             os.system(rs)
         else:
-            with open("${PYTHON_SITE_PATH}/cadabra2_defaults.py") as f:
+            with open("${CMAKE_INSTALL_PREFIX}/${PYTHON_SITE_PATH}/cadabra2_defaults.py") as f:
                 code = compile(f.read(), "cadabra2_defaults.py", 'exec')
                 exec(code)
 
@@ -250,5 +250,5 @@ if __name__ == '__main__':
                 # pulling in the right locals/globals
                 #            sh.interact(banner='Info at http://cadabra.phi-sci.com/\nAvailable under the terms of the GNU General Public License v3\n', locals(), globals())
     else:
-        sh.runsource("import os; import sys; install_prefix=os.path.realpath(sys.argv[0]); install_prefix=install_prefix.replace('/bin/cadabra2','/share/cadabra2/python'); sys.path.append(install_prefix); print('Cadabra @CADABRA_VERSION_MAJOR@.@CADABRA_VERSION_MINOR@.@CADABRA_VERSION_PATCH@ (build @CADABRA_VERSION_BUILD@ dated @CADABRA_VERSION_DATE@)'); print ('Copyright (C) @COPYRIGHT_YEARS@  Kasper Peeters <[email protected]>'); f=open('${PYTHON_SITE_PATH}/cadabra2_defaults.py'); code=compile(f.read(), 'cadabra2_defaults.py', 'exec'); exec(code); f.close(); print('Using SymPy version '+sympy.__version__);")
+        sh.runsource("import os; import sys; install_prefix=os.path.realpath(sys.argv[0]); install_prefix=install_prefix.replace('/bin/cadabra2','/share/cadabra2/python'); sys.path.append(install_prefix); print('Cadabra @CADABRA_VERSION_MAJOR@.@CADABRA_VERSION_MINOR@.@CADABRA_VERSION_PATCH@ (build @CADABRA_VERSION_BUILD@ dated @CADABRA_VERSION_DATE@)'); print ('Copyright (C) @COPYRIGHT_YEARS@  Kasper Peeters <[email protected]>'); f=open('${CMAKE_INSTALL_PREFIX}/${PYTHON_SITE_PATH}/cadabra2_defaults.py'); code=compile(f.read(), 'cadabra2_defaults.py', 'exec'); exec(code); f.close(); print('Using SymPy version '+sympy.__version__);")
         sh.interact(banner='Info at http://cadabra.science/\nAvailable under the terms of the GNU General Public License v3\n')

core/pythoncdb/py_algorithms.cc

@@ -23,6 +23,7 @@
 #include "../algorithms/expand_delta.hh"
 #include "../algorithms/expand_diracbar.hh"
 #include "../algorithms/expand_power.hh"
+#include "../algorithms/explicit_indices.hh"
 #include "../algorithms/factor_in.hh"
 #include "../algorithms/factor_out.hh"
 #include "../algorithms/fierz.hh"
@@ -87,6 +88,7 @@ namespace cadabra
 		def_algo<expand_delta>(m, "expand_delta", true, false, 0);
 		def_algo<expand_diracbar>(m, "expand_diracbar", true, false, 0);
 		def_algo<expand_power>(m, "expand_power", true, false, 0);
+		def_algo<explicit_indices>(m, "explicit_indices", true, false, 0);		
 		def_algo<flatten_sum>(m, "flatten_sum", true, false, 0);
 		def_algo<indexsort>(m, "indexsort", true, false, 0);
 		def_algo<lr_tensor>(m, "lr_tensor", true, false, 0);