Merge branch 'master' of github.com:JohnLangford/vowpal_wabbit

.gitignore

@@ -128,3 +128,4 @@ decision_service/rl.VC.db
 index.html
 packages-microsoft-prod.deb
 decision_service/unit_test/rlclient-test.out
+cs/azure_service/azure_service.ccproj.user

.travis.yml

@@ -1,12 +1,29 @@
 language: cpp
 compiler:
   - gcc
+addons:
+  apt:
+    sources:
+      - george-edison55-precise-backports # cmake 3.2.3 / doxygen 1.8.3
+    packages:
+      - cmake
+      - cmake-data
 before_install:
+  # Remove cmake ppa
+  - sudo add-apt-repository -y --remove "ppa:george-edison55/precise-backports" 
+  #### begin g++ 4.9
+  # ppa for g++ 4.9 (first version that supports complete c++11.  i.e. <regex>)
+  - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test                         
+  - sudo apt-get update
+  - sudo apt-get install gcc-4.9 g++-4.9
+  - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.9 60 --slave /usr/bin/g++ g++ /usr/bin/g++-4.9
+  - sudo add-apt-repository -y --remove "ubuntu-toolchain-r-test"
+  #### end g++ 4.9
   - sudo apt-get update -qq
   - sudo apt-get install -qq libboost-all-dev
   - sudo apt-get install maven
   #### begin cpprest
-  - sudo apt-get install g++ git make zlib1g-dev libboost-all-dev libssl-dev cmake
+  - sudo apt-get install g++ git make zlib1g-dev libboost-all-dev libssl-dev
   - git clone https://github.com/Microsoft/cpprestsdk.git casablanca
   - cd casablanca/Release
   - mkdir build
@@ -38,7 +55,7 @@ script:
   - make test_gcov --always-make
   - cd python
   - source activate test-python27
-  - pip install pytest readme_renderer
+  - pip install pytest readme_renderer pandas
   - python setup.py check -mrs
   - python setup.py install
   - py.test tests

Makefile

@@ -105,11 +105,15 @@ all:	vw library_example java spanning_tree rl_clientlib
 export
 
 rl_clientlib:
-	cd decision_service/rlclientlib; $(MAKE) -j $(NPROCS) things
+	cd reinforcement_learning/rlclientlib; $(MAKE) -j $(NPROCS) things
 
-rl_clientlib_test:
-	cd decision_service/unit_test; $(MAKE) -j $(NPROCS) things
-	(cd decision_service/unit_test && ./rlclient-test.out)
+rl_clientlib_test: vw rl_clientlib
+	cd reinforcement_learning/unit_test; $(MAKE) -j $(NPROCS) things
+	(cd reinforcement_learning/unit_test && ./rlclient-test.out)
+
+rl_example: vw rl_clientlib
+	cd reinforcement_learning/examples/basic_usage_cpp; $(MAKE) -j $(NPROCS) things
+	cd reinforcement_learning/examples/rl_sim_cpp; $(MAKE) -j $(NPROCS) things
 
 spanning_tree:
 	cd cluster; $(MAKE)
@@ -168,6 +172,9 @@ clean:
 	cd library && $(MAKE) clean
 	cd python  && $(MAKE) clean
 	cd java    && $(MAKE) clean
-	cd decision_service/rlclientlib    && $(MAKE) clean
+	cd reinforcement_learning/rlclientlib    && $(MAKE) clean
+	cd reinforcement_learning/unit_test; $(MAKE) clean
+	cd reinforcement_learning/examples/basic_usage_cpp; $(MAKE) clean
+	cd reinforcement_learning/examples/rl_sim_cpp; $(MAKE) clean
 
 .PHONY: all clean install doc

appveyor.yml

@@ -7,6 +7,7 @@ shallow_clone: true
 clone_folder: C:\vowpal_wabbit
 # need to install nuget packages before Visual Studio starts to make ANTLR targets available.
 build_script:
+- vcpkg install cpprestsdk:x64-windows
 - cd c:\vowpal_wabbit
 - vowpalwabbit\.nuget\nuget install -o vowpalwabbit\packages cs\cs\packages.config
 - vowpalwabbit\.nuget\nuget install -o vowpalwabbit\packages cs\azure\packages.config