Skip to content

Commit 6d0c0a5

Browse files
committed
Fix port caching with dynamic ports
1 parent b127614 commit 6d0c0a5

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

src/Dataflow/Network/Module.cc

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,10 +240,9 @@ DatatypeHandleOption Module::get_input_handle(const PortId& id)
240240
}
241241

242242
auto data = port->getData();
243-
//if (!inputsChanged_)
244243
{
245244
LOG_DEBUG(id_ << " :: inputsChanged is " << inputsChanged_ << ", querying port for value.");
246-
inputsChanged_ = port->hasChanged();
245+
inputsChanged_ = inputsChanged_ || port->hasChanged();
247246
LOG_DEBUG(id_ << ":: inputsChanged is now " << inputsChanged_);
248247
}
249248
return data;
@@ -260,6 +259,11 @@ std::vector<DatatypeHandleOption> Module::get_dynamic_input_handles(const PortId
260259
std::vector<DatatypeHandleOption> options;
261260
auto getData = [](InputPortHandle input) { return input->getData(); };
262261
std::transform(portsWithName.begin(), portsWithName.end(), std::back_inserter(options), getData);
262+
{
263+
LOG_DEBUG(id_ << " :: inputsChanged is " << inputsChanged_ << ", querying port for value.");
264+
inputsChanged_ = inputsChanged_ || std::any_of(portsWithName.begin(), portsWithName.end(), [](InputPortHandle input) { return input->hasChanged(); });
265+
LOG_DEBUG(id_ << ":: inputsChanged is now " << inputsChanged_);
266+
}
263267
return options;
264268
}
265269

src/ExampleNets/regression/SetConductivitiesToTetMesh.srn5

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@
254254
<name>InternalAir</name>
255255
<value>
256256
<which>1</which>
257-
<value>9.9999999999999995e-07</value>
257+
<value>9.9999999999999995e-007</value>
258258
</value>
259259
</second>
260260
</item>
@@ -366,7 +366,7 @@
366366
<name>InternalAir</name>
367367
<value>
368368
<which>1</which>
369-
<value>9.9999999999999995e-07</value>
369+
<value>9.9999999999999995e-007</value>
370370
</value>
371371
</second>
372372
</item>
@@ -478,7 +478,7 @@
478478
<name>InternalAir</name>
479479
<value>
480480
<which>1</which>
481-
<value>9.9999999999999995e-07</value>
481+
<value>9.9999999999999995e-007</value>
482482
</value>
483483
</second>
484484
</item>

0 commit comments

Comments
 (0)