Algorithm improvements by jalohse · Pull Request #6 · jalohse/sensor_network_topology

jalohse · 2017-07-07T04:35:39Z

No description provided.

Implemented math.js library. Implemented sparse matrices for storing distances and modified code to only calculate distances that are non-existent.

* master: Fixed random point generator. Fix formatting of probabilities Pull point creation into separate function. Take square root of random number times radius squared to ensure point stays inside circle, fixing issue #4 Fix issues #2, #5 Fix issue #1 # Conflicts: # .idea/Working version/script.js

jalohse

Updating the potential node locations doesn't update the probabilities. Similarly, when you move a node the probabilities and edges don't update.

jalohse · 2017-07-07T04:36:13Z

+
+}
+
+function intersection(a, b, c) {


Where is this method used? I don't see anywhere it is used.

Was using this function for other improvements I didn't finish. It's not needed at the moment but will ultimately be helpful.

jalohse · 2017-07-07T04:39:16Z

+            if ( p > 0 ) {
+                // if edge already exists just update probability
+                if ( edgeInd && radiusChange==1 ) {
+                    tempEdges[edgeInd-1].Pedge = p;


When I increase the coverage radius, sometimes I get an error saying "Uncaught TypeError: Cannot set property 'Pedge' of undefined." It seems that edgeInd is a higher number than what is in the tempEdges.

jalohse · 2017-07-07T05:04:18Z

+    var sqDiameterMax = 4 * Math.pow(complexRadius+dataRadius, 2);
+
+
+    if (!a_edges) {


Because a_edges is only populated on file load, clearing the screen completely breaks it. For example, I have attached a picture of what happened when I cleared the screen and added nodes. It never generated edges because a_edges was just zeros. Faces appeared, but no edges. Only after increasing the coverage radius to be huge did it find one edge when there should have been way more.

jalohse · 2017-07-07T05:14:15Z

+    var iEdgeDist, iEdgeFlag, tempEdges;
+
+    if ( radiusChange==1 ) {
+        tempEdges = JSON.parse(JSON.stringify(ripsEdges));


Why do you need to do this? When you load in the file with d3.json it already formats it into an array.

This change was actually made to the main branch before I started working on the algorithm and done to make a copy of the array. Originally I was using array.slice(), but while it makes a shallow copy of the array, with object arrays it just copies the object references, so any changes affect the original array. This is what was causing that issue earlier with the Rips probabilities getting overwritten by the Cech probabilities. After some research, this seems to be the cleanest way of making a deep copy and leaving the original array intact.

We could possibly use Object.assign (https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/assign). The only downside with this is that it doesn't support Internet Explorer. I'm not sure if we wanted to make sure it worked on everything or add that stipulation.

It looks like object assign works only on the objects themselves, not arrays. I would still have to loop over the array using map or forEach. The approach I used seems to be the most recommended way to do this. https://stackoverflow.com/questions/41273735/how-do-i-copy-an-array-of-arrays-of-objects-and-be-able-to-manipulate-the-copied

As for compatibility, I know we never looked at it, but ultimately I would say we want cross-browser compatibility so probably best not to implement new functions that we know won't work on IE. I will worry about that part.

jalohse · 2017-07-07T05:22:41Z

-    constructRips();
+
+
+    if (radiusChange == 1) {


You could change this to just be "newValue > complexRadius" and remove the entire variable radiusChange

Yeah, could be cleaned up a bit but not super important right now. I do ultimately plan on passing the radius change in as an argument so the algorithm knows which points to look at but this will be in a later version.

jalohse · 2017-07-07T05:23:19Z

+
+}
+
+function updateRips() {


What is the point of this function? Is it ever used?

Code snippet I abandoned. I can get rid of it.

jalohse · 2017-07-07T05:25:22Z

+function constructCech() {
+
+
+    cechEdges = JSON.parse(JSON.stringify(ripsEdges));


There's no need to stringify/parse because ripEdges is already parsed when you loaded the file.

See previous comment.

jalohse · 2017-07-07T05:25:28Z

+    cechEdges = JSON.parse(JSON.stringify(ripsEdges));
+    cechFaces = [];
+    var newFaces = [];
+    var tempFaces = JSON.parse(JSON.stringify(ripsFaces))


There's no need to stringify/parse because ripFaces is already parsed when you loaded the file.

tsodergren and others added 5 commits June 20, 2017 10:14

Moved algorithms to separate file.

23a026c

Implemented math.js library. Implemented sparse matrices for storing distances and modified code to only calculate distances that are non-existent.

New data files. Added improvements to changeRadius.

f33ad00

Updated algorithm.

01e13d7

Updated algorithm.

d51dd44

jalohse commented Jul 7, 2017

View reviewed changes

Fix error that occurs on clear

1c1a0a6

		var sqDiameterMax = 4 * Math.pow(complexRadius+dataRadius, 2);


		if (!a_edges) {

		function constructCech() {


		cechEdges = JSON.parse(JSON.stringify(ripsEdges));

Conversation

jalohse commented Jul 7, 2017

Uh oh!

jalohse left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

jalohse left a comment •

edited

Loading