Merge pull request #2 from kant2002/version_14

Update to version 1.4

BOSS/source/Timer.hpp

@@ -105,14 +105,11 @@ class Timer
 		return this->getElapsedTimeInMicroSec() * 0.001;
 	}
 
-
 	double getElapsedTimeInSec()
 	{
 		return this->getElapsedTimeInMicroSec() * 0.000001;
 	}
 
-
-
 	double getElapsedTime()
 	{
 		return this->getElapsedTimeInSec();

Steamhammer/Source/BOSSManager.cpp

@@ -18,7 +18,6 @@ BOSSManager::BOSSManager()
     , _searchInProgress(false)
     , _previousStatus("No Searches")
 {
-
 }
 
 void BOSSManager::reset()
@@ -65,7 +64,7 @@ void BOSSManager::startNewSearch(const std::vector<MetaPair> & goalUnits)
         _totalPreviousSearchTime = 0;
         _previousGoalUnits = goalUnits;
     }
-    catch (const BOSS::BOSSException)
+    catch (const BOSS::BOSSException &)
     {
 		if (Config::Debug::DrawBuildOrderSearchInfo)
 		{
@@ -138,7 +137,7 @@ void BOSSManager::update(double timeLimit)
             // this will resume a search in progress or start a new search if not yet started
 			_smartSearch->search();
 		}
-		catch (const BOSS::BOSSException)
+		catch (const BOSS::BOSSException &)
         {
 			if (Config::Debug::DrawBuildOrderSearchInfo)
 			{
@@ -222,7 +221,7 @@ void BOSSManager::update(double timeLimit)
 					return;
 				}
                 // and if that search doesn't work then we're out of luck, no build orders for us
-				catch (const BOSS::BOSSException)
+				catch (const BOSS::BOSSException &)
                 {
                     //UAB_ASSERT_WARNING(false, "BOSS Timeout Naive Search Exception: %s", exception.what());
                     _previousStatus += "\x08Naive Exception";

Steamhammer/Source/Base.cpp

@@ -29,6 +29,8 @@ void Base::findGeysers()
 	}
 }
 
+// The depot may be null. (That's why player is a separate argument, not depot->getPlayer().)
+// A null depot for an owned base means that the base is inferred and hasn't been seen.
 void Base::setOwner(BWAPI::Unit depot, BWAPI::Player player)
 {
 	resourceDepot = depot;

Steamhammer/Source/BuildOrderQueue.cpp

@@ -36,6 +36,15 @@ void BuildOrderQueue::doneWithHighestPriorityItem()
 	queue.pop_back();
 }
 
+void BuildOrderQueue::pullToTop(size_t i)
+{
+	UAB_ASSERT(i >= 0 && i < queue.size()-1, "bad index");
+
+	BuildOrderItem item = queue[i];								// copy it
+	queue.erase(queue.begin() + i);
+	queueAsHighestPriority(item.macroAct, item.isGasSteal);		// this sets modified = true
+}
+
 size_t BuildOrderQueue::size() const
 {
 	return queue.size();
@@ -113,6 +122,21 @@ bool BuildOrderQueue::anyInQueue(BWAPI::UnitType type) const
 	return false;
 }
 
+// Are there any of these in the next N items in the queue?
+bool BuildOrderQueue::anyInNextN(BWAPI::UnitType type, int n) const
+{
+	for (int i = queue.size() - 1; i >= std::max(0, int(queue.size()) - 1 - n); --i)
+	{
+		const MacroAct & act = queue[i].macroAct;
+		if (act.isUnit() && act.getUnitType() == type)
+		{
+			return true;
+		}
+	}
+
+	return false;
+}
+
 size_t BuildOrderQueue::numInQueue(BWAPI::UnitType type) const
 {
 	size_t count = 0;
@@ -137,6 +161,18 @@ void BuildOrderQueue::totalCosts(int & minerals, int & gas) const
 	}
 }
 
+bool BuildOrderQueue::isGasStealInQueue() const
+{
+	for (const auto & item : queue)
+	{
+		if (item.isGasSteal)
+		{
+			return true;
+		}
+	}
+	return false;
+}
+
 void BuildOrderQueue::drawQueueInformation(int x, int y, bool outOfBook) 
 {
     if (!Config::Debug::DrawProductionInfo)
@@ -185,7 +221,7 @@ void BuildOrderQueue::drawQueueInformation(int x, int y, bool outOfBook)
 			prefix = white;
 		}
 
-		BWAPI::Broodwar->drawTextScreen(x, y, " %c%s", prefix, TrimRaceName(act.getName()).c_str());
+		BWAPI::Broodwar->drawTextScreen(x, y, " %c%s", prefix, NiceMacroActName(act.getName()).c_str());
 		y += 10;
 	}
 

Steamhammer/Source/BuildOrderQueue.h

@@ -20,10 +20,10 @@ struct BuildOrderItem
 
 class BuildOrderQueue
 {
-    std::deque< BuildOrderItem > queue;
-	bool modified;                                              // so ProductionManager can detect changes made behind its back
+    std::deque< BuildOrderItem > queue;		// highest priority item is in the back
+	bool modified;							// so ProductionManager can detect changes made behind its back
 
-	void queueItem(BuildOrderItem b);							// queues something with a given priority
+	void queueItem(BuildOrderItem b);		// queues something with a given priority
 
 public:
 
@@ -37,6 +37,7 @@ class BuildOrderQueue
     void queueAsLowestPriority(MacroAct m);						// queues something at the lowest priority
     void removeHighestPriorityItem();							// removes the highest priority item
 	void doneWithHighestPriorityItem();							// removes highest priority item without setting `modified`
+	void pullToTop(size_t i);									// move item at index i to the highest priority position
 
     size_t size() const;										// number of items in the queue
 	bool isEmpty() const;
@@ -47,8 +48,10 @@ class BuildOrderQueue
 
 	bool anyInQueue(BWAPI::UpgradeType type) const;
 	bool anyInQueue(BWAPI::UnitType type) const;
+	bool anyInNextN(BWAPI::UnitType type, int n) const;
 	size_t numInQueue(BWAPI::UnitType type) const;
 	void totalCosts(int & minerals, int & gas) const;
+	bool isGasStealInQueue() const;
 
 	void drawQueueInformation(int x, int y, bool outOfBook);