@@ -70,7 +70,7 @@ namespace MathDAG
7070 }
7171 else
7272 {
73- result=minsky::minsky (). variableValues . addTempVar ( );
73+ result=VariableValuePtr (VariableType::tempFlow );
7474 result->allocValue ();
7575 }
7676 result->init (value);
@@ -155,7 +155,7 @@ namespace MathDAG
155155 result=r;
156156 else
157157 {
158- result=minsky::minsky (). variableValues . addTempVar ( );
158+ result=VariableValuePtr (VariableType::tempFlow );
159159 result->allocValue ();
160160 }
161161 if (rhs)
@@ -295,7 +295,7 @@ namespace MathDAG
295295 else if (argIdx[1 ].size ()>1 )
296296 {
297297 // multiple wires to second input port
298- const VariableValuePtr tmp= minsky::minsky (). variableValues . addTempVar ( );
298+ const VariableValuePtr tmp (VariableType::tempFlow );
299299 tmp->hypercube (r->hypercube ());
300300 size_t i=0 ;
301301 if (accum==OperationType::add)
@@ -324,7 +324,7 @@ namespace MathDAG
324324 result=r;
325325 else
326326 {
327- result=minsky::minsky (). variableValues . addTempVar ( );
327+ result=VariableValuePtr (VariableType::tempFlow );
328328 result->allocValue ();
329329 }
330330 if (tensorEval () && addTensorOp (result, *this , ev))
@@ -340,7 +340,7 @@ namespace MathDAG
340340 argIdx[i].push_back (arguments[i][j]->addEvalOps (ev));
341341 else
342342 {
343- argIdx[i].push_back ( minsky::minsky (). variableValues . addTempVar () );
343+ argIdx[i].emplace_back (VariableType::tempFlow );
344344 argIdx[i].back ()->allocValue ();
345345 }
346346
@@ -380,7 +380,7 @@ namespace MathDAG
380380 for (size_t i=0 ; i<arguments.size (); ++i)
381381 if (arguments[i].empty ())
382382 {
383- argIdx[i].push_back ( minsky::minsky (). variableValues . addTempVar () );
383+ argIdx[i].emplace_back (VariableType::tempFlow );
384384 argIdx[i].back ()->allocValue ();
385385 // ensure units are compatible (as we're doing comparisons with zero)
386386 if (i>0 )
@@ -394,7 +394,7 @@ namespace MathDAG
394394 for (size_t i=0 ; i<arguments.size (); ++i)
395395 if (arguments[i].empty ())
396396 {
397- argIdx[i].push_back ( minsky::minsky (). variableValues . addTempVar () );
397+ argIdx[i].emplace_back (VariableType::tempFlow );
398398 argIdx[i].back ()->allocValue ();
399399 }
400400 ev.push_back (EvalOpPtr (type (), state, result, *argIdx[0 ][0 ], *argIdx[1 ][0 ]));
@@ -802,7 +802,7 @@ namespace MathDAG
802802 result=r;
803803 else
804804 {
805- result=minsky::minsky (). variableValues . addTempVar ( );
805+ result=VariableValuePtr (VariableType::tempFlow );
806806 result->allocValue ();
807807 }
808808 }
0 commit comments