Skip to content

Commit

Permalink
All python tests pass.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Robadob
Robadob committed Oct 12, 2023
1 parent e314d17 commit a0b807c
Showing 1 changed file with 20 additions and 20 deletions.
40 changes: 20 additions & 20 deletions tests/python/runtime/environment/test_environment_directed_graph.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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);

Expand Down Expand Up @@ -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<id_t>("vertex_id", graph.getVertexID(FLAMEGPU->getID() - 1));
FLAMEGPU->setVariable<flamegpu::id_t>("vertex_id", graph.getVertexID(FLAMEGPU->getID() - 1));
FLAMEGPU->setVariable<float>("vertex_float", graph.getVertexProperty<float>("vertex_float", FLAMEGPU->getID() - 1));
FLAMEGPU->setVariable<double, 2>("vertex_double2", 0, graph.getVertexProperty<double, 2>("vertex_double2", FLAMEGPU->getID() - 1, 0));
FLAMEGPU->setVariable<double, 2>("vertex_double2", 1, graph.getVertexProperty<double, 2>("vertex_double2", FLAMEGPU->getID() - 1, 1));
// vertex_int3, device full array access not available, so skipped
}
FLAMEGPU->setVariable<id_t>("edge_source", graph.getVertexID(graph.getEdgeSource(FLAMEGPU->getID() - 1))); // Method returns index, convert back to ID
FLAMEGPU->setVariable<id_t>("edge_dest", graph.getVertexID(graph.getEdgeDestination(FLAMEGPU->getID() - 1))); // Method returns index, convert back to ID
FLAMEGPU->setVariable<flamegpu::id_t>("edge_source", graph.getVertexID(graph.getEdgeSource(FLAMEGPU->getID() - 1))); // Method returns index, convert back to ID
FLAMEGPU->setVariable<flamegpu::id_t>("edge_dest", graph.getVertexID(graph.getEdgeDestination(FLAMEGPU->getID() - 1))); // Method returns index, convert back to ID
FLAMEGPU->setVariable<int>("edge_int", graph.getEdgeProperty<int>("edge_int", FLAMEGPU->getID() - 1));
FLAMEGPU->setVariable<double, 2>("edge_double2", 0, graph.getEdgeProperty<double, 2>("edge_double2", FLAMEGPU->getID() - 1, 0));
FLAMEGPU->setVariable<double, 2>("edge_double2", 1, graph.getEdgeProperty<double, 2>("edge_double2", FLAMEGPU->getID() - 1, 1));
Expand All @@ -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<id_t>("vertex_id", graph.getVertexID(FLAMEGPU->getID() - 1));
FLAMEGPU->setVariable<flamegpu::id_t>("vertex_id", graph.getVertexID(FLAMEGPU->getID() - 1));
FLAMEGPU->setVariable<float>("vertex_float", graph.getVertexProperty<float>("vertex_float", FLAMEGPU->getID() - 1));
FLAMEGPU->setVariable<double, 2>("vertex_double2", 0, graph.getVertexProperty<double, 2>("vertex_double2", FLAMEGPU->getID() - 1, 0));
FLAMEGPU->setVariable<double, 2>("vertex_double2", 1, graph.getVertexProperty<double, 2>("vertex_double2", FLAMEGPU->getID() - 1, 1));
// vertex_int3, device full array access not available, so skipped
}
FLAMEGPU->setVariable<id_t>("edge_source", graph.getVertexID(graph.getEdgeSource(FLAMEGPU->getID() - 1))); // Method returns index, convert back to ID
FLAMEGPU->setVariable<id_t>("edge_dest", graph.getVertexID(graph.getEdgeDestination(FLAMEGPU->getID() - 1))); // Method returns index, convert back to ID
FLAMEGPU->setVariable<flamegpu::id_t>("edge_source", graph.getVertexID(graph.getEdgeSource(FLAMEGPU->getID() - 1))); // Method returns index, convert back to ID
FLAMEGPU->setVariable<flamegpu::id_t>("edge_dest", graph.getVertexID(graph.getEdgeDestination(FLAMEGPU->getID() - 1))); // Method returns index, convert back to ID
FLAMEGPU->setVariable<int>("edge_int", graph.getEdgeProperty<int>("edge_int", FLAMEGPU->getID() - 1));
FLAMEGPU->setVariable<double, 2>("edge_double2", 0, graph.getEdgeProperty<double, 2>("edge_double2", FLAMEGPU->getID() - 1, 0));
FLAMEGPU->setVariable<double, 2>("edge_double2", 1, graph.getEdgeProperty<double, 2>("edge_double2", FLAMEGPU->getID() - 1, 1));
Expand Down

0 comments on commit a0b807c

Please sign in to comment.