Increase range of stickProbabilities

DLASystem.cpp

@@ -4,13 +4,18 @@
 
 #include "DLASystem.h"
 
+using std::cout;
+using std::endl;
+
 // this function gets called every step,
 //   if there is an active particle then it gets moved,
 //   if not then add a particle
 void DLASystem::Update() {
+    this->frame++;
+
     if (lastParticleIsActive == 1) {
         moveLastParticle();
-    } else if (numParticles < endNum) {
+    } else if (this->particleList.size() < (size_t) endNum) {
         addParticleOnAddCircle();
         setParticleActive();
     } else {
@@ -20,17 +25,17 @@ void DLASystem::Update() {
 
 void DLASystem::clearParticles() {
     // delete particles and the particle list
-    for (int i = 0; i < numParticles; i++) {
+    for (size_t i = 0; i < this->particleList.size(); i++) {
         delete particleList[i];
     }
     particleList.clear();
-    numParticles = 0;
 }
 
 // remove any existing particles and setup initial condition
 void DLASystem::Reset() {
     // stop running
-    running = 0;
+    running = false;
+    frame = 0;
 
     clearParticles();
 
@@ -50,11 +55,6 @@ void DLASystem::Reset() {
     // add a single particle at the origin
     double pos[] = {0.0, 0.0};
     addParticle(pos);
-
-    // set the view
-    int InitialViewSize = 40;
-    setViewSize(InitialViewSize);
-
 }
 
 // set the value of a grid cell for a particular position
@@ -71,23 +71,12 @@ int DLASystem::readGrid(double pos[]) {
     return grid[(int) (pos[0] + halfGrid)][(int) (pos[1] + halfGrid)];
 }
 
-// check if the cluster is big enough and we should stop:
-// to be safe, we need the killCircle to be at least 2 less than the edge of the grid
-int DLASystem::checkStop() {
-    if (killCircle + 2 >= gridSize / 2) {
-        pauseRunning();
-        cout << "STOP" << endl;
-        return 1;
-    } else return 0;
-}
-
 // add a particle to the system at a specific position
 void DLASystem::addParticle(double pos[]) {
     // create a new particle
     Particle *p = new Particle(pos);
     // push_back means "add this to the end of the list"
     particleList.push_back(p);
-    numParticles++;
 
     // pos coordinates should be -gridSize/2 < x < gridSize/2
     setGrid(pos, 1);
@@ -101,10 +90,11 @@ void DLASystem::addParticleOnAddCircle() {
     double theta = rgen.random01() * 2 * M_PI;
     pos[0] = ceil(addCircle * cos(theta));
     pos[1] = ceil(addCircle * sin(theta));
-    if (readGrid(pos) == 0)
+    if (readGrid(pos) == 0) {
         addParticle(pos);
-    else
+    } else {
         cout << "FAIL " << pos[0] << " " << pos[1] << endl;
+    }
 }
 
 // send back the position of a neighbour of a given grid cell
@@ -131,88 +121,64 @@ void DLASystem::setPosNeighbour(double setpos[], double pos[], int val) {
     }
 }
 
-// if the view is smaller than the kill circle then increase the view area (zoom out)
-void DLASystem::updateViewSize() {
-    double mult = 1.2;
-    if (viewSize < 2.0 * killCircle) {
-        setViewSize(viewSize * mult);
-    }
-}
-
-// set the view to be the size of the add circle (ie zoom in on the cluster)
-void DLASystem::viewAddCircle() {
-    setViewSize(2.0 * addCircle);  // factor of 2 is to go from radius to diameter
-}
-
 // when we add a particle to the cluster, we should update the cluster radius
 // and the sizes of the addCircle and the killCircle
 void DLASystem::updateClusterRadius(double pos[]) {
-
-    double rr = distanceFromOrigin(pos);
-    if (rr > clusterRadius) {
-        clusterRadius = rr;
+    double newRadius = distanceFromOrigin(pos);
+    if (newRadius > clusterRadius) {
+        clusterRadius = newRadius;
         // this is how big addCircle is supposed to be:
         //   either 20% more than cluster radius, or at least 5 bigger.
         double check = clusterRadius * addRatio;
-        if (check < clusterRadius + 5)
+        if (check < clusterRadius + 5) {
             check = clusterRadius + 5;
+        }
+
         // if it is smaller then update everything...
         if (addCircle < check) {
             addCircle = check;
             killCircle = killRatio * addCircle;
-            updateViewSize();
         }
-        checkStop();
+
+        if (killCircle + 2 >= gridSize / 2) {
+            std::cerr << "Early Exit" << endl;
+            this->running = false;
+        }
     }
 }
 
 // make a random move of the last particle in the particleList
 void DLASystem::moveLastParticle() {
-    int rr = rgen.randomInt(4);  // pick a random number in the range 0-3, which direction do we hop?
+    int direction = rgen.randomInt(4);  // pick a random number in the range 0-3, which direction do we hop?
     double newpos[2];
 
-    Particle *lastP = particleList[numParticles - 1];
+    Particle *lastP = particleList[this->particleList.size() - 1];
 
-    setPosNeighbour(newpos, lastP->pos, rr);
+    setPosNeighbour(newpos, lastP->pos, direction);
 
     if (distanceFromOrigin(newpos) > killCircle) {
-        //cout << "#deleting particle" << endl;
         setGrid(lastP->pos, 0);
         particleList.pop_back();  // remove particle from particleList
-        numParticles--;
         setParticleInactive();
-    }
-        // check if destination is empty
-    else if (readGrid(newpos) == 0) {
+    } else if (readGrid(newpos) == 0) {
         setGrid(lastP->pos, 0);  // set the old grid site to empty
         // update the position
-        particleList[numParticles - 1]->pos[0] = newpos[0];
-        particleList[numParticles - 1]->pos[1] = newpos[1];
+        particleList[this->particleList.size() - 1]->pos[0] = newpos[0];
+        particleList[this->particleList.size() - 1]->pos[1] = newpos[1];
         setGrid(lastP->pos, 1);  // set the new grid site to be occupied
 
         // check if we stick
-        if (checkStick()) {
-            //cout << "stick" << endl;
+        if (checkStick() && this->rgen.random01() <= this->stickProbability) {
+            this->csv_out << frame << "," << lastP->pos[0] << "," << lastP->pos[1] << endl;
             setParticleInactive();  // make the particle inactive (stuck)
             updateClusterRadius(lastP->pos);  // update the cluster radius, addCircle, etc.
-
-            if (numParticles % 100 == 0 && logfile.is_open()) {
-                logfile << numParticles << " " << clusterRadius << endl;
-            }
         }
-    } else {
-        // if we get to here then we are trying to move to an occupied site
-        // (this should never happen as long as the sticking probability is 1.0)
-        cout << "reject " << rr << endl;
-        cout << lastP->pos[0] << " " << lastP->pos[1] << endl;
-        //cout << newpos[0] << " " << newpos[1] << " " << (int)newpos[0] << endl;
-        //printOccupied();
     }
 }
 
 // check if the last particle should stick (to a neighbour)
 int DLASystem::checkStick() {
-    Particle *lastP = particleList[numParticles - 1];
+    Particle *lastP = particleList[this->particleList.size() - 1];
     int result = 0;
     // loop over neighbours
     for (int i = 0; i < 4; i++) {
@@ -227,31 +193,28 @@ int DLASystem::checkStick() {
 
 
 // constructor
-DLASystem::DLASystem() {
+DLASystem::DLASystem(Config config)
+        : stickProbability(config.stickProbability), csv_out(std::move(config.csv)), endNum(config.maxParticles) {
     cout << "creating system, gridSize " << gridSize << endl;
-    numParticles = 0;
-    endNum = 1000;
+    rgen.setSeed(config.seed);
 
     // allocate memory for the grid, remember to free the memory in destructor
     grid = new int *[gridSize];
     for (int i = 0; i < gridSize; i++) {
         grid[i] = new int[gridSize];
     }
-    slowNotFast = 1;
+
     // reset initial parameters
     Reset();
 
+    this->csv_out << 0 << "," << 0 << "," << 0 << std::endl;
+
     addRatio = 1.2;   // how much bigger the addCircle should be, compared to cluster radius
     killRatio = 1.7;   // how much bigger is the killCircle, compared to the addCircle
-
-    // this opens a logfile, if we want to...
-    //logfile.open("opfile.txt");
 }
 
 // destructor
 DLASystem::~DLASystem() {
-    // strictly we should not print inside the destructor but never mind...
-    cout << "deleting system" << endl;
     // delete the particles
     clearParticles();
     // delete the grid
@@ -259,6 +222,9 @@ DLASystem::~DLASystem() {
         delete[] grid[i];
     delete[] grid;
 
-    if (logfile.is_open())
-        logfile.close();
+    csv_out.flush();
+
+    if (csv_out.is_open()) {
+        csv_out.close();
+    }
 }

DLASystem.h

@@ -15,15 +15,20 @@
 #include "Particle.h"
 #include "rnd.h"
 
-using namespace std;
-
+class Config {
+public:
+    int seed;
+    double stickProbability;
+    std::ofstream csv;
+    int maxParticles;
+    Config(int argc, char **argv);
+};
 
 class DLASystem {
 private:
     // these are private variables and functions that the user will not see
     // list of particles
-    vector<Particle *> particleList;
-    int numParticles;
+    std::vector<Particle *> particleList;
 
     // delete particles and clear the particle list
     void clearParticles();
@@ -34,19 +39,17 @@ private:
     double addCircle;
     double killCircle;
 
+    double stickProbability;
+
     // size of grid
     static const int gridSize = 1600;
     int **grid;  // this will be a 2d array that stores whether each site is occupied
 
-    // the window draws only part of the grid, viewSize controls how much...
-    double viewSize;
-    double drawScale;
-
     // random number generator, class name is rnd, instance is rgen
     rnd rgen;
 
     // output file (not used at the moment)
-    ofstream logfile;
+    std::ofstream csv_out;
 
     // number of particles at which the simulation will stop
     // (the value is set in constructor)
@@ -56,6 +59,7 @@ private:
     double addRatio;    // how much bigger the addCircle should be, compared to cluster radius
     double killRatio;   // how much bigger is the killCircle, compared to the addCircle
 
+    int frame;
 
 public:
     // these are public variables and functions
@@ -65,16 +69,13 @@ public:
     void Update();
 
     // is the simulation running (1) or paused (0) ?
-    int running;
-
-    // slowNotFast is +1 for slow running, 0 for fast
-    int slowNotFast;
+    bool running;
 
     // lastParticleIsActive is +1 if there is an active particle in the system, otherwise 0
     int lastParticleIsActive;
 
     // constructor
-    DLASystem();
+    DLASystem(Config config);
 
     // destructor
     ~DLASystem();
@@ -85,34 +86,9 @@ public:
     // this sets the seed for the random numbers
     void setSeed(int s) { rgen.setSeed(s); }
 
-    // check whether we should stop (eg the cluster has reached the edge of the grid)
-    int checkStop();
+    void setRunning() { running = true; }
 
-    // stop/start the algorithm
-    void setRunning() { if (checkStop() == true) running = 1; }
-
-    void pauseRunning() { running = 0; }
-
-    // set whether it runs fast or slow
-    void setSlow() { slowNotFast = 1; }
-
-    void setFast() { slowNotFast = 0; }
-
-    void setSuperFast() { slowNotFast = -1; }
-
-    // set which part of the grid is visible on the screen
-    // basically the screen shows co-ordinates -vv < x < vv
-    // where vv is the input value
-    void setViewSize(double vv) {
-        viewSize = vv;
-        drawScale = 2.0 / viewSize;
-    }
-
-    // if the killcircle is almost as big as the view then increase the view
-    void updateViewSize();
-
-    // set the view to be the approx size of the addCircle
-    void viewAddCircle();
+    void pauseRunning() { running = false; }
 
     // if pos is outside the cluster radius then set clusterRadius to be the distance to pos.
     void updateClusterRadius(double pos[]);

Makefile

@@ -10,7 +10,7 @@
 
 CXX     = clang++
 
-CXXFLAGS = -Wall -Wextra -g -O0 
+CXXFLAGS = -Wall -Wextra -g -O0 -std=c++20 -stdlib=libc++
 
 IFLAGS = -I/usr/local/include -I/usr/include
 

harness.bash

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+parallel "../run {1} {2} {3}" ::: $(seq 0 10) ::: $(seq 0 0.05 1) ::: 1000

mainDLA.cpp

@@ -6,18 +6,41 @@
 
 #include "DLASystem.h"
 
+using std::cout;
+using std::endl;
+
 // this is a global pointer, which is how we access the system itself
 DLASystem *sys;
 
-int main(int argc, char **argv) {
-    // create the system
-    sys = new DLASystem();
+Config::Config(int argc, char **argv) {
+    if (argc != 4) {
+        exit(1);
+    } else {
+        this->seed = std::stoi(argv[1]);
+        this->stickProbability = std::stod(argv[2]);
+        this->maxParticles = std::stoi(argv[3]);
 
-    // this is the seed for the random numbers
-    int seed = 6;
-    cout << "setting seed " << seed << endl;
-    sys->setSeed(seed);
-    sys->running = true;
+        if (stickProbability <= 0 || stickProbability > 1) {
+            exit(1);
+        }
+
+        std::stringstream str;
+        // Ensure the output file name contains all information required to replicate data
+        str << "./out-" << seed << '-' << stickProbability << "-" << maxParticles << ".csv";
+        std::ofstream csv_out(str.str());
+        this->csv = std::move(csv_out);
+
+        this->csv << "frame" << "," << "x" << "," << "y" << std::endl;
+    }
+}
+
+int main(int argc, char **argv) {
+    Config config(argc, argv);
+    cout << "Seed: " << config.seed << ", Stick P: " << config.stickProbability << endl;
+
+    // create the system
+    sys = new DLASystem(std::move(config));
+    sys->setRunning();
 
     /*
      * NOTE: We run at max speed as rendering is handled by a different engine so we simply want to hjand
@@ -26,5 +49,7 @@ int main(int argc, char **argv) {
         sys->Update();
     }
 
+    cout << "hey" << endl;
+
     return 0;
 }