Skip to content

Graph components, cost functions and Serialization #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ericklt merged 16 commits into from
Mar 3, 2018
Merged

Graph components, cost functions and Serialization #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
0cafe5c
Added card functionality with SpatialCard included
ericklt Feb 7, 2018
0ce26f8
A card may now access it's holder, and a simple test added
ericklt Feb 7, 2018
ac6aa81
Name refactoring: 'Card' -> 'Component'; Component controller refacto…
ericklt Feb 9, 2018
9a84da4
Further name refactoring and component names have been replaced by th…
ericklt Feb 9, 2018
75e82b6
Removed the need for a component controller, without having to make c…
ericklt Feb 11, 2018
fcb67fa
Added temporal Edge component and changed "setComponent" to "addCompo…
ericklt Feb 13, 2018
89cfa67
Now you can create an arbitrary cost function to use in an algorithm
ericklt Feb 14, 2018
8de46f0
Some name changes and the cost function usage is more intuitive
ericklt Feb 17, 2018
86fd32f
Added a cost function factory and the StepCostFunction
ericklt Feb 18, 2018
ef26b73
Changed the call of a cost function constructor to the factory creation
ericklt Feb 18, 2018
dd49ad1
Added storage option using java's Serializable
ericklt Feb 23, 2018
e1f84cd
Added Kryo serialization and the serialization test is now abstract
ericklt Feb 28, 2018
557e528
Some codacy improvements
ericklt Mar 2, 2018
ba80f4f
Minor improvements
ericklt Mar 2, 2018
ecf66e5
More minor improvements
ericklt Mar 2, 2018
fc4eb40
Added id to Edge, removed some of the Edge constructors to make thing…
ericklt Mar 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,17 @@
<version>0.46</version>
</dependency>


<dependency>
<groupId>com.esotericsoftware</groupId>
<artifactId>kryo</artifactId>
<version>4.0.1</version>
</dependency>

<dependency>
<groupId>de.javakaffee</groupId>
<artifactId>kryo-serializers</artifactId>
<version>0.41</version>
</dependency>

</dependencies>

