Merge branch 'master' into develop

11 files changed, 414 insertions, 0 deletions

diff --git a/algorithm/AODV.java b/algorithm/AODV.java
new file mode 100644
index 0000000..233c918
--- /dev/null
+++ b/algorithm/AODV.java
@@ -0,0 +1,7 @@
+package algorithm;
+
+
+
+public class AODV{
+	 
+}
\ No newline at end of file
diff --git a/gs-core-1.3/gs-core-1.3-javadoc.jar b/gs-core-1.3/gs-core-1.3-javadoc.jar
new file mode 100644
index 0000000..131f1e8
--- /dev/null
+++ b/gs-core-1.3/gs-core-1.3-javadoc.jar
diff --git a/gs-core-1.3/gs-core-1.3-javadoc.jar.asc b/gs-core-1.3/gs-core-1.3-javadoc.jar.asc
new file mode 100644
index 0000000..0e9bd6a
--- /dev/null
+++ b/gs-core-1.3/gs-core-1.3-javadoc.jar.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAABCAAGBQJVI6+uAAoJEFcic6tDtcUcu0EP/RtRPTW7LUOk+hksopEB9xwL
++kFRVW4avd7mor+rucRBP5VzxdVDAXFSFI7+mkRtkYrnbMhURxaUu4L+POT6I9k8
+9hZUSoXIUirHKP3VJti78n+Js4pXeXTYsjz0KOwW5lz2RSvrqi9CcdbHrtOq0YLw
+57btDVxrLQXCA4nWsUzMhghx3cJiqSZDeDjZRMVD+X29ZZBVq19mTX4XmMWjA/2P
+ywjurxkwfcMAOkPoA6oOmiybWCAdiChQEvIZuUDfgHDtmKnsbi+HI0aJVKKCjBs2
+ZyIOqgUIUVv2xxOan37SlA+xurjfIM9TiE2i5DPr1mIlRcX5D6tLZFZ6vcQdyBJW
+eNAaHhwQHeQQauymQSFQrukQJM8uAc7MSSXSCxMZhAHlidcYqftjAdyHhji3RbC5
+gGNxPBEm9mh1HV/+LDZVkPYXsiaw9IDLiP8+mzueH+K05bfdNv+Ot2jsaYAnjO0h
+SEfJxYx6q2tGdRWrw/okOMnLMGACWi9tMjZSoAQWQYcdeFgWdpUE95L0CaWSe8Ty
+SfU6gnNcsayvrC9fRjV7BU+jjsmeTCho+nLtfAAYKYnB1O4Mxhdcu8pJQ43gD83f
+kFYzmL1d2mowOcrFzTysKLpQaJrrAE/8b6s8SL0HPvQVUncAi7JLEEzRt3inyRSZ
+ECTeHIl0NLYdNc/dW/8G
+=O35H
+-----END PGP SIGNATURE-----
diff --git a/gs-core-1.3/gs-core-1.3-sources.jar b/gs-core-1.3/gs-core-1.3-sources.jar
new file mode 100644
index 0000000..fe3d447
--- /dev/null
+++ b/gs-core-1.3/gs-core-1.3-sources.jar
diff --git a/gs-core-1.3/gs-core-1.3-sources.jar.asc b/gs-core-1.3/gs-core-1.3-sources.jar.asc
new file mode 100644
index 0000000..3d497b4
--- /dev/null
+++ b/gs-core-1.3/gs-core-1.3-sources.jar.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAABCAAGBQJVI6+uAAoJEFcic6tDtcUczfoP/Rx4C/o7pNjWUXzAeIQfVZUH
+lGvrJxCAhQpti+kA0p8FymXXK274kMVTalCgKE4vQjPCpA4g4Bv77RjHvIVMTg+e
+ZHt8CpR31FbsF5hgiWASjduosQjaP5sFdTbzXzBYFOhSv6qkZ+soaP0Y61mNXv7x
+jqtKBGf66VtYvN3wFloCoUJ2AA8yFE9f54484QSi/Qkdb/CGh5cPQwisqwiD2hDh
+XTQBHF5QoKZEZJ5Cw139C2atPOS2ECvcNRpYAwbf73zcH/LsRkgRbPJNKmiMDkgq
+YeuDXctDRsg4Eyzl0NNhi5rr71R3GpYA1W7rLMg6wN57txKXVfiCDxl8KI+YjM+P
+Ef5h5qpJ2p5zF1eOrq6Ymnxl+7MoOKeRzKKPWSZEx2Au9lsEo11JOQ3Y76xQDe5P
+MqmmiaYKsOZAJXOf7vKUu7KUKe6gn2xUt+ybm22ExFPLf7pUs5jpT/AlzSJZJOia
+zfIWh6UJYGsfqVRnJ69ngW1hqoZRSoL3273cbuVlt/FuSZjhHlh3fyL0sFtWHvpp
+7BDkkQL2gRo5lq2D1tKUuLuF4DlaNlZEuBK1XgdUhOoTG4DYQAjODCsX168vIxwG
+KuaYTmmnUZml2/17M6jkH/gRDo8VK9a969R1ll2BsydXnsGvTb7U3+6JqzWC2uyU
+x0EKyV4jfdd+9LZ0Eri8
+=wzS0
+-----END PGP SIGNATURE-----
diff --git a/gs-core-1.3/gs-core-1.3.jar b/gs-core-1.3/gs-core-1.3.jar
new file mode 100644
index 0000000..c8f50fd
--- /dev/null
+++ b/gs-core-1.3/gs-core-1.3.jar
diff --git a/gs-core-1.3/gs-core-1.3.jar.asc b/gs-core-1.3/gs-core-1.3.jar.asc
new file mode 100644
index 0000000..71bc0a2
--- /dev/null
+++ b/gs-core-1.3/gs-core-1.3.jar.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAABCAAGBQJVI6+ZAAoJEFcic6tDtcUcezEP/RGwl9a6SQu6UZjc+t8MOKvN
+xWAj/qnnndApZw60P7g3QfA9QB1rU2aSZpIVNFlYSODNBdTgXEMgdb3o2dqCN1by
+9k+Oc5pNzOatuloc00wfgwf4p757Hnuu/W9dtD7oLloCc8Zlm9yqyzCXQCz7ol0P
+wMhCf6lCTOri2BrfnlehGQ7rrgm34jKmio9XEi3wCqBaZ3d/EA29moZk8tVsucM3
+utV4dpT75khMgVxFT6+HtJMT7+MyfmBJt7aMNs/EzCs5y+lUs8n0D+vSMzbtYUxf
+6WtYsjmjfBo9cJj7r2Y7p2JdK2RoDeVbxzENJMwb+qY+E0/65DnEheetfvkqKNcR
+HOlFRMP2J/Sky1nB6b6gZTJi6HWcx5s4sgwyHhFlGhA1Q1GwbfttM6GD3Rtt4Ka3
+rNAXdnHelg7Db0jKHCKiwcnjhSsZvdi6XajDuNp75BDbT0EzN/oHNRtBSJO8r9mp
+rEJSiO6wmf9Z1bVFQMqJCbu6vygiEHS5F2h3APi8RF5k43O7JKxnGYwz3oZc7zgR
+KY4U1RNPeXoCQH0cc4Uh+PcXb9wkIA5s7wxr1S1Sya9MzV75echWSL76IpLvpDC0
+ue0Bz2xQitvQfUDOBKguYJLH1mro7sd+hT879wUJkWQneW3rhkblDmUmtgvGl2GI
+mynsXW9gD2+8j1MTaB3O
+=4j/o
+-----END PGP SIGNATURE-----
diff --git a/gs-core-1.3/gs-core-1.3.pom b/gs-core-1.3/gs-core-1.3.pom
new file mode 100644
index 0000000..54e3425
--- /dev/null
+++ b/gs-core-1.3/gs-core-1.3.pom
@@ -0,0 +1,313 @@
+<?xml version="1.0" encoding="UTF-8"?>
+	<!--
+		This file is part of GraphStream <http://graphstream-project.org>.
+		GraphStream is a library whose purpose is to handle static or dynamic
+		graph, create them from scratch, file or any source and display them.
+		This program is free software distributed under the terms of two
+		licenses, the CeCILL-C license that fits European law, and the GNU
+		Lesser General Public License. You can use, modify and/ or
+		redistribute the software under the terms of the CeCILL-C license as
+		circulated by CEA, CNRS and INRIA at the following URL
+		<http://www.cecill.info> or under the terms of the GNU LGPL as
+		published by the Free Software Foundation, either version 3 of the
+		License, or (at your option) any later version. This program is
+		distributed in the hope that it will be useful, but WITHOUT ANY
+		WARRANTY; without even the implied warranty of MERCHANTABILITY or
+		FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+		License for more details. You should have received a copy of the GNU
+		Lesser General Public License along with this program. If not, see
+		<http://www.gnu.org/licenses/>. The fact that you are presently
+		reading this means that you have had knowledge of the CeCILL-C and
+		LGPL licenses and that you accept their terms.
+	-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.sonatype.oss</groupId>
+		<artifactId>oss-parent</artifactId>
+		<version>7</version>
+	</parent>
+	
+	<groupId>org.graphstream</groupId>
+	<artifactId>gs-core</artifactId>
+	<version>1.3</version>
+
+	<name>gs-core</name>
+	<description>
+		The GraphStream library. With GraphStream you deal with
+		graphs. Static and Dynamic. You create them from scratch, from a file
+		or any source. You display and render them. This is the core package
+		that contains the minimal needed to read, display and write a graph.
+	</description>
+	<url>http://graphstream-project.org</url>
+
+	<!-- Source code of GraphStream is hosted on GitHub. -->
+	<scm>
+		<connection>scm:git:git://github.com/graphstream/gs-core.git</connection>
+		<developerConnection>scm:git:git://github.com/graphstream/gs-core.git</developerConnection>
+		<url>https://github.com/graphstream/gs-core</url>
+	</scm>
+
+	<!-- GraphStream is using the GitHub issue tracker. -->
+	<issueManagement>
+		<system>github</system>
+		<url>https://github.com/graphstream/gs-core/issues</url>
+	</issueManagement>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+
+	<!-- The GraphStream Team.
+		 Members are sorted in alphabetically. -->
+	<developers>
+		<developer>
+			<id>sbalev</id>
+			<name>Stefan Balev</name>
+			<email>stefan.balev@graphstream-project.org</email>
+			<organization>LITIS</organization>
+			<organizationUrl>http://www.litislab.eu</organizationUrl>
+		</developer>
+
+		<developer>
+			<id>jbaudry</id>
+			<name>Julien Baudry</name>
+			<email>julien.baudry@graphstream-project.org</email>
+			<organization>LITIS</organization>
+			<organizationUrl>http://www.litislab.eu</organizationUrl>
+		</developer>
+
+		<developer>
+			<id>adutot</id>
+			<name>Antoine Dutot</name>
+			<email>antoine.dutot@graphstream-project.org</email>
+			<organization>LITIS</organization>
+			<organizationUrl>http://www.litislab.eu</organizationUrl>
+		</developer>
+
+		<developer>
+			<id>ypigne</id>
+			<name>Yoann Pigné</name>
+			<email>yoann.pigne@graphstream-project.org</email>
+			<organization>University of Luxembourg</organization>
+			<organizationUrl>http://www.uni.lu</organizationUrl>
+		</developer>
+
+		<developer>
+			<id>gsavin</id>
+			<name>Guilhelm Savin</name>
+			<email>guilhelm.savin@graphstream-project.org</email>
+			<organization>LITIS</organization>
+			<organizationUrl>http://www.litislab.eu</organizationUrl>
+		</developer>
+	</developers>
+
+	<contributors>
+		<contributor>
+			<name>Frédéric Guinand</name>
+			<email>frederic.guinand@univ-lehavre.fr</email>
+			<organization>LITIS</organization>
+			<organizationUrl>http://www.litislab.eu</organizationUrl>
+		</contributor>
+
+		<contributor>
+			<name>Richard O. Legendi</name>
+			<email>richard.legendi@univ-lehavre.fr</email>
+			<organization>Eötvös Loránd University, Faculty of Informatics</organization>
+			<organizationUrl>http://people.inf.elte.hu/legendi/</organizationUrl>
+		</contributor>
+	</contributors>
+
+	<licenses>
+		<license>
+			<name>LGPL3</name>
+			<url>http://www.gnu.org/copyleft/lesser.html</url>
+		</license>
+
+		<license>
+			<name>Cecill-C</name>
+			<url>http://www.cecill.info/licences/Licence_CeCILL-C_V1-en.html
+			</url>
+		</license>
+	</licenses>
+
+	<profiles>
+		<profile>
+			<!--
+				This profile includes classes of mbox2 and pherd project to create a
+				fully usable jar. You need to have a valid gs-deps folder at the
+				same hierarchic level that the one of your project with mbox2 and
+				pherd compiled (mvn compile).
+			-->
+			<id>nodeps</id>
+			<build>
+				<resources>
+					<resource>
+						<directory>../../gs-deps/mbox2/target/classes</directory>
+						<includes>
+							<include>org/**/*.class</include>
+						</includes>
+					</resource>
+					<resource>
+						<directory>../../gs-deps/pherd/target/classes</directory>
+						<includes>
+							<include>org/**/*.class</include>
+						</includes>
+					</resource>
+				</resources>
+			</build>
+		</profile>
+		<profile>
+			<!--
+				This profile has to be enabled when releasing the package. It will
+				enable the sign phase.
+			-->
+			<id>release</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-gpg-plugin</artifactId>
+						<configuration>
+							<keyname><![CDATA[GraphStream Team <team@graphstream-project.org>]]></keyname>
+							<skip>false</skip>
+						</configuration>
+						<executions>
+							<execution>
+								<id>sign-artifacts</id>
+								<phase>package</phase>
+								<goals>
+									<goal>sign</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+
+	<build>
+		<sourceDirectory>src</sourceDirectory>
+		<outputDirectory>bin</outputDirectory>
+		<testSourceDirectory>src-test</testSourceDirectory>
+		<defaultGoal>compile</defaultGoal>
+
+		<resources>
+			<!-- Resources other than classes are included here. -->
+			<resource>
+				<directory>src</directory>
+				<includes>
+					<include>org/graphstream/ui/graphicGraph/stylesheet/rgb.properties</include>
+				</includes>
+			</resource>
+		</resources>
+
+		<testResources>
+			<testResource>
+				<directory>src-test</directory>
+				<includes>
+					<include>org/graphstream/**/test/data/**</include>
+				</includes>
+			</testResource>
+		</testResources>
+
+		<plugins>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.7</source>
+					<target>1.7</target>
+					<excludes>
+						<exclude>org/graphstream/stream/file/FileSinkSWF.java</exclude>
+					</excludes>
+				</configuration>
+				<version>3.3</version>
+			</plugin>
+
+			<plugin>
+				<artifactId>maven-eclipse-plugin</artifactId>
+				<groupId>org.apache.maven.plugins</groupId>
+				<configuration>
+					<sourceIncludes>
+						<include>**</include>
+					</sourceIncludes>
+				</configuration>
+				<version>2.9</version>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>2.6</version>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<configuration>
+					<tags>
+						<tag>
+							<name>complexity</name>
+							<placement>a</placement>
+							<head>Computational Complexity :</head>
+						</tag>
+						<tag>
+							<name>reference</name>
+							<placement>a</placement>
+							<head>Scientific Reference :</head>
+						</tag>
+					</tags>
+					<author>true</author>
+					<nodeprecated>false</nodeprecated>
+					<nodeprecatedlist>false</nodeprecatedlist>
+					<noindex>false</noindex>
+					<nonavbar>false</nonavbar>
+					<notree>false</notree>
+					<show>public</show>
+					<source>1.5</source>
+					<splitindex>true</splitindex>
+					<use>true</use>
+					<version>true</version>
+					<windowtitle>The GraphStream ${project.version} API</windowtitle>
+				</configuration>
+				<version>2.10.2</version>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<excludes>
+						<exclude>org/graphstream/ui/viewer/test/**/</exclude>
+						<exclude>**/*$*</exclude>
+					</excludes>
+				</configuration>
+				<version>2.18.1</version>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+			<optional>false</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.graphstream</groupId>
+			<artifactId>pherd</artifactId>
+			<version>1.0</version>
+			<optional>false</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.graphstream</groupId>
+			<artifactId>mbox2</artifactId>
+			<version>1.0</version>
+			<optional>false</optional>
+		</dependency>
+	</dependencies>
+</project>
+
diff --git a/gs-core-1.3/gs-core-1.3.pom.asc b/gs-core-1.3/gs-core-1.3.pom.asc
new file mode 100644
index 0000000..f6616bb
--- /dev/null
+++ b/gs-core-1.3/gs-core-1.3.pom.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAABCAAGBQJVI6+uAAoJEFcic6tDtcUcm8AP/0fcGiTlJ+LjpLMaubtjuTtS
+Exze8FFjsPa79IC7nssnf0rm3FDC1GAr59T6HNPT7N8r/BJVppD+Vq2MZcRUSNMS
+vbgVdwc2je5x7+jliDTBaiPZSeke2GJNMTHT2mMWm/Vga8J59V5U/Gvt1xLRwIUq
+pI4jytV+bhryGdE00xNTqoSJrAXrae3Pxp5tb2d8wmJ74HaBe/em7Mb82pUb/G/S
+ZdC51iSmmo1uArUOHzDT/V70y38ZO4uKkKzF8oc+WsiBe7Ig+gTBhCE6aqTjC2FB
+odAxQiJ2Tvo/qeNgUWYflnDPySVOAG/MNshnintv+zSOqhQaOSKTVoXRS6k0s0nm
+j2KbC7B6BuGNDYHZ0TyO4LixMOgNwqMp8JN4jvWMxSG7BBzaU9pHrvsJHJdLj6Yw
+WLUG7kY6AmYOdaYVWJqf/aOAv+f4NDURwAvU5ORbNYIycA+xbsuVye7C5c3c+DQ9
+bqkylyeJq7Ba/+OIeVkyZF7dmN3g+x8FJFPixFOsRTYqKD4I+Rr5/aZWOGVQoJbv
+tFttShT4pu/DbywQ890JCaPtKdf2WojR8ZNgkcofkUND83ntnhm2FJz+H5mEWOw7
+8AWJiz3irYA5d+bYO7Whww9CsH292XlCUdUypIybFKv+ryF5HvQmGpZxnqPp2Ey7
+dyxfozrh/Uhdh+bVLZhK
+=8JdF
+-----END PGP SIGNATURE-----
diff --git a/main/Main.java b/main/Main.java
new file mode 100644
index 0000000..64a8858
--- /dev/null
+++ b/main/Main.java
@@ -0,0 +1,21 @@
+package main;
+
+import org.graphstream.graph.*;
+import org.graphstream.graph.implementations.*;
+
+
+public class Main {
+
+	public static void main(String[] args) {
+		Graph graph = new SingleGraph("Tutorial 1");
+
+		graph.addNode("A");
+		graph.addNode("B");
+		graph.addNode("C");
+		graph.addEdge("AB", "A", "B");
+		graph.addEdge("BC", "B", "C");
+		graph.addEdge("CA", "C", "A");
+
+		graph.display();
+	}
+}
diff --git a/structure/Grid.java b/structure/Grid.java
new file mode 100644
index 0000000..cdf21f4
--- /dev/null
+++ b/structure/Grid.java
@@ -0,0 +1,5 @@
+package structure;
+
+public class Grid {
+
+}