Revize a8d86f83

Removed vertex originalId

sources/src/main/java/cz/zcu/kiv/offscreen/api/BaseVertex.java

@@ -8 +8 @@
 
     /** New generated identification number. */
     private int id;
-    /** Identification number which is in input file. */
-    private int originalId;
     /** Name of vertex. */
     private String name;
     /** Index of vertex archetype. */
@@ -17 +15 @@
     /** Additional info. */
     private String text;
 
-    public BaseVertex(int id, int originalId, String name, int archetypeIndex, String text) {
+    public BaseVertex(int id, String name, int archetypeIndex, String text) {
         this.id = id;
-        this.originalId = originalId;
         this.name = name;
         this.archetypeIndex = archetypeIndex;
         this.text = text;
@@ -33 +30 @@
         this.id = id;
     }
 
-    public int getOriginalId() {
-        return originalId;
-    }
-
-    public void setOriginalId(int originalId) {
-        this.originalId = originalId;
-    }
-
     public String getName() {
         return name;
     }
@@ -71 +60 @@
      */
     @Override
     public int hashCode() {
-        return originalId;
+        return id;
     }
 
     /**
      * Two vertices are equals when their {@code originalId} is equals.
-     * @param edge which will be compared with this instance
+     * @param vertex which will be compared with this instance
      * @return true if vertices are equal, false otherwise
      */
     @Override
-    public boolean equals(Object edge) {
-        if (!(edge instanceof BaseVertex)) return false;
-        return originalId == ((BaseVertex) edge).originalId;
+    public boolean equals(Object vertex) {
+        if (!(vertex instanceof BaseVertex)) return false;
+        return id == ((BaseVertex) vertex).id;
     }
 }

sources/src/main/java/cz/zcu/kiv/offscreen/api/GraphExport.java

@@ -5 +5 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.apache.log4j.Logger;
 
@@ -14 +15 @@
  */
 public class GraphExport {
 
-    private List<Vertex> vertices;
+    private Set<Vertex> vertices;
     private List<Edge> edges;
     private List<VertexArchetype> vertexArchetypes;
     private List<EdgeArchetype> edgeArchetypes;
@@ -30 +31 @@
 
     public GraphExport(Graph graph) {
         logger.trace("ENTRY");
-        this.vertices = new ArrayList<>(graph.getVertices().values());
-        this.edges = new ArrayList<>(graph.getEdges());
-        this.vertexArchetypes = new ArrayList<>(graph.getVertexArchetypes());
-        this.edgeArchetypes = new ArrayList<>(graph.getEdgeArchetypes());
-        this.attributeTypes = new ArrayList<>(graph.getAttributeTypes());
+        this.vertices = graph.getVertices();
+        this.edges = graph.getEdges();
+        this.vertexArchetypes = graph.getVertexArchetypes();
+        this.edgeArchetypes = graph.getEdgeArchetypes();
+        this.attributeTypes = graph.getAttributeTypes();
         this.possibleEnumValues = graph.getPossibleEnumValues();
         this.groups = graph.getGraphState().getGroups();
         this.sideBar = graph.getGraphState().getSideBar();
@@ -49 +50 @@
         return edges;
     }
 
-    public List<Vertex> getVertices() {
+    public Set<Vertex> getVertices() {
         logger.trace("ENTRY");
         logger.trace("EXIT");
         return vertices;

sources/src/main/java/cz/zcu/kiv/offscreen/api/Group.java

@@ -8 +8 @@
  */
 public class Group {
 
-    /** Generated id of group which is unique only in groups. */
-    private int groupId;
-    /** Generated if of group which is unique in groups and vertexes. */
+    /** Generated id of group. */
     private int id;
     /** Name of group */
     private String name;
@@ -23 +21 @@
     /** Relative position in graph */
     private Position position;
 
-    public Group(int groupId, int id, String name){
-        this.groupId = groupId;
+    public Group(int id, String name){
         this.id = id;
         this.name = name;
         this.verticesId = new ArrayList<>();
@@ -33 +30 @@
         this.position = null;
     }
 
-    public Group(int groupId, int id, String name, List<Integer> verticesId, List<Integer> verticesEdgeFromId, List<Integer> verticesEdgeToId) {
-        this.groupId = groupId;
+    public Group(int id, String name, List<Integer> verticesId, List<Integer> verticesEdgeFromId, List<Integer> verticesEdgeToId) {
         this.id = id;
         this.name = name;
         this.verticesId = verticesId;
@@ -43 +39 @@
         this.position = null;
     }
 
-    public int getGroupId() {
-        return groupId;
-    }
-
-    public void setGroupId(int groupId) {
-        this.groupId = groupId;
-    }
-
     public int getId() {
         return id;
     }

sources/src/main/java/cz/zcu/kiv/offscreen/api/Vertex.java

@@ -1 +1 @@
 package cz.zcu.kiv.offscreen.api;
 
+import cz.zcu.kiv.offscreen.graph.VertexImpl;
+
 import java.util.List;
 
 /**
@@ -14 +16 @@
 
     /**
      * Create new vertex.
-     * @param id new generated identification number.
-     * @param originalId original identification number from input file
+     * @param id original identification number from input file
      * @param name of vertex
      * @param archetypeIndex index of vertex archetype
      * @param text additional info
      * @param attributes List of all attributes. Every attribute is stored in String array in pair as {attribute name, attribute value}.
      */
-    public Vertex(int id, int originalId, String name, int archetypeIndex, String text, List<String[]> attributes) {
-        super(id, originalId, name, archetypeIndex, text);
+    public Vertex(int id, String name, int archetypeIndex, String text, List<String[]> attributes) {
+        super(id, name, archetypeIndex, text);
         this.attributes = attributes;
         this.position = null;
     }
 
+    /**
+     * Create new vertex.
+     * @param vertex instance of VertexImpl with set all parameters
+     * @param attributes ist of all attributes. Every attribute is stored in String array in pair as {attribute name, attribute value}.
+     */
+    public Vertex(VertexImpl vertex, List<String[]> attributes){
+        this(vertex.getId(), vertex.getName(), vertex.getArchetype(), vertex.getText(), attributes);
+    }
+
     public List<String[]> getAttributes() {
         return attributes;
     }

sources/src/main/java/cz/zcu/kiv/offscreen/graph/Graph.java

@@ -4 +4 @@
 import cz.zcu.kiv.offscreen.api.Vertex;
 import org.apache.log4j.Logger;
 
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Class represents graph which is loaded from input JSON file.
  */
 public class Graph {
 
-    private Map<Integer, Vertex> vertices;
+    private Set<Vertex> vertices;
     private List<Edge> edges;
     private List<VertexArchetype> vertexArchetypes;
     private List<EdgeArchetype> edgeArchetypes;
@@ -28 +25 @@
 
     public Graph() {
         logger.trace("ENTRY");
-        this.vertices = new HashMap<Integer, Vertex>();
-        this.edges = new LinkedList<Edge>();
+        this.vertices = new HashSet<>();
+        this.edges = new LinkedList<>();
         logger.trace("EXIT");
     }
 
@@ -82 +79 @@
         return possibleEnumValues;
     }
 
-    public Map<Integer, Vertex> getVertices() {
+    public Set<Vertex> getVertices() {
         logger.trace("ENTRY");
         logger.trace("EXIT");
         return vertices;
@@ -94 +91 @@
         logger.trace("EXIT");
     }
 
-    public void addVertex(int id, Vertex vertex) {
+    public void addVertex(Vertex vertex) {
         logger.trace("ENTRY");
-        this.vertices.put(id, vertex);
+        this.vertices.add(vertex);
         logger.trace("EXIT");
     }
 

sources/src/main/java/cz/zcu/kiv/offscreen/graph/GraphManager.java

@@ -38 +38 @@
         }
     }
 
-    private int lastVertexOrGroupId = 1;
-
     public List<VertexArchetype> vertexArchetypes = new ArrayList<>();
     public List<EdgeArchetype> edgeArchetypes = new ArrayList<>();
     public List<AttributeType> attributeTypes = new ArrayList<>();
@@ -151 +149 @@
      * @param attributes     - Map of attributes associated with the vertex
      */
     public void addVertex(int id, String name, String text, int archetypeIndex, Map<Integer, Attribute> attributes) {
-        VertexImpl vertexToAdd = new VertexImpl(id, id, name, archetypeIndex, text);
+        VertexImpl vertexToAdd = new VertexImpl(id, name, archetypeIndex, text);
         if (vertices.containsKey(archetypeIndex)) {
             vertices.get(archetypeIndex).add(vertexToAdd);
         } else {
@@ -447 +445 @@
         while (i.hasNext()) {
             EdgeImpl edge = i.next();
 
-            VertexImpl toDummy = new VertexImpl(edge.getTo(), edge.getTo(), null, -1,null);
-            VertexImpl fromDummy = new VertexImpl(edge.getFrom(), edge.getFrom(), null, -1, null);
+            VertexImpl toDummy = new VertexImpl(edge.getTo(), null, -1,null);
+            VertexImpl fromDummy = new VertexImpl(edge.getFrom(), null, -1, null);
 
             if (!resultVertices.contains(toDummy) || !resultVertices.contains(fromDummy)){
                 i.remove();
@@ -519 +517 @@
         for (VertexImpl vertexImpl : resultVertices) {
 
             List<String[]> attributes = getAttributesAsArray(vertexImpl.getSortedAttributes());
-
-            Vertex vertex = new Vertex(
-                    lastVertexOrGroupId++,
-                    vertexImpl.getOriginalId(),
-                    vertexImpl.getName(),
-                    vertexImpl.getArchetype(),
-                    vertexImpl.getText(),
-                    attributes);
-
-            graph.addVertex(vertexImpl.getId(), vertex);
+            Vertex vertex = new Vertex(vertexImpl,attributes);
+            graph.addVertex(vertex);
         }
     }
 
@@ -610 +600 @@
         int index = 0;
         for(VertexArchetype archetype : graph.getVertexArchetypes()){
             if(graph.getDefaultGroupArchetypes().contains(archetype.name)){
-                groups.put(index, new Group(groupId++, lastVertexOrGroupId++, archetype.name));
+                groups.put(index, new Group(groupId++, archetype.name));
             }
             index++;
         }
 
         // find vertices with founded vertex archetypes indices
-        for (Vertex vertex : graph.getVertices().values()){
+        for (Vertex vertex : graph.getVertices()){
             if(groups.keySet().contains(vertex.getArchetype())){
-                groups.get(vertex.getArchetype()).addVertexId(vertex.getOriginalId());
+                groups.get(vertex.getArchetype()).addVertexId(vertex.getId());
             }
         }
 

sources/src/main/java/cz/zcu/kiv/offscreen/graph/VertexImpl.java

@@ -13 +13 @@
 
     /**
      * Creates new vertex.
-     * @param id new generated identification number.
-     * @param originalId original identification number from input file
+     * @param id original identification number from input file
      * @param name of vertex
      * @param archetypeIndex index of vertex archetype
      * @param text additional info
      */
-    public VertexImpl(int id, int originalId, String name, int archetypeIndex, String text) {
-        super(id, originalId, name, archetypeIndex, text);
+    public VertexImpl(int id, String name, int archetypeIndex, String text) {
+        super(id, name, archetypeIndex, text);
         this.attributesMap = new HashMap<>();
     }