Changeset 1081

Timestamp:

02/17/21 16:59:46 (4 years ago)

Author:

Maciej Komosinski

Message:

Cosmetic

Location:

framspy

Files:

• FramsticksLib.py (modified) (1 diff)
• frams-test.py (modified) (1 diff)
• frams.py (modified) (3 diffs)

framspy/FramsticksLib.py

@@ -11 +11 @@
         You can perform basic operations like mutation, crossover, and evaluation of genotypes.
         This way you can perform evolution controlled by python as well as access and manipulate genotypes.
-        You can even design and use in evolution your own genetic representation implemented entirely in python.
+        You can even design and use in evolution your own genetic representation implemented entirely in python,
+        or access and control the simulation and simulated creatures step by step.
 
         You need to provide one or two parameters when you run this class: the path to Framsticks CLI where .dll/.so resides

framspy/frams-test.py

@@ +1 @@
+import sys
 import frams
 
-framspath = "" # set to where Framsticks binaries and libraries exist
+framspath = sys.argv[1] # set to the directory where Framsticks binaries and libraries exist
 frams.init(framspath, "-Ddata")  # "-D"+os.path.join(framspath,"data")) # not possible (maybe python windows issue) because of the need for os.chdir(). So we assume "data" is where the dll/so is
 

framspy/frams.py

@@ -12 +12 @@
 All non-Framsticks Python attributes start with '_' to avoid conflicts with Framsticks attributes.
 Framsticks names that are Python reserved words are prefixed with 'x' (currently just Simulator.ximport).
-
 """
 
@@ -21 +20 @@
 
 class ExtValue(object):
+        """All Framsticks objects and values are instances of this class."""
+
         _reInsideParens = re.compile('\((.*)\)')
         _reservedWords = ['import']  # this list is scanned during every attribute access, only add what is really clashing with framsticks properties
@@ -247 +248 @@
 
 
-def init(dllpath, *args):
+def init(lib_path, *args):
         original_dir = os.getcwd()
-        os.chdir(dllpath)  # because under Windows, frams.dll requires other dll's which reside in the same directory, so we must change current dir for them to be found
-        global c_api
-        c_api = ctypes.CDLL('frams_c_api.so' if os.name == 'posix' else 'frams.dll')
+        os.chdir(lib_path)  # because under Windows, frams.dll requires other dll's which reside in the same directory, so we must change current dir for them to be found while loading the main dll
+        global c_api  # access global variable
+        c_api = ctypes.CDLL('frams-objects.so' if os.name == 'posix' else 'frams-objects.dll')
         os.chdir(original_dir)