Conflicts

Author: peter-ch

.travis.yml

@@ -0,0 +1,23 @@
+os:
+  - osx
+  - linux
+
+osx_image: xcode9.2
+sudo: required
+services:
+  - docker
+
+language: cpp
+
+branches:
+  only:
+    - master
+    - stable
+
+env: # Don't forget to pass env to docker in run_in_docker.sh
+  - CONDA_PY=27
+  - CONDA_PY=35
+  - CONDA_PY=36
+
+script:
+  ./travis/main.sh

CMakeLists.txt

@@ -9,7 +9,12 @@ include(FindPythonLibs)
 set(Boost_USE_STATIC_LIBS       OFF) # only find static libs
 set(Boost_USE_MULTITHREADED      ON)
 set(Boost_USE_STATIC_RUNTIME    OFF)
-find_package(Boost COMPONENTS date_time system filesystem python3 serialization)
+find_package(Boost COMPONENTS
+    date_time
+    system
+    filesystem
+    python3
+    serialization)
 if(Boost_FOUND)
     include_directories(${Boost_INCLUDE_DIRS})
 endif()
@@ -36,15 +41,17 @@ set(SOURCE_FILES
     src/Population.cpp
     src/Population.h
     src/PythonBindings.cpp
-    src/PythonBindings.h
     src/Random.cpp
     src/Random.h
     src/Species.cpp
     src/Species.h
     src/Substrate.cpp
     src/Substrate.h
     src/Utils.cpp
-    src/Utils.h src/Traits.h src/Traits.cpp)
+    src/Utils.h
+    src/Traits.h
+    src/Traits.cpp)
+
 
 add_executable(MultiNEAT ${SOURCE_FILES})
-target_link_libraries(MultiNEAT ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} pthread)
+target_link_libraries(MultiNEAT ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} pthread)

MultiNEAT.cbp

@@ -64,7 +64,6 @@
 		<Unit filename="src/Population.cpp" />
 		<Unit filename="src/Population.h" />
 		<Unit filename="src/PythonBindings.cpp" />
-		<Unit filename="src/PythonBindings.h" />
 		<Unit filename="src/Random.cpp" />
 		<Unit filename="src/Random.h" />
 		<Unit filename="src/Species.cpp" />

MultiNEAT.project

@@ -45,7 +45,6 @@
     <File Name="src/Population.cpp"/>
     <File Name="src/Population.h"/>
     <File Name="src/PythonBindings.cpp"/>
-    <File Name="src/PythonBindings.h"/>
     <File Name="src/Random.cpp"/>
     <File Name="src/Random.h"/>
     <File Name="src/Species.cpp"/>

README.md

@@ -21,10 +21,10 @@ GNU Lesser General Public License v3.0
 
 #### To compile
 
-* Set the required system (boost or cython) by setting an evironment variable with name MN_BUILD.
+* Set the required system (boost or cython) by setting an environment variable with name MN_BUILD.
 Example in Linux:
   ```bash
-  export MN_BUILD=cython
+  export MN_BUILD=boost
   ```
 
 * then, the usual:

_MultiNEAT.pyx

@@ -950,7 +950,7 @@ cdef class Species:
             del self.thisptr
 
     def __repr__(self):
-        return 'ID {} Age {}'.format(self.thisptr.ID(), self.thisptr.Age())
+        return 'ID {} AgeGens {}'.format(self.thisptr.ID(), self.thisptr.AgeGens())
 
     def GetBestFitness(self):
         return self.thisptr.GetBestFitness()
@@ -1193,4 +1193,4 @@ cdef Parameters buildParams(cmn.Parameters& par):
     del tPar.thisptr
     tPar.thisptr = &par
     tPar.borrowed = True
-    return tPar
+    return tPar

appveyor.yml

@@ -0,0 +1,52 @@
+image: Visual Studio 2017
+
+# We always use a 64-bit machine, but can build x86 distributions
+# with the TARGET_ARCH variable.
+platform:
+    - x64
+
+environment:
+  fast_finish: true
+
+  matrix:
+    # Unfortunately, compiler/SDK configuration for 64 bit builds depends on
+    # python version. Right now conda build does not configure the SDK, and
+    # the appveyor setup only sets up the SDK once, so separate by python
+    # versions.
+    - TARGET_ARCH: "x64"
+      CONDA_PY: "35"
+      MINICONDA: "C:\\Miniconda%CONDA_PY%-%TARGET_ARCH%"
+    - TARGET_ARCH: "x86"
+      CONDA_PY: "35"
+      MINICONDA: "C:\\Miniconda%CONDA_PY%"
+
+    - TARGET_ARCH: "x64"
+      CONDA_PY: "36"
+      MINICONDA: "C:\\Miniconda%CONDA_PY%-%TARGET_ARCH%"
+    - TARGET_ARCH: "x86"
+      CONDA_PY: "36"
+      MINICONDA: "C:\\Miniconda%CONDA_PY%"
+
+init:
+  - "ECHO %MINICONDA%"
+
+install:
+  - "%MINICONDA%\\Scripts\\Activate.bat"
+  - conda config --set always_yes yes --set changeps1 no
+  - conda update -q conda
+  - conda info -a
+  - conda install anaconda-client conda-build
+  - yes | anaconda login --username %CONDA_LOGIN_USERNAME% --password %CONDA_LOGIN_PASSWORD% --hostname MultiNEAT-APPVYR-WIN-BUILD-%APPVEYOR_BUILD_NUMBER%-%CONDA_PY%-%TARGET_ARCH%
+  - conda config --set anaconda_upload %CONDA_UPLOAD%
+
+build: false
+
+test_script:
+  - "%MINICONDA%\\Scripts\\Activate.bat"
+  - conda build conda/ -c defaults -c conda-forge
+
+skip_commits:
+  files:
+    - docs/*
+    - travis/*
+    - .travis.yml

conda/bld.bat

@@ -0,0 +1,9 @@
+@ECHO ON
+
+REM Make sure to use proper python from conda
+REM set PATH=C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\
+
+set MN_BUILD=boost
+
+python %SRC_DIR%/setup.py build_ext
+python %SRC_DIR%/setup.py install

conda/build.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+# set -x
+set -e
+
+export MN_BUILD=boost
+
+SOURCE_CODE_DIR=${SRC_DIR:-$(dirname $0)/..}
+
+python ${SOURCE_CODE_DIR}/setup.py build_ext
+python ${SOURCE_CODE_DIR}/setup.py install

conda/conda_build_config.yaml

@@ -0,0 +1,4 @@
+python:
+    - 2.7 # [not win]
+    - 3.5
+    - 3.6