From a0b807c4205c3ee9996ab4b98264d094fd97e91f Mon Sep 17 00:00:00 2001 From: Robert Chisholm Date: Thu, 12 Oct 2023 13:34:18 +0100 Subject: [PATCH] All python tests pass. --- .../test_environment_directed_graph.py | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/tests/python/runtime/environment/test_environment_directed_graph.py b/tests/python/runtime/environment/test_environment_directed_graph.py index c7e20deeb..2254f88ef 100644 --- a/tests/python/runtime/environment/test_environment_directed_graph.py +++ b/tests/python/runtime/environment/test_environment_directed_graph.py @@ -389,14 +389,14 @@ def run(self, FLAMEGPU): agent = FLAMEGPU.agent("agent").getPopulationData(); for i in range(20): if i < 10: - assert agent[i].getVariableID("vertex_id") == i; - assert agent[i].getVariableFloat("vertex_float") == i; - assert agent[i].getVariableArrayDouble("vertex_double2") == (i + 11, i + 21); - assert agent[i].getVariableID("edge_dest") == (i + 2) % 10; + assert agent[i].getVariableID("vertex_id") == i + 1; + assert agent[i].getVariableFloat("vertex_float") == i+ 1; + assert agent[i].getVariableArrayDouble("vertex_double2") == (i + 12, i + 22); + assert agent[i].getVariableID("edge_dest") == ((i + 2) % 10) + 1; else: - assert agent[i].getVariableID("edge_dest") == (i + 6) % 10; + assert agent[i].getVariableID("edge_dest") == ((i + 6) % 10) + 1; # Edges - assert agent[i].getVariableID("edge_source") == int(i / 2); + assert agent[i].getVariableID("edge_source") == int(i / 2) + 1; assert agent[i].getVariableInt("edge_int") == i + 70; assert agent[i].getVariableArrayDouble("edge_double2") == (i + 61, i + 51); @@ -405,14 +405,14 @@ def run(self, FLAMEGPU): agent = FLAMEGPU.agent("agent").getPopulationData(); for i in range(60): if i < 30: - assert agent[i].getVariableID("vertex_id") == i; - assert agent[i].getVariableFloat("vertex_float") == i; - assert agent[i].getVariableArrayDouble("vertex_double2") == (i + 11, i + 21); - assert agent[i].getVariableID("edge_dest") == (i + 2) % 30; + assert agent[i].getVariableID("vertex_id") == i + 1; + assert agent[i].getVariableFloat("vertex_float") == i + 1; + assert agent[i].getVariableArrayDouble("vertex_double2") == (i + 12, i + 22); + assert agent[i].getVariableID("edge_dest") == ((i + 2) % 30) + 1; else: - assert agent[i].getVariableID("edge_dest") == (i + 18) % 30; + assert agent[i].getVariableID("edge_dest") == ((i + 18) % 30) + 1; # Edges - assert agent[i].getVariableID("edge_source") == int(i / 2); + assert agent[i].getVariableID("edge_source") == int(i / 2) + 1; assert agent[i].getVariableInt("edge_int") == i + 70; assert agent[i].getVariableArrayDouble("edge_double2") == (i + 61, i + 51); @@ -524,16 +524,16 @@ def test_HostException(self): CopyGraphToAgent1_func = """ FLAMEGPU_AGENT_FUNCTION(CopyGraphToAgent1, flamegpu::MessageNone, flamegpu::MessageNone) { if (FLAMEGPU->getID() <= 20) { - DeviceEnvironmentDirectedGraph graph = FLAMEGPU->environment.getDirectedGraph("graph"); + flamegpu::DeviceEnvironmentDirectedGraph graph = FLAMEGPU->environment.getDirectedGraph("graph"); if (FLAMEGPU->getID() <= 10) { - FLAMEGPU->setVariable("vertex_id", graph.getVertexID(FLAMEGPU->getID() - 1)); + FLAMEGPU->setVariable("vertex_id", graph.getVertexID(FLAMEGPU->getID() - 1)); FLAMEGPU->setVariable("vertex_float", graph.getVertexProperty("vertex_float", FLAMEGPU->getID() - 1)); FLAMEGPU->setVariable("vertex_double2", 0, graph.getVertexProperty("vertex_double2", FLAMEGPU->getID() - 1, 0)); FLAMEGPU->setVariable("vertex_double2", 1, graph.getVertexProperty("vertex_double2", FLAMEGPU->getID() - 1, 1)); // vertex_int3, device full array access not available, so skipped } - FLAMEGPU->setVariable("edge_source", graph.getVertexID(graph.getEdgeSource(FLAMEGPU->getID() - 1))); // Method returns index, convert back to ID - FLAMEGPU->setVariable("edge_dest", graph.getVertexID(graph.getEdgeDestination(FLAMEGPU->getID() - 1))); // Method returns index, convert back to ID + FLAMEGPU->setVariable("edge_source", graph.getVertexID(graph.getEdgeSource(FLAMEGPU->getID() - 1))); // Method returns index, convert back to ID + FLAMEGPU->setVariable("edge_dest", graph.getVertexID(graph.getEdgeDestination(FLAMEGPU->getID() - 1))); // Method returns index, convert back to ID FLAMEGPU->setVariable("edge_int", graph.getEdgeProperty("edge_int", FLAMEGPU->getID() - 1)); FLAMEGPU->setVariable("edge_double2", 0, graph.getEdgeProperty("edge_double2", FLAMEGPU->getID() - 1, 0)); FLAMEGPU->setVariable("edge_double2", 1, graph.getEdgeProperty("edge_double2", FLAMEGPU->getID() - 1, 1)); @@ -546,16 +546,16 @@ def test_HostException(self): CopyGraphToAgent3_func = """ FLAMEGPU_AGENT_FUNCTION(CopyGraphToAgent3, flamegpu::MessageNone, flamegpu::MessageNone) { if (FLAMEGPU->getID() <= 60) { - DeviceEnvironmentDirectedGraph graph = FLAMEGPU->environment.getDirectedGraph("graph"); + flamegpu::DeviceEnvironmentDirectedGraph graph = FLAMEGPU->environment.getDirectedGraph("graph"); if (FLAMEGPU->getID() <= 30) { - FLAMEGPU->setVariable("vertex_id", graph.getVertexID(FLAMEGPU->getID() - 1)); + FLAMEGPU->setVariable("vertex_id", graph.getVertexID(FLAMEGPU->getID() - 1)); FLAMEGPU->setVariable("vertex_float", graph.getVertexProperty("vertex_float", FLAMEGPU->getID() - 1)); FLAMEGPU->setVariable("vertex_double2", 0, graph.getVertexProperty("vertex_double2", FLAMEGPU->getID() - 1, 0)); FLAMEGPU->setVariable("vertex_double2", 1, graph.getVertexProperty("vertex_double2", FLAMEGPU->getID() - 1, 1)); // vertex_int3, device full array access not available, so skipped } - FLAMEGPU->setVariable("edge_source", graph.getVertexID(graph.getEdgeSource(FLAMEGPU->getID() - 1))); // Method returns index, convert back to ID - FLAMEGPU->setVariable("edge_dest", graph.getVertexID(graph.getEdgeDestination(FLAMEGPU->getID() - 1))); // Method returns index, convert back to ID + FLAMEGPU->setVariable("edge_source", graph.getVertexID(graph.getEdgeSource(FLAMEGPU->getID() - 1))); // Method returns index, convert back to ID + FLAMEGPU->setVariable("edge_dest", graph.getVertexID(graph.getEdgeDestination(FLAMEGPU->getID() - 1))); // Method returns index, convert back to ID FLAMEGPU->setVariable("edge_int", graph.getEdgeProperty("edge_int", FLAMEGPU->getID() - 1)); FLAMEGPU->setVariable("edge_double2", 0, graph.getEdgeProperty("edge_double2", FLAMEGPU->getID() - 1, 0)); FLAMEGPU->setVariable("edge_double2", 1, graph.getEdgeProperty("edge_double2", FLAMEGPU->getID() - 1, 1));