Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

N2 detecting offscreen connections #1114

Merged
merged 6 commits into from Nov 13, 2019
Merged

N2 detecting offscreen connections #1114

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
99aac13
Merge pull request #17 from OpenMDAO/master
tadkollar Nov 4, 2019
d8835b4
Merge pull request #19 from tadkollar/n2conn
tadkollar Nov 4, 2019
b788865
Computing whole matrix once, using offsets to find matrix cells
tadkollar Nov 6, 2019
d52c7b0
Added ability to detect offscreen connections.
tadkollar Nov 11, 2019
47d85a2
Updated a few inline docs.
tadkollar Nov 12, 2019
0e63aa6
Added a small comment
tadkollar Nov 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
130 changes: 65 additions & 65 deletions openmdao/visualization/n2_viewer/src/ModelData.js
View file
Open in desktop
Expand Up @@ -12,35 +12,36 @@ class ModelData {
this.maxDepth = 1;
this.idCounter = 0;
this.unconnectedParams = 0;
this.nodePaths = {};

console.time('ModelData._convertToN2TreeNodes');
startTimer('ModelData._convertToN2TreeNodes');
this.root = this.tree = modelJSON.tree = this._convertToN2TreeNodes(modelJSON.tree);
console.timeEnd('ModelData._convertToN2TreeNodes');
stopTimer('ModelData._convertToN2TreeNodes');

console.time('ModelData._expandColonVars');
startTimer('ModelData._expandColonVars');
this._expandColonVars(this.root);
console.timeEnd('ModelData._expandColonVars');
stopTimer('ModelData._expandColonVars');

console.time('ModelData._flattenColonGroups');
startTimer('ModelData._flattenColonGroups');
this._flattenColonGroups(this.root);
console.timeEnd('ModelData._flattenColonGroups');
stopTimer('ModelData._flattenColonGroups');

console.time('ModelData._setParentsAndDepth');
startTimer('ModelData._setParentsAndDepth');
this._setParentsAndDepth(this.root, null, 1);
console.timeEnd('ModelData._setParentsAndDepth');
stopTimer('ModelData._setParentsAndDepth');

if (this.unconnectedParams > 0)
console.info("Unconnected nodes: ", this.unconnectedParams);

console.time('ModelData._initSubSystemChildren');
startTimer('ModelData._initSubSystemChildren');
this._initSubSystemChildren(this.root);
console.timeEnd('ModelData._initSubSystemChildren');
stopTimer('ModelData._initSubSystemChildren');

console.time('ModelData._computeConnections');
startTimer('ModelData._computeConnections');
this._computeConnections();
console.timeEnd('ModelData._computeConnections');
stopTimer('ModelData._computeConnections');

// console.log("New model: ", modelJSON);
debugInfo("New model: ", this);
// this.errorCheck();
}

