Merge of latest microsoft features.

CMakeLists.txt

@@ -52,8 +52,26 @@ set( STATIC_BOOST        ON CACHE BOOL ${STATIC_BOOST_DESC} )
 if( INCLUDE_PYTHON )
   set( USE_PYTHON_VERSIONS_DESC "Specifies which version of Python to build Malmo with Python bindings" )
   set( USE_PYTHON_VERSIONS 3.6 CACHE STRING ${USE_PYTHON_VERSIONS_DESC} )
-  set( BOOST_PYTHON_NAME_DESC "Specifies which Boost Python module to build Malmo with" )
-  set( BOOST_PYTHON_NAME "python3" CACHE STRING ${BOOST_PYTHON_NAME_DESC} )
+  if (NOT BOOST_PYTHON_NAME)
+    message("The name of the Boost Python library has not been set - trying to
+    determine it automatically...")
+    set(BOOST_PYTHON_NAME_DESC "Specifies which Boost Python module to build Malmo with" )
+
+    if (Boost_VERSION VERSION_GREATER 1.67 )
+      # From version 1.67 and up, Boost appends the Python version number to
+      # the library name by default.
+      # (https://www.boost.org/users/history/version_1_67_0.html)
+      execute_process(
+        COMMAND python3 -c "import sys; print('python' + str(sys.version_info[0]) + str(sys.version_info[1]), end='')" 
+        OUTPUT_VARIABLE BOOST_PYTHON_NAME
+      )
+    else()
+      set (BOOST_PYTHON_NAME "python")
+    endif()
+    message("BOOST_PYTHON_NAME set to ${BOOST_PYTHON_NAME}. To override it, add
+    the flag -DBOOST_PYTHON_NAME=<name> where <name> is the name of the Boost
+    Python library on your system (see https://github.com/boostorg/build/pull/250).")
+  endif()
 endif()
 
 set( WARNINGS_AS_ERRORS OFF )
@@ -102,19 +120,29 @@ set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake )
 SET(Boost_ADDITIONAL_VERSIONS "1.65" "1.65.0")
 SET(Boost_ADDITIONAL_VERSIONS "1.66" "1.66.0")
 SET(Boost_ADDITIONAL_VERSIONS "1.67" "1.67.0")
+SET(Boost_ADDITIONAL_VERSIONS "1.68" "1.68.0")
+SET(Boost_ADDITIONAL_VERSIONS "1.69" "1.69.0")
+SET(Boost_ADDITIONAL_VERSIONS "1.70" "1.70.0")
+
+# Boost release variant builds have symbol visibility set to hidden by default 
+# (https://boostorg.github.io/build/manual/develop/index.html#bbv2.overview.builtins.features)
+# The line below adds compilation flags to make the visibility settings for compiling Malmo
+# consistent with the visibility settings for Boost, and fixes linking warnings emitted by the
+# GCC 9 compiler.
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")
+
+# This allows users to override the Boost Python library name if different from
+# the defaults (this can occur with certain package managers - e.g. For Boost compiled against Python 3.6,
+# MacPorts would name the Boost Python library as libboost_python3 instead of libboost_python36).
 
-SET(BOOST_PYTHON_MODULE_NAME "python")
-if ( USE_PYTHON_VERSIONS VERSION_GREATER 3 )
-  SET( BOOST_PYTHON_MODULE_NAME ${BOOST_PYTHON_NAME} )
-endif()
 
 if( WIN32 )
   SET(Boost_USE_STATIC_LIBS ON)
-  find_package( Boost COMPONENTS chrono date_time filesystem iostreams program_options ${BOOST_PYTHON_MODULE_NAME} regex system thread REQUIRED )
+  find_package( Boost COMPONENTS chrono date_time filesystem iostreams program_options ${BOOST_PYTHON_NAME} regex system thread REQUIRED )
   add_definitions(-DBOOST_ALL_NO_LIB=1)  # Turn off auto-linking, creates problems when linking boost statically
 else()
   SET(Boost_USE_STATIC_LIBS ${STATIC_BOOST})
-  find_package( Boost COMPONENTS chrono date_time filesystem iostreams program_options ${BOOST_PYTHON_MODULE_NAME} regex system thread REQUIRED )
+  find_package( Boost COMPONENTS chrono date_time filesystem iostreams program_options ${BOOST_PYTHON_NAME} regex system thread REQUIRED )
   set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
   find_package( Threads REQUIRED )
 endif()

LICENSE.txt

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016 Microsoft Corporation
+Copyright (c) 2016, 2018 Microsoft Corporation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
 associated documentation files (the "Software"), to deal in the Software without restriction,

Malmo/samples/Python_examples/inventory_test.py

@@ -187,7 +187,10 @@ def getContainerXML():
     while world_state.is_mission_running:
         world_state = agent_host.getWorldState()
         if world_state.number_of_rewards_since_last_state > 0:
-            total_reward += world_state.rewards[-1].getValue()
+            reward = world_state.rewards[-1].getValue()
+            if reward != 0:
+                print("Got reward of " + str(reward))
+            total_reward += reward
         if world_state.number_of_observations_since_last_state > 0:
             obs = json.loads(world_state.observations[-1].text)
 
@@ -306,7 +309,10 @@ def getContainerXML():
     # Mission has ended.
     # Get final reward:
     if world_state.number_of_rewards_since_last_state > 0:
-        total_reward += world_state.rewards[-1].getValue()
+        reward = world_state.rewards[-1].getValue()
+        if reward != 0:
+            print("Got final reward of " + str(reward))
+        total_reward += reward
 
     test_passed = True
     if False in list(completed_boxes.values()):

Malmo/samples/Python_examples/sample_missions_loader.py

@@ -34,7 +34,9 @@
 # -- set up the mission -- #
 #mission_file_no_ext = '../Sample_missions/default_world_1'                 # Survive and find gold, diamond or redstone!
 #mission_file_no_ext = '../Sample_missions/default_flat_1'                  # Move to a wooden hut in a snow tempest!
-mission_file_no_ext = '../Sample_missions/tricky_arena_1'                  # Mind your step to the redstone! 
+# This is the default mission to run:
+mission_file_no_ext = '../Sample_missions/tricky_arena_1'                 # Mind your step to the redstone! 
+#mission_file_no_ext = '../Sample_missions/inventory_handlers'               # Tour of crafting, smelting, collecting! 
 #mission_file_no_ext = '../Sample_missions/eating_1'                        # Eat a healthy diet! 
 #mission_file_no_ext = '../Sample_missions/cliff_walking_1'                 # Burning lava! 
 

Malmo/samples/Python_examples/team_reward_test.py

@@ -77,7 +77,7 @@ def safeStartMission(agent_host, my_mission, my_client_pool, my_mission_record,
                     print("Will wait and retry.", max_attempts - used_attempts, "attempts left.")
                     time.sleep(2)
             else:
-                print("Other error:", e.message)
+                print("Other error: ", str(e))
                 print("Waiting will not help here - bailing immediately.")
                 exit(1)
         if used_attempts == max_attempts:

Malmo/src/AgentHost.cpp

@@ -728,6 +728,44 @@ namespace malmo
         this->world_state.is_mission_running = false;
         closeServers();
         closeRecording();
+
+        // Ensure all TCP server ports are closed.
+
+        if (this->video_server) {
+            this->video_server->close();
+            this->video_server = 0;
+        }
+
+        if (this->depth_server) {
+            this->depth_server->close();
+            this->depth_server = 0;
+        }
+
+        if (this->luminance_server) {
+            this->luminance_server->close();
+            this->luminance_server = 0;
+        }
+
+        if (this->colourmap_server) {
+            this->colourmap_server->close ();
+            this->colourmap_server = 0;
+        }
+
+        if (this->observations_server) {
+            this->observations_server->close();
+            this->observations_server = 0;
+        }
+
+        if (this->rewards_server) {
+            this->rewards_server->close();
+            this->rewards_server = 0;
+
+        }
+
+        if (this->mission_control_server) {
+            this->mission_control_server->close();
+            this->mission_control_server = 0;
+        }
     }
 
     void AgentHost::closeServers()

Malmo/src/MissionSpec.cpp

@@ -39,6 +39,8 @@ namespace malmo
     const std::vector<std::string> MissionSpec::all_inventory_commands = { "swapInventoryItems", "combineInventoryItems", "discardCurrentItem", 
         "hotbar.1", "hotbar.2", "hotbar.3", "hotbar.4", "hotbar.5", "hotbar.6", "hotbar.7", "hotbar.8", "hotbar.9" };
     const std::vector<std::string> MissionSpec::all_simplecraft_commands = { "craft" };
+    const std::vector<std::string> MissionSpec::all_nearbycraft_commands = { "craftNearby" };
+    const std::vector<std::string> MissionSpec::all_nearbysmelt_commands = { "smeltNearby" };
     const std::vector<std::string> MissionSpec::all_chat_commands = { "chat" };
     const std::vector<std::string> MissionSpec::all_mission_quit_commands = { "quit" };
     const std::vector<std::string> MissionSpec::all_human_level_commands = { "forward", "left", "right", "jump", "sneak", "sprint", "inventory", "swapHands", "drop", "use", "attack", "moveMouse", 
@@ -110,6 +112,7 @@ namespace malmo
             child.erase("FlatWorldGenerator");
             child.erase("FileWorldGenerator");
             child.erase("DefaultWorldGenerator");
+            child.erase("BiomeGenerator");
         }
     }
 
@@ -137,6 +140,10 @@ namespace malmo
         if (defaultWorldGenerator) {
            defaultWorldGenerator.get().put("<xmlattr>.forceReset", true);
         }
+        const auto& biomeWorldGenerator = mission.get_child_optional("Mission.ServerSection.ServerHandlers.BiomeGenerator");
+        if (biomeWorldGenerator) {
+            biomeWorldGenerator.get().put("<xmlattr>.forceReset", true);
+        }
     }
 
     void MissionSpec::setTimeOfDay(int t,bool allowTimeToPass)
