Got it bot-ready!

Using C++ randomization now, along with an update to rawr-ebooks that allows it to do the same. Cleaned up the code here and there. Added in the twitter client and the config file reader. We can use librawr's histogram class now, so we don't need our own. Also why did we not name this bot "aspartame". It's a Sugar replacer. Hahaha. I'm Pink Diamond.

5 files changed, 56 insertions, 86 deletions

@@ -1,11 +1,17 @@
 cmake_minimum_required (VERSION 3.1)
 project (rawr-ebooks)
 
+find_package(PkgConfig)
+pkg_check_modules(yaml-cpp yaml-cpp REQUIRED)
+
 add_subdirectory(vendor/rawr-ebooks EXCLUDE_FROM_ALL)
 
-include_directories(vendor/rawr-ebooks)
+include_directories(
+  vendor/rawr-ebooks
+  vendor/rawr-ebooks/vendor/libtwittercpp/src
+  ${yaml-cpp_INCLUDE_DIRS})
 
-add_executable(garnet dialogue.cpp histogram.cpp)
+add_executable(garnet dialogue.cpp)
 set_property(TARGET garnet PROPERTY CXX_STANDARD 17)
 set_property(TARGET garnet PROPERTY CXX_STANDARD_REQUIRED ON)
-target_link_libraries(garnet rawr)
+target_link_libraries(garnet rawr twitter++ ${yaml-cpp_LIBRARIES})
@@ -2,19 +2,17 @@
 #include "identifier.h"
 #include "histogram.h"
 #include <rawr.h>
-#include <cstdlib>
-#include <ctime>
 #include <map>
 #include <string>
 #include <iostream>
 #include <sstream>
-
-
+#include <random>
+#include <twitter.h>
+#include <yaml-cpp/yaml.h>
 
 using speakerstore = identifier<std::string>;
 using speaker_id = speakerstore::key_type;
 
-
 struct speaker_data {
 
   std::string name;
@@ -24,21 +22,39 @@ struct speaker_data {
 
 };
 
+int main(int argc, char** argv)
+{
+  if (argc != 2)
+  {
+    std::cout << "usage: garnet [configfile]" << std::endl;
+    return -1;
+  }
+
+  std::random_device randomDevice;
+  std::mt19937 rng(randomDevice());
 
+  std::string configfile(argv[1]);
+  YAML::Node config = YAML::LoadFile(configfile);
 
+  twitter::auth auth(
+    config["consumer_key"].as<std::string>(),
+    config["consumer_secret"].as<std::string>(),
+    config["access_key"].as<std::string>(),
+    config["access_secret"].as<std::string>());
 
-int main(int, char**)
-{
-  srand(time(NULL));
-  rand(); rand(); rand(); rand();
+  twitter::client client(auth);
 
   speakerstore speakers;
   std::map<speaker_id, speaker_data> speakerData;
   histogram<speaker_id> allSpeakers;
 
+  using csv =
+    io::CSVReader<
+      2,
+      io::trim_chars<' ', '\t'>,
+      io::double_quote_escape<',', '"'>>;
 
-
-  io::CSVReader<2,io::trim_chars<' ', '\t'>,io::double_quote_escape<',', '"'>> in("../dialogue.csv");
+  csv in(config["transcript"].as<std::string>());
   std::string speaker;
   std::string line;
 
@@ -85,11 +101,10 @@ int main(int, char**)
   {
     std::set<speaker_id> pastSpeakers;
 
-
-    speaker_id curSpeaker = allSpeakers.next();
+    speaker_id curSpeaker = allSpeakers.next(rng);
 
     std::ostringstream theEnd;
-    int maxLines = rand() % 4 + 3;
+    int maxLines = std::uniform_int_distribution<int>(3, 6)(rng);
 
     for (int i = 0; i < maxLines; i++)
     {
@@ -102,7 +117,8 @@ int main(int, char**)
         theEnd << curSd.name << ": ";
       }
 
-      std::string curLine = curSd.chain.randomSentence(rand() % 30 + 1);
+      int maxL = std::uniform_int_distribution<int>(1, 30)(rng);
+      std::string curLine = curSd.chain.randomSentence(maxL, rng);
 
       if (curSd.name == "" &&
           curLine[0] != '[' &&
@@ -116,13 +132,16 @@ int main(int, char**)
 
       theEnd << std::endl;
 
-      speaker_id repeatSpeaker = *std::next(std::begin(pastSpeakers), rand() % pastSpeakers.size());
+      int psi =
+        std::uniform_int_distribution<int>(0, pastSpeakers.size()-1)(rng);
+
+      speaker_id repeatSpeaker = *std::next(std::begin(pastSpeakers), psi);
       if (repeatSpeaker != curSpeaker &&
-          rand() % 3 == 0)
+          std::bernoulli_distribution(1.0 / 3.0)(rng))
       {
         curSpeaker = repeatSpeaker;
       } else {
-        curSpeaker = curSd.nextSpeaker.next();
+        curSpeaker = curSd.nextSpeaker.next(rng);
       }
     }
 
@@ -131,9 +150,18 @@ int main(int, char**)
     output = output.substr(0, output.find_last_of('\n'));
     std::cout << output;
 
+    try
+    {
+      client.updateStatus(output);
+    } catch (const twitter::twitter_error& error)
+    {
+      std::cout << "Twitter error while tweeting: " << error.what()
+        << std::endl;
+    }
+
     std::cout << std::endl;
     std::cout << std::endl;
 
-    getc(stdin);
+    std::this_thread::sleep_for(std::chrono::hours(4));
   }
 }
@@ -1,44 +0,0 @@
-#include "histogram.h"
-#include <cstdlib>
-#include <iostream>
-
-template <class T>
-void histogram<T>::add(const T& inst)
-{
-  freqtable[inst]++;
-}
-
-template <class T>
-void histogram<T>::compile()
-{
-  distribution.clear();
-
-  int max = 0;
-  for (auto& it : freqtable)
-  {
-    max += it.second;
-    distribution.emplace(max, it.first);
-  }
-
-  freqtable.clear();
-}
-
-template <class T>
-const T& histogram<T>::next() const
-{
-  int max = distribution.rbegin()->first;
-  int r = rand() % max;
-
-  return distribution.upper_bound(r)->second;
-}
-
-template <class T>
-void histogram<T>::print() const
-{
-  for (auto& freqpair : freqtable)
-  {
-    std::cout << freqpair.first << ": " << freqpair.second << std::endl;
-  }
-}
-
-template class histogram <unsigned long>;
@@ -1,20 +0,0 @@
-#ifndef HISTOGRAM_H_24094D97
-#define HISTOGRAM_H_24094D97
-
-#include <map>
-#include <string>
-
-template <class T>
-class histogram {
-  public:
-    void add(const T& inst);
-    void compile();
-    const T& next() const;
-    void print() const;
-    
-  private:
-    std::map<T, int> freqtable;
-    std::map<int, T> distribution;
-};
-
-#endif /* end of include guard: HISTOGRAM_H_24094D97 */
-Subproject 1890eb5d4a496aea5e9114550081ca63bd280f3
+Subproject 01fcbeb60da0bff33d5d9f5b870d444cc418a01