Expand All @@ -50,11 +51,11 @@ class ModelData {
*/
errorCheck(node = this.root) {
if (!(node instanceof N2TreeNode))
console.log('Node with problem: ', node);
debugInfo('Node with problem: ', node);

for (let prop of ['parent', 'originalParent', 'parentComponent']) {
if (node[prop] && !(node[prop] instanceof N2TreeNode))
console.log('Node with problem ' + prop + ': ', node);
debugInfo('Node with problem ' + prop + ': ', node);
}

if (node.hasChildren()) {
Expand All @@ -76,7 +77,8 @@ class ModelData {
for (let i = 0; i < newNode.children.length; ++i) {
newNode.children[i] = this._convertToN2TreeNodes(newNode.children[i]);
newNode.children[i].parent = newNode;
if (exists(newNode.children[i].parentComponent)) newNode.children[i].parentComponent = newNode;
if (exists(newNode.children[i].parentComponent))
newNode.children[i].parentComponent = newNode;
}
}

Expand Down Expand Up @@ -197,6 +199,8 @@ class ModelData {
node.absPathName += (node.parent.splitByColon) ? ":" : ".";
}
node.absPathName += node.name;

this.nodePaths[node.absPathName] = node;
}

this.identifyUnconnectedParam(node);
Expand Down Expand Up @@ -356,9 +360,7 @@ class ModelData {
* @param {N2TreeNode[]} objArray Array to add to.
*/
_addLeaves(node, objArray) {
if (!node.isParam()) {
objArray.push(node);
}
if (!node.isParam()) { objArray.push(node); }

if (node.hasChildren()) {
for (let child of node.children) {
Expand All @@ -368,89 +370,87 @@ class ModelData {
}

/**
* Iterate over the connections list, and find the two objects that
* make up each connection.
* Iterate over the connections list, and find the objects that make up
* each connection, and do some error checking. Store an array containing the
* target object and all of its parents in the source object and all of *its*
* parents. In the target object, store an array containing references to
* the begin and end of all the cycle arrows.
*/
_computeConnections() {
let sysPathnames = this.sysPathnamesList;
let throwLbl = 'ModelData._computeConnections: ';

for (let conn of this.conns) {
// Process sources
let srcSplitArray = conn.src.split(/\.|:/);
let srcObj = this._getObjectInTree(this.root, srcSplitArray, 0);
let srcObj = this.nodePaths[conn.src];
if (!srcObj)
throw (throwLbl + "Cannot find connection source " + conn.src);

if (srcObj == null)
throw ("Cannot find connection source " + conn.src);
let srcObjParents = [srcObj];
if (!srcObj.isUnknown()) // source obj must be unknown
throw (throwLbl + "Found a source that is not an unknown.");

let srcObjArray = [srcObj];
if (srcObj.type !== "unknown") // source obj must be unknown
throw ("There is a source that is not an unknown.");

if (srcObj.hasChildren()) throw ("There is a source that has children.");
if (srcObj.hasChildren())
throw (throwLbl + "Found a source that has children.");

for (let obj = srcObj.parent; obj != null; obj = obj.parent) {
srcObjArray.push(obj);
srcObjParents.push(obj);
}

// Process targets
let tgtSplitArray = conn.tgt.split(/\.|:/);
let tgtObj = this._getObjectInTree(this.root, tgtSplitArray, 0);

if (tgtObj == null) throw ("Cannot find connection target " + conn.tgt);
let tgtObj = this.nodePaths[conn.tgt];
if (!tgtObj)
throw (throwLbl + "Cannot find connection target " + conn.tgt);

let tgtObjArrayParamView = [tgtObj];
let tgtObjArrayHideParams = [tgtObj];

// Target obj must be a param
if (!tgtObj.isParam()) throw ("There is a target that is NOT a param.");

if (tgtObj.hasChildren()) throw ("There is a target that has children.");
if (!tgtObj.isParam())
throw (throwLbl + "Found a target that is NOT a param.");
if (tgtObj.hasChildren())
throw (throwLbl + "Found a target that has children.");

if (!tgtObj.parentComponent)
throw ("Target object " + conn.tgt + " has missing parentComponent.");
throw (throwLbl + "Target object " + conn.tgt +
" is missing a parentComponent.");

this._addLeaves(tgtObj.parentComponent, tgtObjArrayHideParams); //contaminate
for (let obj = tgtObj.parent; obj != null; obj = obj.parent) {
tgtObjArrayParamView.push(obj);
tgtObjArrayHideParams.push(obj);
let tgtObjParents = [tgtObj];
for (let parentObj = tgtObj.parent; parentObj != null; parentObj = parentObj.parent) {
tgtObjParents.push(parentObj);
}

for (let srcObj of srcObjArray) {
if (!srcObj.hasOwnProperty('targetsParamView'))
srcObj.targetsParamView = new Set();
if (!srcObj.hasOwnProperty('targetsHideParams'))
srcObj.targetsHideParams = new Set();

tgtObjArrayParamView.forEach(item => srcObj.targetsParamView.add(item));
tgtObjArrayHideParams.forEach(item => srcObj.targetsHideParams.add(item));
for (let srcParent of srcObjParents) {
for (let tgtParent of tgtObjParents) {
srcParent.targetParentSet.add(tgtParent);
}
}

let cycleArrowsArray = [];
/*
* The cycle_arrows object in each connection is an array of length-2 arrays,
* each of which is an index into the sysPathnames array. Using that array we
* can resolve the indexes to pathnames to the associated objects.
*/
if (Array.isPopulatedArray(conn.cycle_arrows)) {
let cycleArrowsArray = [];
let cycleArrows = conn.cycle_arrows;
for (let cycleArrow of cycleArrows) {
if (cycleArrow.length != 2)
throw ("cycleArrowsSplitArray length not 2, got " +
throw (throwLbl + "cycleArrowsSplitArray length not 2, got " +
cycleArrow.length + ": " + cycleArrow);

let srcPathname = sysPathnames[cycleArrow[0]];
let tgtPathname = sysPathnames[cycleArrow[1]];

let splitArray = srcPathname.split(/\.|:/);
let arrowBeginObj = this._getObjectInTree(this.root, splitArray, 0);
if (arrowBeginObj == null)
throw ("Cannot find cycle arrows begin object " + srcPathname);
let arrowBeginObj = this.nodePaths[srcPathname];
if (!arrowBeginObj)
throw (throwLbl + "Cannot find cycle arrows begin object " + srcPathname);

splitArray = tgtPathname.split(/\.|:/);
let arrowEndObj = this._getObjectInTree(this.root, splitArray, 0);
if (arrowEndObj == null)
throw ("Cannot find cycle arrows end object " + tgtPathname);
let arrowEndObj = this.nodePaths[tgtPathname];
if (!arrowEndObj)
throw (throwLbl + "Cannot find cycle arrows end object " + tgtPathname);

cycleArrowsArray.push({ "begin": arrowBeginObj, "end": arrowEndObj });
}
}

if (cycleArrowsArray.length > 0) {
if (!tgtObj.parent.hasOwnProperty("cycleArrows")) {
tgtObj.parent.cycleArrows = [];
}
Expand Down
7 changes: 3 additions & 4 deletions openmdao/visualization/n2_viewer/src/N2Diagram.js
View file
Open in desktop
Expand Up @@ -64,6 +64,8 @@ class N2Diagram {
this.matrix = new N2Matrix(this.model, this.layout, this.dom.n2Groups,
true, this.ui.findRootOfChangeFunction);

// this.matrixMax = this.matrix;

// TODO: Move to N2Layout
this.scales = {
'unit': 'px',
Expand Down Expand Up @@ -147,11 +149,7 @@ class N2Diagram {
*/
updateZoomedElement(newZoomedElement) {
this.zoomedElementPrev = this.zoomedElement;

// TODO: Stop updating the global zoomedElement when we
// implement a different place to put it.
this.zoomedElement = newZoomedElement;

this.layout.zoomedElement = this.zoomedElement;
}

Expand Down Expand Up @@ -555,6 +553,7 @@ class N2Diagram {
this.layout = new N2Layout(this.model, this.zoomedElement,
this.showLinearSolverNames, this.dims);
this.ui.updateClickedIndices();

this.matrix = new N2Matrix(this.model, this.layout,
this.dom.n2Groups, this.ui.lastClickWasLeft,
this.ui.findRootOfChangeFunction, this.matrix.nodeSize);
Expand Down
40 changes: 19 additions & 21 deletions openmdao/visualization/n2_viewer/src/N2Layout.js
View file
Open in desktop
Expand Up @@ -41,40 +41,40 @@ class N2Layout {
this.svg = d3.select("#svgId");

this._setupTextRenderer();
console.time('N2Layout._updateTextWidths');
startTimer('N2Layout._updateTextWidths');
this._updateTextWidths();
console.timeEnd('N2Layout._updateTextWidths');
stopTimer('N2Layout._updateTextWidths');

console.time('N2Layout._updateSolverTextWidths');
startTimer('N2Layout._updateSolverTextWidths');
this._updateSolverTextWidths();
console.timeEnd('N2Layout._updateSolverTextWidths');
stopTimer('N2Layout._updateSolverTextWidths');
delete (this.textRenderer);

console.time('N2Layout._computeLeaves');
startTimer('N2Layout._computeLeaves');
this._computeLeaves();
console.timeEnd('N2Layout._computeLeaves');
stopTimer('N2Layout._computeLeaves');

console.time('N2Layout._computeColumnWidths');
startTimer('N2Layout._computeColumnWidths');
this._computeColumnWidths();
console.timeEnd('N2Layout._computeColumnWidths');
stopTimer('N2Layout._computeColumnWidths');

console.time('N2Layout._computeSolverColumnWidths');
startTimer('N2Layout._computeSolverColumnWidths');
this._computeSolverColumnWidths();
console.timeEnd('N2Layout._computeSolverColumnWidths');
stopTimer('N2Layout._computeSolverColumnWidths');

console.time('N2Layout._setColumnLocations');
startTimer('N2Layout._setColumnLocations');
this._setColumnLocations();
console.timeEnd('N2Layout._setColumnLocations');
stopTimer('N2Layout._setColumnLocations');

console.time('N2Layout._computeNormalizedPositions');
startTimer('N2Layout._computeNormalizedPositions');
this._computeNormalizedPositions(this.model.root, 0, false, null);
console.timeEnd('N2Layout._computeNormalizedPositions');
stopTimer('N2Layout._computeNormalizedPositions');
if (this.zoomedElement.parent)
this.zoomedNodes.push(this.zoomedElement.parent);

console.time('N2Layout._computeSolverNormalizedPositions');
startTimer('N2Layout._computeSolverNormalizedPositions');
this._computeSolverNormalizedPositions(this.model.root, 0, false, null);
console.timeEnd('N2Layout._computeSolverNormalizedPositions');
stopTimer('N2Layout._computeSolverNormalizedPositions');
if (this.zoomedElement.parent)
this.zoomedSolverNodes.push(this.zoomedElement.parent);

Expand All @@ -92,7 +92,7 @@ class N2Layout {
setTransitionPermission() {
// Too many nodes, disable transitions.
if (this.visibleNodes.length >= N2TransitionDefaults.maxNodes) {
console.log("Denying transitions: ", this.visibleNodes.length,
debugInfo("Denying transitions: ", this.visibleNodes.length,
" visible nodes, max allowed: ", N2TransitionDefaults.maxNodes)

// Return if already denied
Expand All @@ -104,7 +104,7 @@ class N2Layout {
d3.selection.prototype.delay = returnThis;
}
else { // OK, enable transitions.
console.log("Allowing transitions: ", this.visibleNodes.length,
debugInfo("Allowing transitions: ", this.visibleNodes.length,
" visible nodes, max allowed: ", N2TransitionDefaults.maxNodes)

// Return if already allowed
Expand Down Expand Up @@ -344,8 +344,6 @@ class N2Layout {
* merged as much as possible.
*/

/** TODO: Document what the *0 variables are for */

/** Recurse over the model tree and determine the coordinates and
* size of visible nodes. If a parent is minimized, operations are
* performed on it instead.
Expand All @@ -363,7 +361,7 @@ class N2Layout {

if (earliestMinimizedParent == null && isChildOfZoomed) {
if (!node.varIsHidden) this.zoomedNodes.push(node);
if (!node.hasChildren() || node.isMinimized) { //at a "leaf" node
if (!node.hasChildren() || node.isMinimized) { // at a "leaf" node
if (!node.varIsHidden) this.visibleNodes.push(node);
earliestMinimizedParent = node;
}
Expand Down