Skip to content

Commit db95088

Browse files
committed
Update STDP Requested Changes
1 parent 02f0132 commit db95088

File tree

4 files changed

+5
-9
lines changed

4 files changed

+5
-9
lines changed

Simulator/Connections/Connections.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,6 @@ Connections::Connections()
4444
function<void()> regGraphPropsFunc = bind(&Connections::registerGraphProperties, this);
4545
opsManager.registerOperation(Operations::registerGraphProperties, regGraphPropsFunc);
4646

47-
OperationManager::getInstance().registerOperation(Operations::registerGraphProperties,
48-
regGraphPropsFunc);
49-
5047
// Get a copy of the file logger to use log4cplus macros
5148
fileLogger_ = log4cplus::Logger::getInstance(LOG4CPLUS_TEXT("file"));
5249
edgeLogger_ = log4cplus::Logger::getInstance(LOG4CPLUS_TEXT("edge"));

Simulator/Connections/Neuro/ConnStatic.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ void ConnStatic::registerGraphProperties()
8383
/// @brief Loads parameters related to connections
8484
void ConnStatic::loadParameters()
8585
{
86-
GraphManager<NeuralVertexProperties> &gm = GraphManager<NeuralVertexProperties>::getInstance();
8786
}
8887

8988
/// @brief Prints the parameters of the connection

configfiles/graphs/test-tiny.graphml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,16 @@
3131
<data key="type">EXC</data>
3232
</node>
3333
<edge id="e1" source="0" target="1">
34-
<data key="weight">0.5</data>
34+
<data key="weight">5.0e-9</data>
3535
</edge>
3636
<edge id="e2" source="1" target="2">
37-
<data key="weight">3.2</data>
37+
<data key="weight">-3.2e-8</data>
3838
</edge>
3939
<edge id="e3" source="2" target="3">
40-
<data key="weight">3.3</data>
40+
<data key="weight">3.3e-8</data>
4141
</edge>
4242
<edge id="e4" source="3" target="0">
43-
<data key="weight">6.4</data>
43+
<data key="weight">6.4e-8</data>
4444
</edge>
4545
</graph>
4646
</graphml>

docs/Developer/GraphAndEventInputs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ There are two main steps to implementing a graph representation of an NG911 netw
1111

1212
### GraphManager Class
1313

14-
The GraphManager is mainly a wrapper around the Boost Graph Library (BGL), but you do not need direct knowledge of Boost to use it. The BGL loads properties for the graph, vertices, and edges into user-defined structs. We have declared the `VertexProperties`, `NeuralEdgeProperties`, and `GraphProperties` structs in `Global.h` for this purpose. In the updated design, GraphManager is templated based on `VertexProperties`. The VertexProperties struct serves as a base struct, allowing for specialized inheritance by `NG911VertexProperties` and `NeuroVertexProperties`, enabling greater flexibility in managing different types of graphs. The GraphManager needs to convert each property into the right type and load them into the appropriate struct member variable. We tell GraphManager where to load the properties via the `registerProperty()` method and it infers the appropriate type. The registration of the Graph properties is being implemented as an OperationManager step that is called in the Driver class before reading the GraphML file, therefore classes that need to load graph properties are responsible for implementing the `registerGraphProperties()` method.
14+
The GraphManager is mainly a wrapper around the Boost Graph Library (BGL), but you do not need direct knowledge of Boost to use it. The BGL loads properties for the graph, vertices, and edges into user-defined structs. We have declared the `VertexProperties`, `NeuralEdgeProperties`, and `GraphProperties` structs in `Global.h` for this purpose. In the updated design, GraphManager is templated based on `VertexProperties`. The VertexProperties struct serves as a base struct, allowing for specialized inheritance by `NG911VertexProperties` and `NeuralVertexProperties`, enabling greater flexibility in managing different types of graphs. The GraphManager needs to convert each property into the right type and load them into the appropriate struct member variable. We tell GraphManager where to load the properties via the `registerProperty()` method and it infers the appropriate type. The registration of the Graph properties is being implemented as an OperationManager step that is called in the Driver class before reading the GraphML file, therefore classes that need to load graph properties are responsible for implementing the `registerGraphProperties()` method.
1515

1616
The following is the `Layout911` implementation:
1717

0 commit comments

Comments
 (0)