Rename resetInform -> accumulateInform

OpenMx · Apr 9, 2019 · bf3f57c · bf3f57c
1 parent 4db1688
commit bf3f57c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/Compute.cpp b/src/Compute.cpp
@@ -1778,7 +1778,7 @@ struct LeaveComputeWithVarGroup {
 
 	LeaveComputeWithVarGroup(FitContext *_fc, struct omxCompute *compute) : fc(_fc), name(compute->name) {
 		origInform = fc->getInform();
-		toResetInform = compute->resetInform();
+		toResetInform = compute->accumulateInform();
 		if (toResetInform) fc->setInform(INFORM_UNINITIALIZED);
 		if (Global->debugProtectStack) {
 			mxLog("enter %s: protect depth %d", name, Global->mpi->getDepth());
@@ -1956,7 +1956,7 @@ const double ComputeEM::MIDDLE_START = 0.105360515657826281366; // -log(.9) cons
 const double ComputeEM::MIDDLE_END = 0.001000500333583534363566; // -log(.999) constexpr
 
 struct ComputeSetOriginalStarts : public omxCompute {
-	virtual bool resetInform() { return false; };
+	virtual bool accumulateInform() { return false; };
         virtual void computeImpl(FitContext *fc);
 };
 
@@ -2131,7 +2131,7 @@ class ComputeCheckpoint : public omxCompute {
 	size_t numExtraCols;
 
  public:
-	virtual bool resetInform() { return false; };
+	virtual bool accumulateInform() { return false; };
         virtual void initFromFrontend(omxState *, SEXP rObj);
         virtual void computeImpl(FitContext *fc);
         virtual void reportResults(FitContext *fc, MxRList *slots, MxRList *out);
@@ -2169,6 +2169,7 @@ class ComputeBootstrap : public omxCompute {
  public:
 	ComputeBootstrap() : plan(0) {};
 	virtual ~ComputeBootstrap();
+	virtual bool accumulateInform() { return false; };
 	virtual void initFromFrontend(omxState *, SEXP rObj);
 	virtual void computeImpl(FitContext *fc);
 	virtual void collectResults(FitContext *fc, LocalComputeResult *lcr, MxRList *out);

diff --git a/src/Compute.h b/src/Compute.h
@@ -381,7 +381,7 @@ class omxCompute {
 	const char *name;
 	FreeVarGroup *varGroup;
 	omxCompute();
-	virtual bool resetInform() { return true; }; // rename to accumulateInform?
+	virtual bool accumulateInform() { return true; };
         virtual void initFromFrontend(omxState *, SEXP rObj);
         void compute(FitContext *fc);
 	void computeWithVarGroup(FitContext *fc);