Merge branch 'master' into c

Author: truell20

README.md

@@ -20,8 +20,14 @@ If you find a bug or have a feature request, please [open an issue](https://gith
 
 Want to help out? Have you implemented a patch or a new feature? Send us a pull request! If you are looking for things to do, check out [our open issues](https://github.com/HaliteChallenge/Halite/issues).
 
+### Writing a Starter Package
+
 If you'd like to write a starter package for a new language, see this [guide](https://halite.io/advanced_writing_sp.php).
 
+### Adding Your Company or University
+
+Edit [this whitelist](https://github.com/HaliteChallenge/Halite/edit/master/website/organizationWhitelist.txt) and send us a pull request. If you need to change your email, head [here](https://halite.io/email.php). We'll make sure to tag all members of your organization who have already signed up.
+
 ### Authors
 
 Halite was primarily created by [Ben Spector](https://github.com/Sydriax) and [Michael Truell](https://github.com/truell20) for Two Sigma during their summer 2016 internship. However, many others contributed to Halite's developement, including [Matt Adereth](https://github.com/adereth) and [Trammell Hudson](https://github.com/osresearch) from Two Sigma and [Arnaud Sahuguet](https://github.com/sahuguet) and [Scot Spinner](https://github.com/awesomescot) from Cornell Tech.

environment/networking/Networking.cpp

@@ -278,6 +278,7 @@ void Networking::startAndConnectBot(std::string command) {
     if(pid == 0) { //This is the child
         setpgid(getpid(), getpid());
 
+#ifdef __linux__
         // install a parent death signal
         // http://stackoverflow.com/a/36945270
         int r = prctl(PR_SET_PDEATHSIG, SIGTERM);
@@ -288,6 +289,7 @@ void Networking::startAndConnectBot(std::string command) {
         }
         if (getppid() != ppid_before_fork)
             exit(1);
+#endif
 
         dup2(writePipe[0], STDIN_FILENO);
 
@@ -317,9 +319,9 @@ void Networking::startAndConnectBot(std::string command) {
 }
 
 int Networking::handleInitNetworking(unsigned char playerTag, const hlt::Map & m, bool ignoreTimeout, std::string * playerName) {
-    
+
     const int ALLOTTED_MILLIS = ignoreTimeout ? 2147483647 : 15000;
-    
+
     std::string response;
     try {
         std::string playerTagString = std::to_string(playerTag), mapSizeString = serializeMapSize(m), mapString = serializeMap(m), prodString = serializeProductions(m);
@@ -362,7 +364,7 @@ int Networking::handleInitNetworking(unsigned char playerTag, const hlt::Map & m
 int Networking::handleFrameNetworking(unsigned char playerTag, const unsigned short & turnNumber, const hlt::Map & m, bool ignoreTimeout, std::map<hlt::Location, unsigned char> * moves) {
 
     const int ALLOTTED_MILLIS = ignoreTimeout ? 2147483647 : 1500;
-    
+
     std::string response;
     try {
         if(isProcessDead(playerTag)) return -1;

environment/networking/Networking.hpp

@@ -16,7 +16,9 @@
     #include <sys/stat.h>
     #include <fcntl.h>
     #include <sys/select.h>
+#ifdef __linux__
     #include <sys/prctl.h>
+#endif
     #include <unistd.h>
 #endif
 

website/api/manager/ManagerAPI.php

@@ -86,13 +86,16 @@ protected function task() {
             $numPlayers = $possibleNumPlayers[array_rand($possibleNumPlayers)];
 
             $seedPlayer = null;
-            if((mt_rand() / mt_getrandmax()) > 0.5) {
+            $randValue = mt_rand() / mt_getrandmax();
+            if($randValue > 0.5) {
                 $seedPlayer = $this->select("SELECT * FROM User WHERE isRunning = 1 order by rand()*-pow(sigma, 2) LIMIT 1");
-            } else {
+            }
+            if ($randValue > 0.25 && $randValue <= 0.5) {
                 $seedPlayer = $this->select("SELECT * FROM (SELECT u.* FROM (SELECT MAX(g.timestamp) as maxTime, gu.userID as userID FROM GameUser gu INNER JOIN Game g ON g.gameID=gu.gameID GROUP BY gu.userID) temptable INNER JOIN User u on u.userID = temptable.userID where numGames < 400 order by maxTime ASC limit 15) orderedTable order by rand() limit 1;");
-                if(count($seedPlayer) < 1) $seedPlayer = $this->select("SELECT u.* FROM (SELECT MAX(g.timestamp) as maxTime, gu.userID as userID FROM GameUser gu INNER JOIN Game g ON g.gameID=gu.gameID GROUP BY gu.userID) temptable INNER JOIN User u on u.userID = temptable.userID order by maxTime ASC limit 1");
+            } 
+            if($randValue <= 0.25 || count($seedPlayer) < 1) {
+                $seedPlayer = $this->select("SELECT u.* FROM (SELECT MAX(g.timestamp) as maxTime, gu.userID as userID FROM GameUser gu INNER JOIN Game g ON g.gameID=gu.gameID GROUP BY gu.userID) temptable INNER JOIN User u on u.userID = temptable.userID order by maxTime ASC limit 1");
             }
-            if(count($seedPlayer) < 1) return null;
 
             $muRankLimit = intval(5.0 / pow((float)mt_rand(1, mt_getrandmax())/(float)mt_getrandmax(), 0.65));
             $players = $this->selectMultiple("SELECT * FROM (SELECT * FROM User WHERE isRunning=1 and userID <> {$seedPlayer['userID']} ORDER BY ABS(mu-{$seedPlayer['mu']}) LIMIT $muRankLimit) muRankTable ORDER BY rand() LIMIT ".($numPlayers-1));

website/local_visualizer.php

@@ -20,7 +20,6 @@
                 <input type="file" id="filePicker" style="display: none;">
             </div>
         </div>
-        <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
     </div>
 
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js"></script>

website/organizationWhitelist.txt

@@ -1,4 +1,5 @@
 Two Sigma - twosigma.com
+Auburn - auburn.edu
 Cornell - cornell.edu
 NYU - nyu.edu
 Stanford - stanford.edu
@@ -91,4 +92,6 @@ Carleton University - carleton.ca
 DoubleDutch - doubledutch.me
 RWTH Aachen - rwth-aachen.de
 University of Aveiro - ua.pt
-Allstate - allstate.com 
+Allstate - allstate.com
+Dreamix - dreamix.eu
+KU Leuven - student.kuleuven.be

website/script/visualizer.js

@@ -401,7 +401,10 @@ function showGame(game, $container, maxWidth, maxHeight, showmovement, isminimal
         renderer.render(stage);
 
         //Of course, we want to render in the future as well.
-        requestAnimationFrame(animate);
+        var idle = (Object.keys(pressed).length === 0) && !shouldplay;
+        setTimeout(function() {
+            requestAnimationFrame(animate);
+        }, 1000 / (idle ? 6.0 : 80.0));
     }
 }