Expand Down
Binary file added core/serialized_graphs/edges.bin
View file
Open in desktop
Binary file not shown.
Empty file added core/serialized_graphs/graph_components.bin
View file
Open in desktop
Empty file.
Binary file added core/serialized_graphs/nodes.bin
View file
Open in desktop
Binary file not shown.
Binary file added core/src/main/java/org/insightlab/graphast/MainClassDiagram.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
264 changes: 264 additions & 0 deletions core/src/main/java/org/insightlab/graphast/MainClassDiagram.ucls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,264 @@
<?xml version="1.0" encoding="UTF-8"?>
<class-diagram version="1.2.2" icons="true" automaticImage="PNG" always-add-relationships="false" generalizations="true"
realizations="true" associations="true" dependencies="false" nesting-relationships="true" router="FAN">
<class id="1" language="java" name="org.insightlab.graphast.structure.DefaultGraphStructure" project="core"
file="/core/src/main/java/org/insightlab/graphast/structure/DefaultGraphStructure.java" binary="false"
corner="BOTTOM_RIGHT">
<position height="-1" width="-1" x="114" y="224"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true">
<attributes public="true" package="true" protected="true" private="true" static="true"/>
<operations public="true" package="true" protected="true" private="true" static="true"/>
</display>
</class>
<interface id="2" language="java" name="org.insightlab.graphast.structure.GraphStructure" project="core"
file="/core/src/main/java/org/insightlab/graphast/structure/GraphStructure.java" binary="false"
corner="BOTTOM_RIGHT">
<position height="-1" width="-1" x="116" y="-150"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true">
<attributes public="true" package="true" protected="true" private="true" static="true"/>
<operations public="true" package="true" protected="true" private="true" static="true"/>
</display>
</interface>
<class id="3" language="java" name="org.insightlab.graphast.model.Graph" project="core"
file="/core/src/main/java/org/insightlab/graphast/model/Graph.java" binary="false" corner="BOTTOM_RIGHT">
<position height="-1" width="-1" x="418" y="-151"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true">
<attributes public="true" package="true" protected="true" private="true" static="true"/>
<operations public="true" package="true" protected="true" private="true" static="true"/>
</display>
</class>
<class id="4" language="java" name="org.insightlab.graphast.model.Edge" project="core"
file="/core/src/main/java/org/insightlab/graphast/model/Edge.java" binary="false" corner="BOTTOM_RIGHT">
<position height="-1" width="-1" x="118" y="758"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true">
<attributes public="true" package="true" protected="true" private="true" static="true"/>
<operations public="true" package="true" protected="true" private="true" static="true"/>
</display>
</class>
<class id="5" language="java" name="org.insightlab.graphast.model.Node" project="core"
file="/core/src/main/java/org/insightlab/graphast/model/Node.java" binary="false" corner="BOTTOM_RIGHT">
<position height="-1" width="-1" x="389" y="410"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true">
<attributes public="true" package="true" protected="true" private="true" static="true"/>
<operations public="true" package="true" protected="true" private="true" static="true"/>
</display>
</class>
<class id="6" language="java" name="org.insightlab.graphast.model.components.spatial_components.SpatialGraphComponent"
project="core"
file="/core/src/main/java/org/insightlab/graphast/model/components/spatial_components/SpatialGraphComponent.java"
binary="false" corner="BOTTOM_RIGHT">
<position height="-1" width="-1" x="729" y="224"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true">
<attributes public="true" package="true" protected="true" private="true" static="true"/>
<operations public="true" package="true" protected="true" private="true" static="true"/>
</display>
</class>
<class id="7" language="java" name="org.insightlab.graphast.model.components.spatial_components.SpatialNodeComponent"
project="core"
file="/core/src/main/java/org/insightlab/graphast/model/components/spatial_components/SpatialNodeComponent.java"
binary="false" corner="BOTTOM_RIGHT">
<position height="-1" width="-1" x="905" y="411"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true">
<attributes public="true" package="true" protected="true" private="true" static="true"/>
<operations public="true" package="true" protected="true" private="true" static="true"/>
</display>
</class>
<class id="8" language="java" name="org.insightlab.graphast.model.components.EdgeComponent" project="core"
file="/core/src/main/java/org/insightlab/graphast/model/components/EdgeComponent.java" binary="false"
corner="BOTTOM_RIGHT">
<position height="-1" width="-1" x="377" y="757"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true">
<attributes public="true" package="true" protected="true" private="true" static="true"/>
<operations public="true" package="true" protected="true" private="true" static="true"/>
</display>
</class>
<class id="9" language="java" name="org.insightlab.graphast.model.components.GraphComponent" project="core"
file="/core/src/main/java/org/insightlab/graphast/model/components/GraphComponent.java" binary="false"
corner="BOTTOM_RIGHT">
<position height="-1" width="-1" x="417" y="225"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true">
<attributes public="true" package="true" protected="true" private="true" static="true"/>
<operations public="true" package="true" protected="true" private="true" static="true"/>
</display>
</class>
<class id="10" language="java" name="org.insightlab.graphast.model.components.NodeComponent" project="core"
file="/core/src/main/java/org/insightlab/graphast/model/components/NodeComponent.java" binary="false"
corner="BOTTOM_RIGHT">
<position height="-1" width="-1" x="650" y="410"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true">
<attributes public="true" package="true" protected="true" private="true" static="true"/>
<operations public="true" package="true" protected="true" private="true" static="true"/>
</display>
</class>
<class id="11" language="java" name="org.insightlab.graphast.model.components.spatial_components.SpatialEdgeComponent"
project="core"
file="/core/src/main/java/org/insightlab/graphast/model/components/spatial_components/SpatialEdgeComponent.java"
binary="false" corner="BOTTOM_RIGHT">
<position height="-1" width="-1" x="607" y="754"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true">
<attributes public="true" package="true" protected="true" private="true" static="true"/>
<operations public="true" package="true" protected="true" private="true" static="true"/>
</display>
</class>
<class id="12" language="java" name="org.insightlab.graphast.model.components.spatial_components.Geometry"
project="core" file="/core/src/main/java/org/insightlab/graphast/model/components/spatial_components/Geometry.java"
binary="false" corner="BOTTOM_RIGHT">
<position height="-1" width="-1" x="894" y="754"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true">
<attributes public="true" package="true" protected="true" private="true" static="true"/>
<operations public="true" package="true" protected="true" private="true" static="true"/>
</display>
</class>
<class id="13" language="java" name="org.insightlab.graphast.model.components.spatial_components.Point" project="core"
file="/core/src/main/java/org/insightlab/graphast/model/components/spatial_components/Point.java" binary="false"
corner="BOTTOM_RIGHT">
<position height="-1" width="-1" x="1169" y="608"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true">
<attributes public="true" package="true" protected="true" private="true" static="true"/>
<operations public="true" package="true" protected="true" private="true" static="true"/>
</display>
</class>
<realization id="14">
<end type="SOURCE" refId="1"/>
<end type="TARGET" refId="2"/>
</realization>
<association id="15">
<end type="SOURCE" refId="11" navigable="false">
<attribute id="16" name="geometry">
<position height="0" width="0" x="0" y="0"/>
</attribute>
<multiplicity id="17" minimum="0" maximum="1">
<position height="0" width="0" x="0" y="0"/>
</multiplicity>
</end>
<end type="TARGET" refId="12" navigable="true"/>
<display labels="true" multiplicity="true"/>
</association>
<generalization id="18">
<end type="SOURCE" refId="7"/>
<end type="TARGET" refId="10"/>
</generalization>
<generalization id="19">
<end type="SOURCE" refId="11"/>
<end type="TARGET" refId="8"/>
</generalization>
<association id="20">
<end type="SOURCE" refId="9" navigable="false">
<attribute id="21" name="graph">
<position height="0" width="0" x="0" y="0"/>
</attribute>
<multiplicity id="22" minimum="0" maximum="1">
<position height="0" width="0" x="0" y="0"/>
</multiplicity>
</end>
<end type="TARGET" refId="3" navigable="true"/>
<display labels="true" multiplicity="true"/>
</association>
<association id="23">
<end type="SOURCE" refId="1" navigable="false">
<attribute id="24" name="edges">
<position height="0" width="0" x="0" y="0"/>
</attribute>
<multiplicity id="25" minimum="0" maximum="2147483647">
<position height="0" width="0" x="0" y="0"/>
</multiplicity>
</end>
<end type="TARGET" refId="4" navigable="true"/>
<display labels="true" multiplicity="true"/>
</association>
<association id="26">
<end type="SOURCE" refId="10" navigable="false">
<attribute id="27" name="node">
<position height="18" width="32" x="525" y="441"/>
</attribute>
<multiplicity id="28" minimum="0" maximum="1">
<position height="0" width="0" x="0" y="0"/>
</multiplicity>
</end>
<end type="TARGET" refId="5" navigable="true"/>
<display labels="true" multiplicity="true"/>
</association>
<association id="29">
<end type="SOURCE" refId="12" navigable="false">
<attribute id="30" name="points">
<position height="18" width="37" x="1005" y="656"/>
</attribute>
<multiplicity id="31" minimum="0" maximum="2147483647">
<position height="16" width="21" x="1027" y="691"/>
</multiplicity>
</end>
<end type="TARGET" refId="13" navigable="true"/>
<display labels="true" multiplicity="true"/>
</association>
<association id="32">
<end type="SOURCE" refId="1" navigable="false">
<attribute id="33" name="nodes">
<position height="0" width="0" x="0" y="0"/>
</attribute>
<multiplicity id="34" minimum="0" maximum="2147483647">
<position height="0" width="0" x="0" y="0"/>
</multiplicity>
</end>
<end type="TARGET" refId="5" navigable="true"/>
<display labels="true" multiplicity="true"/>
</association>
<association id="35">
<end type="SOURCE" refId="3" navigable="false">
<attribute id="36" name="structure">
<position height="0" width="0" x="0" y="0"/>
</attribute>
<multiplicity id="37" minimum="0" maximum="1">
<position height="0" width="0" x="0" y="0"/>
</multiplicity>
</end>
<end type="TARGET" refId="2" navigable="true"/>
<display labels="true" multiplicity="true"/>
</association>
<association id="38">
<end type="SOURCE" refId="5" navigable="false">
<attribute id="39" name="nodeComponents">
<position height="0" width="0" x="0" y="0"/>
</attribute>
<multiplicity id="40" minimum="0" maximum="2147483647">
<position height="0" width="0" x="0" y="0"/>
</multiplicity>
</end>
<end type="TARGET" refId="10" navigable="true"/>
<display labels="true" multiplicity="true"/>
</association>
<association id="41">
<end type="SOURCE" refId="8" navigable="false">
<attribute id="42" name="edge">
<position height="0" width="0" x="0" y="0"/>
</attribute>
<multiplicity id="43" minimum="0" maximum="1">
<position height="0" width="0" x="0" y="0"/>
</multiplicity>
</end>
<end type="TARGET" refId="4" navigable="true"/>
<display labels="true" multiplicity="true"/>
</association>
<generalization id="44">
<end type="SOURCE" refId="6"/>
<end type="TARGET" refId="9"/>
</generalization>
<classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true">
<attributes public="true" package="true" protected="true" private="true" static="true"/>
<operations public="true" package="true" protected="true" private="true" static="true"/>
</classifier-display>
<association-display labels="true" multiplicity="true"/>
</class-diagram>
24 changes: 24 additions & 0 deletions core/src/main/java/org/insightlab/graphast/exceptions/ComponentNotFoundException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package org.insightlab.graphast.exceptions;

import org.insightlab.graphast.model.components.Component;

public class ComponentNotFoundException extends RuntimeException {

/**
*
*/
private static final long serialVersionUID = -915981947597562490L;

public ComponentNotFoundException() {
super();
}

public ComponentNotFoundException(Class<? extends Component> component) {
this(component.getName());
}

public ComponentNotFoundException(String componentName) {
super("Component '" + componentName + "' not found!");
}

}
Loading