Merge branch 'master' of https://github.com/sebastianotronto/nissy-core into windows

3 files changed, 14 insertions, 9 deletions

diff --git a/python/examples/move.py b/python/examples/move.py
index 9c7a756..0ed879b 100644
--- a/python/examples/move.py
+++ b/python/examples/move.py
@@ -1,10 +1,13 @@
-# Small example of nissy_python_module usage
+# Small example of nissy Python module usage
 # See the solve.py example for more details on how this works
 
 import os, sys
 
+# Assume we are eithe rin the top-level directory of the nissy-core repo,
+# or in the python subdirectory
 sys.path.append(os.getcwd())
-import nissy_python_module as nissy
+sys.path.append(os.getcwd() + os.path.sep + "python")
+import nissy
 
 cube = nissy.applymoves(nissy.solved_cube, "R' U' F");
 print("Cube after the moves R' U' F:")
diff --git a/python/examples/solve.py b/python/examples/solve.py
index e3752fe..d77dd74 100644
--- a/python/examples/solve.py
+++ b/python/examples/solve.py
@@ -1,14 +1,15 @@
-# Small example of nissy_python_module usage
+# Small example of nissy Python module usage
 
-# Compile the python module with "make python", then run this from the main
-# folder containing nissy_python_module.so
+# Run "./build python", then run this from either the top-level directory
+# of the nissy-core repo or from the python subdirectory.
 
-# Append the main folder to the python path so we can load the module
+# Append the directories to the python path so we can load the module
 import sys, os
 sys.path.append(os.getcwd())
+sys.path.append(os.getcwd() + os.path.sep + "python")
 
 # Import with a nicer name
-import nissy_python_module as nissy
+import nissy
 
 # Choose the solver you prefer
 solver = "h48h0k4"
diff --git a/python/examples/variations.py b/python/examples/variations.py
index 1a9d5bb..2507e6e 100644
--- a/python/examples/variations.py
+++ b/python/examples/variations.py
@@ -1,9 +1,10 @@
-# Small example of nissy_python_module usage
+# Small example of nissy Python module usage
 # See the solve.py example for more details on how this works
 
 import sys, os
 sys.path.append(os.getcwd())
-import nissy_python_module as nissy
+sys.path.append(os.getcwd() + os.path.sep + "python")
+import nissy
 
 moves = "R U' Bw2 M D' x' F B(E2 F D B' Lw2 U2 U' S2 B)"