@@ -359,6 +366,11 @@ namespace malmo
         mission.put("Mission.AgentSection.AgentHandlers.ObservationFromChat", "");
     }
 
+    void MissionSpec::observeCompass()
+    {
+        mission.put("Mission.AgentSection.AgentHandlers.ObservationFromCompass", "");
+    }
+
     // ------------------ settings for the agents : command handlers --------------------------------
 
     void MissionSpec::removeAllCommandHandlers()
@@ -371,6 +383,9 @@ namespace malmo
             child.erase("DiscreteMovementCommands");
             child.erase("AbsoluteMovementCommands");
             child.erase("SimpleCraftCommands");
+            child.erase("NearbyCraftCommands");
+            child.erase("NearbySmeltCommands");
+            child.erase("PlaceCommands");
             child.erase("ChatCommands");
             child.erase("MissionQuitCommands");
         }
@@ -415,11 +430,16 @@ namespace malmo
     {
         addVerbToCommandType(verb, "Mission.AgentSection.AgentHandlers.InventoryCommands");
     }
-   
+
     void MissionSpec::allowAllChatCommands()
     {
         mission.put("Mission.AgentSection.AgentHandlers.ChatCommands", "");
     }
+
+    void MissionSpec::allowAllPlaceCommands()
+    {
+        mission.put("Mission.AgentSection.AgentHandlers.PlaceCommands", "");
+    }
 
     // ------------------------------- information ---------------------------------------------------
 
