Organised the folder: added deprecated packages, added functions to manipulate JSON, removed obsole…

Organised the folder: added deprecated packages, added functions to manipulate JSON, removed obsolete files

[manu_chaud, 2017-12-27 03:34:30]

- Added a class (NewGraph) to modify an existing graph using the data generated
by Wei recently: it's just a draft, a TODO list is there also
- Some re-organisation of the code (moved to deprecated packages all the classes
we shouldn't have to use, deleted some outdated resources)

https://codereview.appspot.com/332480043/diff/1/wan_server/src/main/java/net/...
File wan_server/src/main/java/net/wancom/eics/NewGraph.java (right):

https://codereview.appspot.com/332480043/diff/1/wan_server/src/main/java/net/...
wan_server/src/main/java/net/wancom/eics/NewGraph.java:12: public class NewGraph
{
The code for modifying the graph is here, and is not finished yet (see TODO list
behind)

https://codereview.appspot.com/332480043/diff/1/wan_server/src/main/java/net/...
File wan_server/src/main/java/net/wancom/json/JSONUtils.java (right):

https://codereview.appspot.com/332480043/diff/1/wan_server/src/main/java/net/...
wan_server/src/main/java/net/wancom/json/JSONUtils.java:24: public static
JSONObject JSONObjectFromJSONFile(String filename) throws FileNotFoundException,
IOException {
I have added some utility functions to manipulate JSON data here
It is used from the NewGraph class

https://codereview.appspot.com/332480043/diff/1/wan_server/src/main/java/net/...
File wan_server/src/main/java/net/wancom/wan_server/App.java (left):

https://codereview.appspot.com/332480043/diff/1/wan_server/src/main/java/net/...
wan_server/src/main/java/net/wancom/wan_server/App.java:63: 
I have moved this function to the package net.wancom.json.JSONUtils

[brahim Al-Qaysi, 2017-12-27 11:35:53]

https://codereview.appspot.com/332480043/diff/1/wan_server/src/main/java/net/...
File wan_server/src/main/java/net/wancom/eics/NewGraph.java (right):

https://codereview.appspot.com/332480043/diff/1/wan_server/src/main/java/net/...
wan_server/src/main/java/net/wancom/eics/NewGraph.java:26: 
We can copy and paste my code that I have written for the algorithm in here. the
code just read the data from Wei's data and iterate through every node and
calculate the distance between every node (one source node -> multiple
destination nodes).

[manu_chaud, 2018-01-04 05:29:29]

Many changes since the last code review, so many comments

Feel free to review the code. Hopefully, this afternoon after I sleep a while we
will meet and I can explain to you the code in more details

In brief: I've added the possibility for user to request a modified graph and
draw it properly (new nodes and links with different colors) on the map
It is also possible to zoom per country now

https://codereview.appspot.com/332480043/diff/40001/wan_server/src/main/java/...
File wan_server/src/main/java/net/wancom/eics/NewGraph.java (right):

https://codereview.appspot.com/332480043/diff/40001/wan_server/src/main/java/...
wan_server/src/main/java/net/wancom/eics/NewGraph.java:45:
newNode.setIsNewNode(true);
We specify which node is new in order to draw them with a different color on the
world map

https://codereview.appspot.com/332480043/diff/40001/wan_server/src/main/java/...
wan_server/src/main/java/net/wancom/eics/NewGraph.java:60: int cost2 =
SphericalGeometry.getDistance(oldNode2.getLatitude(), oldNode2.getLongitude(),
naming the variables cost1 and cost2 is more logic than cost and newCost

https://codereview.appspot.com/332480043/diff/40001/wan_server/src/main/java/...
wan_server/src/main/java/net/wancom/eics/NewGraph.java:79:
oldNode1.removeImmediateNeighborsDestination(newNode);
it's important to remove the links added after one iteration, because if it goes
here, it means there is only one link added to the new node (useless in all
cases)

https://codereview.appspot.com/332480043/diff/40001/wan_server/src/main/java/...
wan_server/src/main/java/net/wancom/eics/NewGraph.java:82:
graph.removeNode(newNode);
important to remove the node tested, to continue with the following node

https://codereview.appspot.com/332480043/diff/40001/wan_server/src/main/java/...
File wan_server/src/main/java/net/wancom/graph/Node.java (right):

https://codereview.appspot.com/332480043/diff/40001/wan_server/src/main/java/...
wan_server/src/main/java/net/wancom/graph/Node.java:21: private Boolean
isNewNode = false;
Necessary that a new node is tagged as such, so it can be drawn with different
color on the world map

https://codereview.appspot.com/332480043/diff/40001/wan_server/src/main/java/...
wan_server/src/main/java/net/wancom/graph/Node.java:40: public void
removeImmediateNeighborsDestination(Node destination) {
necessary to be able to remove links that have been added temporarily by the
EICS

https://codereview.appspot.com/332480043/diff/40001/wan_server/src/main/java/...
wan_server/src/main/java/net/wancom/graph/Node.java:81: public Boolean
getIsNewNode() {
getters and setters for the property "isNewNode"
self-explanatory

https://codereview.appspot.com/332480043/diff/40001/wan_server/src/main/java/...
File wan_server/src/main/java/net/wancom/json/JSONUtils.java (right):

https://codereview.appspot.com/332480043/diff/40001/wan_server/src/main/java/...
wan_server/src/main/java/net/wancom/json/JSONUtils.java:150: Boolean isNewnode =
node.getIsNewNode();
We check whether the node is new or not, to add this info to the json object

https://codereview.appspot.com/332480043/diff/40001/wan_server/src/main/java/...
wan_server/src/main/java/net/wancom/json/JSONUtils.java:158: if (isNewnode ||
entry.getKey().getIsNewNode()) {
add the field "new": true for links which have been added by the EICS

https://codereview.appspot.com/332480043/diff/40001/wan_server/src/main/java/...
wan_server/src/main/java/net/wancom/json/JSONUtils.java:169: jsonNode.put("new",
isNewnode);
we add <<"new": true>> or <<"new": false>> to the json nodes (the items in
"nodes":[...])

https://codereview.appspot.com/332480043/diff/40001/wan_server/src/main/java/...
File wan_server/src/main/java/net/wancom/wan_server/App.java (right):

https://codereview.appspot.com/332480043/diff/40001/wan_server/src/main/java/...
wan_server/src/main/java/net/wancom/wan_server/App.java:64: post("/newgraph",
(request, response) -> {
Split: we have now one request handler for when user requests a shortest path,
and one request handler for when user requests a new graph (theoretically
improved, but for the moment just a graph with a random new node (the links are
added according to the constraint, though)

https://codereview.appspot.com/332480043/diff/40001/wan_server/src/main/java/...
wan_server/src/main/java/net/wancom/wan_server/App.java:78: } else if (!(maxCost
> 0)) {
let's check the user input is correct

https://codereview.appspot.com/332480043/diff/40001/wan_server/src/main/resou...
File wan_server/src/main/resources/public/index.html (right):

https://codereview.appspot.com/332480043/diff/40001/wan_server/src/main/resou...
wan_server/src/main/resources/public/index.html:91: var zoom_info = { // Where
to zoom the map for each country? Center + zoom level
I retrieved the info to zoom on any country: a location which is around the
center of the country, and the level of zoom, according to the country's size
and shape

https://codereview.appspot.com/332480043/diff/40001/wan_server/src/main/resou...
wan_server/src/main/resources/public/index.html:92: World: { center: {lat:
47.044448, lng: 13.983138}, zoom: 2 },
World, when the focus is on the whole map

https://codereview.appspot.com/332480043/diff/40001/wan_server/src/main/resou...
wan_server/src/main/resources/public/index.html:191: if (isNewLink) {
When a new links is added, a different color is used (flashy green instead of
classical pale yellow)

https://codereview.appspot.com/332480043/diff/40001/wan_server/src/main/resou...
wan_server/src/main/resources/public/index.html:212: if (isNewNode) {
New nodes in black color

https://codereview.appspot.com/332480043/diff/40001/wan_server/src/main/resou...
wan_server/src/main/resources/public/index.html:231: var input1 =
$(':input[name="src"]');
a meaningful name so the code is more self-explanatory

https://codereview.appspot.com/332480043/diff/40001/wan_server/src/main/resou...
wan_server/src/main/resources/public/index.html:251: $('<label>Which country you
want to highlight?</label>').appendTo($user_dashboard);
We stop displaying countries one by one (it's useless), and we allow instead the
user to zoom on a country by selecting the country name

https://codereview.appspot.com/332480043/diff/40001/wan_server/src/main/resou...
wan_server/src/main/resources/public/index.html:279: // Add input fields for
requesting new graph
A user interface is added to request a modified graph

https://codereview.appspot.com/332480043/diff/40001/wan_server/src/main/resou...
wan_server/src/main/resources/public/index.html:297: function
request_shortest_path() {
meaningful name once again.

https://codereview.appspot.com/332480043/diff/40001/wan_server/src/main/resou...
wan_server/src/main/resources/public/index.html:312: var request = {};
Now we stop sending over to the server the whole topology; we just provide the
server with the country name and the server will get on to find the topology in
the public resources

https://codereview.appspot.com/332480043/diff/40001/wan_server/src/main/resou...
wan_server/src/main/resources/public/index.html:400: function zoom(select) {
We add a function to handle zoom on user-selected countries

[manu_chaud, 2018-01-04 20:02:28]

Some update from today.

@wei, I left you one comment about a bug occurring in index.html (it's occurring
more and more often since the script's size has increased)

https://codereview.appspot.com/332480043/diff/80001/wan_server/src/main/resou...
File wan_server/src/main/resources/public/index.html (right):

https://codereview.appspot.com/332480043/diff/80001/wan_server/src/main/resou...
wan_server/src/main/resources/public/index.html:50: <script async defer
I tried to move here the script for Google maps, because sometimes appears the
error "google is undefined" (the map is loaded, but the statement 'new
google.maps.Circle()' causes an error that makes javascript crash. It still
appears, and I don't know how to fix it
@wei, maybe you have an idea?

https://codereview.appspot.com/332480043/diff/80001/wan_server/src/main/resou...
wan_server/src/main/resources/public/index.html:299: if (countries_input[0] !==
countries_input[1]) {
We make sure that the nodes for which user requests the shortest path belong to
the same country (otherwise ===> error)

[manu_chaud, 2018-01-05 19:22:24]

The first version of the algorithm, though it may take several hours to
terminate if the possibilities for a new graph are numerous
We will need to run it before the final demo so as to save the result and plot
the graph for it. This will allow us to show the saved results for the demo as
well

https://codereview.appspot.com/332480043/diff/120001/wan_server/src/main/java...
File wan_server/src/main/java/net/wancom/wan_server/App.java (right):

https://codereview.appspot.com/332480043/diff/120001/wan_server/src/main/java...
wan_server/src/main/java/net/wancom/wan_server/App.java:83: /*
Here is the function call for the algorithm; should be used in standalone mode
to generate directly the new graphs instead of using it in interactive mode
(user couldn't wait for hours for the response)

https://codereview.appspot.com/332480043/diff/140001/wan_server/src/main/java...
File wan_server/src/main/java/net/wancom/eics/NewGraph.java (right):

https://codereview.appspot.com/332480043/diff/140001/wan_server/src/main/java...
wan_server/src/main/java/net/wancom/eics/NewGraph.java:34: // For performance
evaluation
Variables for performance evaluation are defined here

https://codereview.appspot.com/332480043/diff/140001/wan_server/src/main/java...
wan_server/src/main/java/net/wancom/eics/NewGraph.java:35: int
numberOfGraphsChecked = 0;
This variable and the one below allows us to log the progress of the algorithm
on a regular basis

https://codereview.appspot.com/332480043/diff/140001/wan_server/src/main/java...
wan_server/src/main/java/net/wancom/eics/NewGraph.java:50: Record bestRecord =
new Record(null, null, Integer.MAX_VALUE);
here we store the best node and neighbours we have found

https://codereview.appspot.com/332480043/diff/140001/wan_server/src/main/java...
wan_server/src/main/java/net/wancom/eics/NewGraph.java:84: if (
numberOfGraphsChecked % (numberOfGraphsToBeEvaluated/1000) == 0 ) {
Here we just display the advancement of the algorithm in the console

https://codereview.appspot.com/332480043/diff/140001/wan_server/src/main/java...
wan_server/src/main/java/net/wancom/eics/NewGraph.java:131: Node newNode =
bestRecord.getNewNode();
now that we have evaluated all the possible graphs, we add the best node &
neighbors to the graph, before returning the graph

https://codereview.appspot.com/332480043/diff/140001/wan_server/src/main/java...
wan_server/src/main/java/net/wancom/eics/NewGraph.java:161: static class Record
implements Comparable<Record> {
This class just serves to represent the info for a new graph (new node,
neighbors for this new node, the total distance of the graph such built)

[manu_chaud, 2018-01-05 21:51:05]

When a new node is added, the map automatically zooms in that node. Now, it is
possible to compute the shortest path with a new node, and take into account
that node. The distance of the shortest path is now displayed.

[manu.chaud_hotmail.fr, 2018-01-05 21:53:24]

PS: forgot to mention that you can see the result here:
https://gits-15.sys.kth.se/iaq/WANCom/blob/10c70bfe203a9aa9ed3357d5090ce0edad...



Not a major change, but this should help for the demo



________________________________
From: manu.chaud.18@gmail.com <manu.chaud.18@gmail.com>
Sent: Friday, January 5, 2018 10:51:05 PM
To: dkostic@gmail.com; kirill.sc@gmail.com; ibolight91@gmail.com;
zhubiwen509@gmail.com; farzad2050@gmail.com; yulianlluo@gmail.com;
w406971526@gmail.com
Cc: reply@codereview-hr.appspotmail.com
Subject: Re: Organised the folder: added deprecated packages, added functions to
manipulate JSON, removed obsole… (issue 332480043 by manu.chaud.18@gmail.com)

When a new node is added, the map automatically zooms in that node. Now,
it is possible to compute the shortest path with a new node, and take
into account that node. The distance of the shortest path is now
displayed.

https://codereview.appspot.com/332480043/

[manu_chaud, 2018-01-07 00:47:10]

Fixed a small bug in the EICS + changed the drop-down menu to select a country
to zoom in, into a set of radio buttons (so as only one click is needed to zoom
in a country)

https://codereview.appspot.com/332480043/diff/220001/wan_server/src/main/java...
File wan_server/src/main/java/net/wancom/eics/NewGraph.java (right):

https://codereview.appspot.com/332480043/diff/220001/wan_server/src/main/java...
wan_server/src/main/java/net/wancom/eics/NewGraph.java:54: int
currentTotalDistance = computeTotalDistance(graph, oldNodes);
We first need to compute the total distance of the current graph, to make sure
any new graph generated is better than the current one

[manu_chaud, 2018-01-08 19:45:42]

just fixed the server log messages that were inexact

but didn't finish the algorithm yet - gonna do that at home

[manu_chaud, 2018-01-09 17:37:45]

lgtm