From 1a9a97c8a59ac253e77d45a98380931d00e4a250 Mon Sep 17 00:00:00 2001
From: Amira Abdel-Rahman <amira-rahman@aucegypt.edu>
Date: Mon, 18 Nov 2019 11:28:16 -0500
Subject: [PATCH] some tweaks, still small error with forward replay
---
01_Code/.DS_Store | Bin 6148 -> 0 bytes
.../graph/main.js | 12 ++++----
.../threejs/assembly.js | 27 +++++++++++++-----
3 files changed, 26 insertions(+), 13 deletions(-)
delete mode 100644 01_Code/.DS_Store
diff --git a/01_Code/.DS_Store b/01_Code/.DS_Store
deleted file mode 100644
index 9e590ec8f16bcb601558a4c31c4dd79d41f2a26f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 6148
zcmZQzU|@7AO)+F(5MW?n;9!8z4DAe90Z1N%F(jFwB8(vOz-DAJBr_y3<S@iDBtzv0
zQ6RlC3<V4s43!MU49NQP8FCp47)lvR7&0017}6Qy!E^~jDnk)N8bcyOGDB)va8X`P
zeqK7nenM7_%8!P?Xb6mkz-S1JhQMeDAnHsG?$OW~4S~@R7!3im5CFB!6`<vW1C(xn
z&>$%WMg|6O7l4t0fd!_O5!?@80Lg*0f@qLd5Dn7GzzAZ2%>Zj<V1#OA1b0I~`aoS0
z5DnJOz{mjB&cMh3*3Q5PwwZx}5u%-e5o$9dw1>h7(ayjK(ayjK(GGLoC_Neiqagqd
z0cHp-0IL6885nT&{~@YI$<YuP4S``90*ov!!7fhVN*TNVKy@vsK21Q9W(3vI5IrDi
rP_+)OikTn-iV`rTj0_AQtsr@DRm{i$smVth0<aJorAI@6{viMW0Vy0p
diff --git a/01_Code/physical_computing_interface/graph/main.js b/01_Code/physical_computing_interface/graph/main.js
index 609bbee..1d3aaa4 100644
--- a/01_Code/physical_computing_interface/graph/main.js
+++ b/01_Code/physical_computing_interface/graph/main.js
@@ -291,16 +291,16 @@ document.addEventListener('DOMContentLoaded', function(){
// ignore the item we're looking for neighbours for
if(!outofbound )
{
- // console.log(i1);
- // console.log(j1);
- // console.log(k1);
- // console.log(x);
- // console.log(y);
- // console.log(z);
if (!(i1==x && j1==y && k1==z)&& occupancy[i1][j1][k1]) {
var tgt=cy.$id('[' +x +"," +y+","+z+']');
tgt._private.data.data.neighbors.push('[' +i1 +"," +j1+","+k1+']');
tgt=cy.$id('[' +i1 +"," +j1+","+k1+']');
+ // console.log(i1);
+ // console.log(j1);
+ // console.log(k1);
+ // console.log(x);
+ // console.log(y);
+ // console.log(z);
tgt._private.data.data.neighbors.push('[' +x +"," +y+","+z+']');
cy.add([
{ group: "edges", data: { source: '[' +x +"," +y+","+z+']', target: '[' +i1 +"," +j1+","+k1+']'}}
diff --git a/01_Code/physical_computing_interface/threejs/assembly.js b/01_Code/physical_computing_interface/threejs/assembly.js
index 5f3dda8..58823e3 100644
--- a/01_Code/physical_computing_interface/threejs/assembly.js
+++ b/01_Code/physical_computing_interface/threejs/assembly.js
@@ -1,7 +1,7 @@
var slider = document.getElementById("time");
var totalTimeSteps=0;
var timeline=[];
-var timeStep=0;
+var timeStep=0.;
slider.oninput = function() {
replay(this.value);
@@ -56,8 +56,8 @@ document.addEventListener('adjustTimeStep', function (e) {
slider.max=totalTimeSteps;
slider.value=totalTimeSteps;
timeline.push([e.detail]);
- replay(totalTimeSteps-1);
- timeStep=totalTimeSteps;
+ replay(parseInt(totalTimeSteps-1));
+ timeStep=parseInt(totalTimeSteps);
// console.log(occupancy);
// console.log(timeStep);
@@ -66,11 +66,15 @@ document.addEventListener('adjustTimeStep', function (e) {
function replay(currValue){
// var currValue=this.value;
+ console.log(currValue +" "+timeStep+" "+timeline.length);
+ // console.log(currValue);
+
if(currValue<timeStep){
for(var i=timeStep;i>currValue;i--) {
var ii=i-1;
for(var j=0;j<timeline[ii].length;j++) {
occupancy=timeStepOccupancy[ii][j];
+ console.log("update occupancy to timestep "+ii);
// console.log(occupancy);
if(!timeline[ii][j].addRemove){
addNode(timeline[ii][j].x,timeline[ii][j].y,timeline[ii][j].z,true);
@@ -81,9 +85,16 @@ function replay(currValue){
}
}else if (currValue>timeStep){
for(var i=timeStep;i<currValue;i++) {
- var ii=i;
+ var ii=i-0;
+
+ // console.log(timeline);
+ // console.log(ii);
+ // console.log(timeline[ii]);
for(var j=0;j<timeline[ii].length;j++) {
- occupancy=timeStepOccupancy[ii][j];
+ if(ii<timeStepOccupancy.length){
+ occupancy=timeStepOccupancy[ii+1][j];
+ }
+ console.log("update occupancy to timestep "+ii);
// console.log(occupancy);
if(timeline[ii][j].addRemove){
addNode(timeline[ii][j].x,timeline[ii][j].y,timeline[ii][j].z,true);
@@ -91,12 +102,14 @@ function replay(currValue){
removeNode(timeline[ii][j].x,timeline[ii][j].y,timeline[ii][j].z,true);
}
}
+
+
}
}else{
// console.log("No Replay!");
}
- timeStep=currValue;
- // console.log(timeStep);
+ timeStep=parseInt(currValue);
+
}
\ No newline at end of file
--
GitLab