@@ -517,6 +537,15 @@ namespace malmo
 
                 if (e.second.get_child_optional("AgentHandlers.SimpleCraftCommands"))
                     command_handlers.push_back("SimpleCraft");
+
+                if (e.second.get_child_optional("AgentHandlers.NearbyCraftCommands"))
+                    command_handlers.push_back("NearbyCraft");
+
+                if (e.second.get_child_optional("AgentHandlers.NearbySmeltCommands"))
+                    command_handlers.push_back("NearbySmelt");
+
+                if (e.second.get_child_optional("AgentHandlers.PlaceCommands"))
+                    command_handlers.push_back("Place");
 
                 if (e.second.get_child_optional("AgentHandlers.MissionQuitCommands"))
                     command_handlers.push_back("MissionQuit");
@@ -577,6 +606,12 @@ namespace malmo
                     else if (command_handler == "SimpleCraft") {
                         allowed_commands = all_simplecraft_commands;
                     }
+                    else if (command_handler == "NearbyCraft") {
+                        allowed_commands = all_nearbycraft_commands;
+                    }
+                    else if (command_handler == "NearbySmelt") {
+                        allowed_commands = all_nearbysmelt_commands;
+                    }
                     else if (command_handler == "Chat") {
                         allowed_commands = all_chat_commands;
                     }

