Updated classdesc to tip of return-restprocess-object-refactor

Makefile

@@ -190,11 +190,11 @@ lib/libecolab$(ECOLIBS_EXT).a: $(OBJS) $(LIBMODS)
 # build graphcode objects
 	-cd graphcode; $(GRAPHCODE_MAKE) libgraphcode.a
 	-cp -f graphcode/*.h include
-	ar r $@ $^
+	ar r $@ $^ graphcode/*.o
 ifeq ($(OS),Darwin)
 	ranlib $@
 endif
-	$(CPLUSPLUS) -shared -Wl,-soname,libecolab$(ECOLIBS_EXT).so.$(SOVERSION)  $^ -o lib/libecolab$(ECOLIBS_EXT).so.$(SOVERSION)
+	$(CPLUSPLUS) -shared -Wl,-soname,libecolab$(ECOLIBS_EXT).so.$(SOVERSION)  $^ graphcode/*.o $(LIBS) -o lib/libecolab$(ECOLIBS_EXT).so.$(SOVERSION)
 	cd lib; ln -sf libecolab$(ECOLIBS_EXT).so.$(SOVERSION) libecolab$(ECOLIBS_EXT).so
 	cd lib; ln -sf libecolab$(ECOLIBS_EXT).so.$(SOVERSION) ecolab$(ECOLIBS_EXT).so
 

include/ecolab_epilogue.h

@@ -13,5 +13,4 @@ Put this after including all .cd files
 */
 #include "classdesc_epilogue.h"
 #ifdef GRAPHCODE_H
-#include "graphcode.cd"
 #endif

models/ecolab_model.cc

@@ -26,6 +26,8 @@ using array_ns::pcoord;
 
 #include "ecolab_epilogue.h"
 
+using namespace classdesc;
+
 // TODO - move this into main library
 namespace
 {
@@ -78,7 +80,6 @@ void ModelData::random_interaction(unsigned conn, double sigma)
 
 void PanmicticModel::generate(unsigned niter)
 {
-  //parallel(args);
   if (tstep==0) makeConsistent();
   EcolabPoint::generate(niter,*this);
   tstep+=niter;
@@ -390,3 +391,30 @@ bool ConnectionPlot::redraw(int x0, int y0, int width, int height)
   return true;
 }
 
+void SpatialModel::setGrid(size_t nx, size_t ny)
+{
+  numX=nx; numY=ny;
+  for (size_t i=0; i<numX; ++i)
+    for (size_t j=0; j<numY; ++j)
+      insertObject(makeId(i,j));
+}
+
+void SpatialModel::generate(unsigned niter)
+{
+  if (tstep==0) makeConsistent();
+  for (auto& i: *this) i->as<EcoLabCell>()->generate(niter,*this);
+  tstep+=niter;
+}
+
+void SpatialModel::makeConsistent()
+{
+  // all cells must have same number of species. Pack out with zero density if necessary
+  unsigned long nsp=0;
+  for (auto& i: *this) nsp=max(nsp,i->as<EcoLabCell>()->density.size());
+#ifdef MPI_SUPPORT
+  MPI_AllReduce(MPI_IN_PLACE,&nsp,1,MPI_UNSIGNED_LONG,MPI_MAX,MPI_COMM_WORLD);
+#endif
+  for (auto& i: *this)
+    i->as<EcoLabCell>()->density<<=array<int>(nsp-i->as<EcoLabCell>()->density.size(),0);
+  ModelData::makeConsistent(nsp);
+}

models/ecolab_model.h

@@ -80,7 +80,20 @@ struct PanmicticModel: public ModelData, public EcolabPoint
 
 struct EcoLabCell: public EcolabPoint, public graphcode::Object<EcoLabCell> {};
 
-struct SpatialModel: public ModelData, public graphcode::Graph<EcoLabCell>
+class SpatialModel: public ModelData, public graphcode::Graph<EcoLabCell>
 {
+  size_t numX=1, numY=1;
+public:
+  size_t makeId(size_t x, size_t y) const {return x%numX + numX*(y%numY);}
+  void setGrid(size_t nx, size_t ny);
+  graphcode::ObjectPtr<EcoLabCell> cell(size_t x, size_t y) {
+    return objects[makeId(x,y)];
+  }
+  void makeConsistent();
+  void generate(unsigned niter);
+  void generate() {generate(1);}
+//  void condense();
+//  void mutate();
+//  void migrate();
 };
 

models/spatial_ecolab.py

@@ -0,0 +1,52 @@
+from ecolab_model import spatial_ecolab as ecolab
+from random import random
+# initial number of species
+nsp=100
+
+ecolab.repro_min(-0.1)
+ecolab.repro_max(0.1)
+ecolab.odiag_min(-1e-5)
+ecolab.odiag_max(1e-5)
+#ecolab.mut_max(1e-4)
+ecolab.mut_max(1e-3)
+ecolab.sp_sep(0.1)
+
+def randomList(num, min, max):
+    return [random()*(max-min)+min for i in range(num)]
+
+ecolab.species(range(nsp))
+
+numX=2
+numY=2
+ecolab.setGrid(numX,numY)
+ecolab.partitionObjects()
+for i in range(numX):
+    for j in range(numY):
+        ecolab.cell(i,j).density(nsp*[100])
+
+ecolab.repro_rate(randomList(nsp, ecolab.repro_min(), ecolab.repro_max()))
+ecolab.interaction.diag(randomList(nsp, -1e-3, -1e-3))
+ecolab.random_interaction(3,0)
+
+ecolab.interaction.val(randomList(len(ecolab.interaction.val), ecolab.odiag_min(), ecolab.odiag_max()))
+
+ecolab.mutation(nsp*[ecolab.mut_max()])
+ecolab.migration(nsp*[1e-5])
+
+from plot import plot
+
+def step():
+    ecolab.generate()
+    #    ecolab.mutate()
+    #    ecolab.condense()
+    nsp=len(ecolab.species)
+    statusBar.configure(text=f't={ecolab.tstep()} nsp:{nsp}')
+    #    plot('No. species',ecolab.tstep(),nsp)
+    for i in range(numX):
+        for j in range(numY):
+            plot(f'Density({i},{j}',ecolab.tstep(),ecolab.cell(i,j).density()._properties, pens=ecolab.species()._properties)
+
+gui(step)
+
+
+

src/cairoSurfaceImage.cc

@@ -89,7 +89,8 @@ namespace
           if (r==registries().end() || !r->second) throw std::runtime_error("Module: "+module+" not found");
           auto rp=r->second->find(object);
           if (rp==r->second->end()) throw std::runtime_error("Object: "+object+" not found in "+module);
-          if (CairoSurface* csurf=dynamic_cast<CairoSurface*>(rp->second->getClassdescObject()))
+          if (CairoSurface* csurf=
+              dynamic_cast<CairoSurface*>(const_cast<classdesc::object*>(rp->second->getClassdescObject())))
             {
               *masterData=new CD(0,master,*csurf);
               Tk_ImageChanged(master,0,0,500,500,500,500);