Update cpp example to use vector<double>, correct CMakeLists.txt (Far…

…ama-Foundation#196) Former-commit-id: f9674d7
priyanshu030 · May 3, 2017 · 91017d6 · 91017d6
1 parent e3e4489
commit 91017d6
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git a/examples/c++/Basic.cpp b/examples/c++/Basic.cpp
@@ -84,7 +84,7 @@ int main() {
     // Define some actions. Each list entry corresponds to declared buttons:
     // MOVE_LEFT, MOVE_RIGHT, ATTACK
     // more combinations are naturally possible but only 3 are included for transparency when watching.
-    std::vector<int> actions[3];
+    std::vector<double> actions[3];
     actions[0] = {1, 0, 0};
     actions[1] = {0, 1, 0};
     actions[2] = {0, 0, 1};
@@ -112,7 +112,7 @@ int main() {
 
             // Which consists of:
             unsigned int n              = state->number;
-            std::vector<int> vars       = state->gameVariables;
+            std::vector<double> vars       = state->gameVariables;
             BufferPtr screenBuf         = state->screenBuffer;
             BufferPtr depthBuf          = state->depthBuffer;
             BufferPtr labelsBuf         = state->labelsBuffer;

diff --git a/examples/c++/CIG.cpp b/examples/c++/CIG.cpp
@@ -36,7 +36,7 @@ int main(){
         GameStatePtr state = game->getState();
         // Analyze the state.
 
-        std::vector<int> action(game->getAvailableButtonsSize());
+        std::vector<double> action(game->getAvailableButtonsSize());
         // Set your action.
 
         game->makeAction(action);

diff --git a/examples/c++/CIGBots.cpp b/examples/c++/CIGBots.cpp
@@ -54,7 +54,7 @@ int main(){
             GameStatePtr state = game->getState();
             // Analyze the state.
 
-            std::vector<int> action(game->getAvailableButtonsSize());
+            std::vector<double> action(game->getAvailableButtonsSize());
             // Set your action.
 
             game->makeAction(action);

diff --git a/examples/c++/CIGHost.cpp b/examples/c++/CIGHost.cpp
@@ -46,7 +46,7 @@ int main(){
         GameStatePtr state = game->getState();
         // Analyze the state.
 
-        std::vector<int> action(game->getAvailableButtonsSize());
+        std::vector<double> action(game->getAvailableButtonsSize());
         // Set your action.
 
         game->makeAction(action);

diff --git a/examples/c++/CMakeLists.txt b/examples/c++/CMakeLists.txt
@@ -12,7 +12,7 @@ if (WIN32)
 	set_property(TARGET libvizdoom PROPERTY IMPORTED_LOCATION ${CMAKE_CURRENT_SOURCE_DIR}/../../bin/vizdoom.lib)
 endif()
 if (UNIX AND NOT APPLE)
-	set_property(TARGET libvizdoom PROPERTY IMPORTED_LOCATION ${CMAKE_CURRENT_SOURCE_DIR}/../../bin/libvizdoom.a)
+	set_property(TARGET libvizdoom PROPERTY IMPORTED_LOCATION ${CMAKE_CURRENT_SOURCE_DIR}/../../bin/libvizdoom.so)
 endif()
 if (APPLE)
 	set_property(TARGET libvizdoom PROPERTY IMPORTED_LOCATION ${CMAKE_CURRENT_SOURCE_DIR}/../../bin/libvizdoom.dylib)

diff --git a/examples/c++/DeltaButtons.cpp b/examples/c++/DeltaButtons.cpp
@@ -42,7 +42,7 @@ int main(){
     //
     // For MOVE_FORWARD_BACKWARD_DELTA, MOVE_LEFT_RIGHT_DELTA, MOVE_UP_DOWN_DELTA (rarely used)
     // value is the speed of movement in a given direction (100 is close to the maximum speed).
-    std::vector<int> action = {100, 10, 10, 1};
+    std::vector<double> action = {100, 10, 10, 1};
 
     // If button's absolute value > max button's value then value = max value with original value sign.
 

diff --git a/examples/c++/Seed.cpp b/examples/c++/Seed.cpp
@@ -45,7 +45,7 @@ int main(){
     game->init();
 
     // Define some actions.
-    std::vector<int> actions[3];
+    std::vector<double> actions[3];
     actions[0] = {1, 0, 0};
     actions[1] = {0, 1, 0};
     actions[2] = {0, 0, 1};

diff --git a/examples/c++/Shaping.cpp b/examples/c++/Shaping.cpp
@@ -27,7 +27,7 @@ int main(){
     game->init();
 
     // Define some actions.
-    std::vector<int> actions[3];
+    std::vector<double> actions[3];
     actions[0] = {1, 0, 0};
     actions[1] = {0, 1, 0};
     actions[2] = {0, 0, 1};

diff --git a/examples/c++/Spectator.cpp b/examples/c++/Spectator.cpp
@@ -15,9 +15,9 @@ int main(){
     // Don't load two configs cause the second will overwrite the first one.
     // Multiple config files are ok but combining these ones doesn't make much sense.
 
-    //game->loadConfig("../../scenarios/basic.cfg");
+    game->loadConfig("../../scenarios/basic.cfg");
     //game->loadConfig("../../scenarios/deadly_corridor.cfg");
-    game->loadConfig("../../scenarios/deathmatch.cfg");
+    //game->loadConfig("../../scenarios/deathmatch.cfg");
     //game->loadConfig("../../scenarios/defend_the_center.cfg");
     //game->loadConfig("../../scenarios/defend_the_line.cfg");
     //game->loadConfig("../../scenarios/health_gathering.cfg");
@@ -55,7 +55,7 @@ int main(){
             // game->advanceAction(4);
 
             // Get the last action performed by You.
-            std::vector<int> lastAction = game->getLastAction();
+            std::vector<double> lastAction = game->getLastAction();
 
             // And reward You get.
             double reward = game->getLastReward();