Malmo/src/MissionSpec.h

@@ -242,6 +242,9 @@ namespace malmo
             //! Asks for chat messages to be included in the observations.
             void observeChat();
 
+            //! Asks for compass information to be included in the observations.
+            void observeCompass();
+
             // -------------------- settings for the agents : command handlers -------------------------
 
             //! Remove any existing command handlers from the mission specification. Use with other functions to add exactly the command handlers you want.
@@ -296,6 +299,10 @@ namespace malmo
             //! Only applies to the first agent in the mission. For multi-agent missions, specify the command handlers for each in the XML.
             void allowAllChatCommands();
 
+            //! Adds a place command handler if none present, with neither an allow-list or a deny-list, thus allowing any command to be sent.
+            //! Only applies to the first agent in the mission. For multi-agent missions, specify the command handlers for each in the XML.
+            void allowAllPlaceCommands();
+
             // ------------------------- information --------------------------------------
 
             //! Returns the short description of the mission.
@@ -379,6 +386,8 @@ namespace malmo
             static const std::vector<std::string> all_discrete_movement_commands;
             static const std::vector<std::string> all_inventory_commands;
             static const std::vector<std::string> all_simplecraft_commands;
+            static const std::vector<std::string> all_nearbycraft_commands;
+            static const std::vector<std::string> all_nearbysmelt_commands;
             static const std::vector<std::string> all_chat_commands;
             static const std::vector<std::string> all_mission_quit_commands;
             static const std::vector<std::string> all_human_level_commands;

Malmo/src/PythonWrapper/CMakeLists.txt

@@ -22,7 +22,7 @@ set( CPP_SOURCES
 )
 
 set( OTHER_FILES
-  ${CMAKE_SOURCE_DIR}/Malmo/samples/Python_examples/tutorial_6.xml
+  ${PROJECT_SOURCE_DIR}/Malmo/samples/Python_examples/tutorial_6.xml
 )
 
 python_add_module( MalmoPython SHARED ${CPP_SOURCES} )

Malmo/src/StringServer.cpp

@@ -29,18 +29,21 @@
 namespace malmo {
     StringServer::StringServer(boost::asio::io_service& io_service, int port, const boost::function<void(const TimestampedString string_message)> handle_string, const std::string& log_name)
         : handle_string(handle_string)
-        , server(io_service, port, boost::bind(&StringServer::handleMessage, this, _1), log_name)
+        , io_service(io_service)
+        , port(port)
+        , log_name(log_name)
     {
     }
 
     void StringServer::start(boost::shared_ptr<StringServer>& scope)
     {
+        this->server = boost::make_shared<TCPServer>(this->io_service, this->port, boost::bind(&StringServer::handleMessage, scope, _1), this->log_name);
         this->scope = scope;
-        this->server.start(scope.get());
+        this->server->start(scope.get());
     }
 
     void StringServer::close() {
-        this->server.close();
+        this->server->close();
     }
 
     void StringServer::release() {
@@ -60,13 +63,13 @@ namespace malmo {
 
     StringServer& StringServer::confirmWithFixedReply(std::string reply)
     {
-        this->server.confirmWithFixedReply(reply);
+        this->server->confirmWithFixedReply(reply);
         return *this;
     }
 
     StringServer& StringServer::expectSizeHeader(bool expect_size_header)
     {
-        this->server.expectSizeHeader(expect_size_header);
+        this->server->expectSizeHeader(expect_size_header);
         return *this;
     }
 
@@ -91,7 +94,7 @@ namespace malmo {
 
     int StringServer::getPort() const
     {
-        return this->server.getPort();
+        return this->server->getPort();
     }
 
     void StringServer::recordMessage(const TimestampedString string_message)

Malmo/src/StringServer.h

@@ -70,7 +70,10 @@ namespace malmo
             void handleMessage(const TimestampedUnsignedCharVector message);
 
             boost::function<void(const TimestampedString string_message)> handle_string;
-            TCPServer server;
+            boost::asio::io_service& io_service;
+            int port;
+            const std::string log_name;
+            boost::shared_ptr<TCPServer> server;
             std::ofstream writer;
             boost::mutex write_mutex;