Remove absolute paths in VS projects. Improve test script.

jsgonsette · May 17, 2019 · 08a5714 · 08a5714
1 parent c8aaf6e
commit 08a5714
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 21 deletions.
diff --git a/Projects/VS2015/libWizium.vcxproj b/Projects/VS2015/libWizium.vcxproj
@@ -93,7 +93,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBWIZIUM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>X:\GenId\6%29 Web\Github\jsgonsette\Wizium\Sources</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\..\..\Sources</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -108,7 +108,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;LIBWIZIUM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>X:\GenId\6%29 Web\Github\jsgonsette\Wizium\Sources</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\..\..\Sources</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -125,7 +125,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBWIZIUM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>X:\GenId\6%29 Web\Github\jsgonsette\Wizium\Sources</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\..\..\Sources</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -144,7 +144,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;LIBWIZIUM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>X:\GenId\6%29 Web\Github\jsgonsette\Wizium\Sources</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\..\..\Sources</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

diff --git a/Projects/VS2017/libWizium.vcxproj b/Projects/VS2017/libWizium.vcxproj
@@ -94,7 +94,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBWIZIUM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>X:\GenId\6%29 Web\Github\jsgonsette\Wizium\Sources</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\..\..\Sources</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -109,7 +109,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;LIBWIZIUM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>X:\GenId\6%29 Web\Github\jsgonsette\Wizium\Sources</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\..\..\Sources</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -126,7 +126,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBWIZIUM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>X:\GenId\6%29 Web\Github\jsgonsette\Wizium\Sources</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\..\..\Sources</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -145,7 +145,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;LIBWIZIUM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>X:\GenId\6%29 Web\Github\jsgonsette\Wizium\Sources</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\..\..\Sources</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

diff --git a/Wrappers/Python/testWizium.py b/Wrappers/Python/testWizium.py
@@ -23,17 +23,24 @@
 
 import os
 import re
+import platform
+import random
 from libWizium import Wizium
 
 # ############################################################################	
 
-# Update this path if needed !
-PATH = './../../Binaries/Windows/libWizium_x64.dll'
+# Update those paths if needed !
+if platform.system()=='Linux':
+    PATH = './../../Binaries/Linux/libWizium.so'
+else:
+    PATH = './../../Binaries/Windows/libWizium_x64.dll'
+
 DICO_PATH = './../../Dictionaries/Fr_Simple.txt'
 
+
 # ============================================================================
 def draw (wiz):
-    """Draw the read content, with a very simple formating"""
+    """Draw the grid content, with a very simple formating"""
 # ============================================================================
     lines = wiz.grid_read ()
     for l in lines:
@@ -103,7 +110,7 @@ def solve (wiz, max_black=0):
 # ============================================================================
 
     # Configure the solver
-    wiz.solver_start (seed=5, black_mode='DIAG', max_black=max_black, heuristic_level=2)
+    wiz.solver_start (seed=random.randint(1, 1000000), black_mode='DIAG', max_black=max_black, heuristic_level=2)
 
     # Solve with steps of 500ms max, in order to draw the grid content evolution
     while True:
@@ -112,8 +119,12 @@ def solve (wiz, max_black=0):
         draw (wiz)
         print (status)
 
-        if status.fillRate == 100: break
-        if status.fillRate == 0: break
+        if status.fillRate == 100: 
+            print ("SUCCESS !")
+            break
+        if status.fillRate == 0: 
+            print ("FAILED !")
+            break
 
     # Ensure to release grid content
     wiz.solver_stop ()
@@ -123,17 +134,20 @@ def solve (wiz, max_black=0):
 """Main"""
 # ============================================================================
 
+EXAMPLE = 1
+
 # Create a Wizium instance
 wiz = Wizium (os.path.join (os.getcwd (), PATH))
-# wiz = Wizium ('X:/GenId/6) Web/Github/jsgonsette/Wizium/Projects/VS2017/x64/Debug/libWizium.dll')
 
 # Load the dictionary
 load_dictionary (wiz, DICO_PATH)
 
-# Set a static pattern
-set_grid_2 (wiz)
-draw (wiz)
+if EXAMPLE == 1:
+    # Set a fixed pattern
+    set_grid_1 (wiz)
+    solve (wiz, 0)
 
-# Solve this grid
-solve (wiz, 28)
-draw (wiz)
+elif EXAMPLE == 2:
+    # Dynamic pattern
+    set_grid_2 (wiz)
+    solve (wiz, 30)