@eturnity/eturnity_maths 7.20.0 → 7.24.1

package/src/objects/graph/DFS.js

@@ -1,80 +1,80 @@
-
 // Javascript program to print DFS
 // traversal from a given
 // graph
- 
+
 // This class represents a
 // directed graph using adjacency
 // list representation
-export class Graph
-{
-     
-    // Constructor
-    //v=number of vertices
-    constructor()
-    {
-        this.visited=[]
-        this.dict= []
-        this.adj = []
-            
+export class Graph {
+  // Constructor
+  //v=number of vertices
+  constructor() {
+    this.visited = []
+    this.dict = []
+    this.adj = []
+  }
+
+  // Function to add an edge into the graph
+  addEdge(uuid1, uuid2) {
+    let v = this.dict.indexOf(uuid1)
+    let length
+    if (v == -1) {
+      length = this.dict.length
+      this.dict[length] = uuid1
+      this.adj[length] = []
+      v = length
     }
-     
-    // Function to add an edge into the graph
-    addEdge(uuid1, uuid2)
-    {
-        let v=this.dict.indexOf(uuid1)
-        let length
-        if(v==-1){
-          length=this.dict.length
-          this.dict[length]=uuid1
-          this.adj[length]=[]
-          v=length
-        }
-        let w=this.dict.indexOf(uuid2)
-        if(w==-1){
-          length=this.dict.length
-          this.dict[length]=uuid2
-          this.adj[length]=[]
-          w=length
-        }
-        // Add w to v's list.
-       if(!this.adj[v]){this.adj[v]=[]}
-       this.adj[v].push(w);
-       if(!this.adj[w]){this.adj[w]=[]}
-        this.adj[w].push(v);
+    let w = this.dict.indexOf(uuid2)
+    if (w == -1) {
+      length = this.dict.length
+      this.dict[length] = uuid2
+      this.adj[length] = []
+      w = length
     }
-     
-    // A function used by DFS
-    DFSUtil(v, visited)
-    {
-         
-        // Mark the current node as visited and print it
-        visited[v] = true;
-        this.visited.push(v)
-  
-        // Recur for all the vertices adjacent to this
-        // vertex
-        for(let i in this.adj[v])
-        {
-            let n = this.adj[v][i]
-            if (!visited[n])
-                this.DFSUtil(n, visited);
-        }
+    // Add w to v's list.
+    if (!this.adj[v]) {
+      this.adj[v] = []
     }
-     
-    // The function to do DFS traversal.
-    // It uses recursive
-    // DFSUtil()
-    DFS(uuidStart){
-        let v=this.dict.indexOf(uuidStart)
-        // Mark all the vertices as
-        // not visited(set as
-        // false by default in java)
-        let visited = [];
-        // Call the recursive helper
-        // function to print DFS
-        // traversal
-        this.DFSUtil(v, visited);
-        return [...new Set(this.visited.map((i)=>{return this.dict[i]}))]
+    this.adj[v].push(w)
+    if (!this.adj[w]) {
+      this.adj[w] = []
     }
+    this.adj[w].push(v)
+  }
+
+  // A function used by DFS
+  DFSUtil(v, visited) {
+    // Mark the current node as visited and print it
+    visited[v] = true
+    this.visited.push(v)
+
+    // Recur for all the vertices adjacent to this
+    // vertex
+    for (let i in this.adj[v]) {
+      let n = this.adj[v][i]
+      if (!visited[n]) this.DFSUtil(n, visited)
+    }
+  }
+
+  // The function to do DFS traversal.
+  // It uses recursive
+  // DFSUtil()
+  DFS(uuidStart) {
+    let v = this.dict.indexOf(uuidStart)
+    // Mark all the vertices as
+    // not visited(set as
+    // false by default in java)
+    let visited = []
+    // Call the recursive helper
+    // function to print DFS
+    // traversal
+    this.DFSUtil(v, visited)
+    return [
+      ...new Set(
+        this.visited.map((i) => {
+          return this.dict[i]
+        })
+      )
+    ]
+  }
 }

package/src/objects/graph/graphCreation.js

@@ -1,44 +1,47 @@
-import {Graph} from './DFS'
-import {
-    isSameSegment2D,
-  } from '../../geometry'
-  
-export function generateGraph(polygons){
-    const edges2D=[]
-    const g=new Graph()
-    polygons
-      .filter((poly) => poly.layer=='roof')
-      .forEach((polygon,index) => {
-        g.dict.push(polygon.id)
-        const outline = polygon.outline
-        outline.forEach((point, i) => {
-          //check if edge2D already exist
-          const nextPoint = outline[(i + 1) % outline.length]
-          let edge2D = edges2D.find((edge) => {
-            return (
-              isSameSegment2D([point, nextPoint], edge.outline)
-            )
-          })
-          if (!edge2D) {
-            //create an edge at this position
-            edge2D = {}
-            edge2D.outline=[point, nextPoint]
-            edge2D.belongsTo = []
-            edges2D.push(edge2D)
-          }
-          //add BelongToPolygon
-          edge2D.belongsTo.push({
-            polygonId: polygon.id,
-            index: i,
-            polygon
-          })
-        })
-      })
-    for(let k in edges2D){
-        let edge=edges2D[k]
-        if(edge.belongsTo.length==2){
-            g.addEdge(edge.belongsTo[0].polygonId,edge.belongsTo[1].polygonId)
-        }
-    }  
-    return g
-}
+import { Graph } from './DFS'
+import { isSameSegment2D } from '../../geometry'
+
+export function generateGraph(polygons, {includingRoofOnRoofs = true} = {}) {
+	const edges2D = []
+	const g = new Graph()
+	polygons
+		.filter((poly) => poly.layer == 'roof')
+		.forEach((polygon, index) => {
+			g.dict.push(polygon.id)
+			const outline = polygon.outline
+			outline.forEach((point, i) => {
+				//check if edge2D already exist
+				const nextPoint = outline[(i + 1) % outline.length]
+				let edge2D = edges2D.find((edge) => {
+					return isSameSegment2D([point, nextPoint], edge.outline)
+				})
+				if (!edge2D) {
+					//create an edge at this position
+					edge2D = {}
+					edge2D.outline = [point, nextPoint]
+					edge2D.belongsTo = []
+					edges2D.push(edge2D)
+				}
+				//add BelongToPolygon
+				edge2D.belongsTo.push({
+					polygonId: polygon.id,
+					index: i,
+					polygon
+				})
+				if (includingRoofOnRoofs && polygon.roofs && polygon.roofs.length == 1) {
+					edge2D.belongsTo.push({
+						polygonId: polygon.roofs[0].id,
+						index: null,
+						polygon: polygon.roofs[0]
+					})
+				}
+			})
+		})
+	for (let k in edges2D) {
+		let edge = edges2D[k]
+		if (edge.belongsTo.length == 2) {
+			g.addEdge(edge.belongsTo[0].polygonId, edge.belongsTo[1].polygonId)
+		}
+	}
+	return g
+}

package/src/objects/hydrate.js

@@ -1,26 +1,26 @@
-import { Polygon } from "./Polygon"
-export function hydratePolygon(serializedPolygon){
-    const layer=serializedPolygon.layer
-    let polygon=new Polygon(serializedPolygon.outline,layer)
-    polygon.id=serializedPolygon.id
-    polygon.version=serializedPolygon.version
-    polygon.name=serializedPolygon.name
-    polygon.margins=serializedPolygon.margins
-    if(layer=="obstacle"){
-      polygon.isParallel=serializedPolygon.isParallel
-      polygon.height=serializedPolygon.height
-    }else if(layer=="moduleField"){
-      polygon.data=serializedPolygon.data
-      polygon.pvData=serializedPolygon.pvData
-      polygon.mountingData=serializedPolygon.mountingData
-      polygon.panels=[]
-      polygon.userDeactivatedPanels=[]
-    }else if(layer=="panel"){
-      polygon.index=serializedPolygon.index
-      polygon.moduleField=serializedPolygon.moduleField
-    }else if(layer=="user_deactivated_panel"){
-      polygon.index=serializedPolygon.index
-      polygon.moduleField=serializedPolygon.moduleField
-    }
-    return polygon
-  }
+import { Polygon } from './Polygon'
+export function hydratePolygon(serializedPolygon) {
+  const layer = serializedPolygon.layer
+  let polygon = new Polygon(serializedPolygon.outline, layer)
+  polygon.id = serializedPolygon.id
+  polygon.version = serializedPolygon.version
+  polygon.name = serializedPolygon.name
+  polygon.margins = serializedPolygon.margins
+  if (layer == 'obstacle') {
+    polygon.isParallel = serializedPolygon.isParallel
+    polygon.height = serializedPolygon.height
+  } else if (layer == 'moduleField') {
+    polygon.data = serializedPolygon.data
+    polygon.pvData = serializedPolygon.pvData
+    polygon.mountingData = serializedPolygon.mountingData
+    polygon.panels = []
+    polygon.userDeactivatedPanels = []
+  } else if (layer == 'panel') {
+    polygon.index = serializedPolygon.index
+    polygon.moduleField = serializedPolygon.moduleField
+  } else if (layer == 'user_deactivated_panel') {
+    polygon.index = serializedPolygon.index
+    polygon.moduleField = serializedPolygon.moduleField
+  }
+  return polygon
+}

package/src/snap.js

@@ -1,24 +1,30 @@
-import { addVector, crossProduct, dotProduct, multiplyVector, vectorLength } from "./vector";
+import {
+  addVector,
+  crossProduct,
+  dotProduct,
+  multiplyVector,
+  vectorLength
+} from './vector'
 
-export function snapRayToLine(ray,line){
-    // Variables to record and compare
+export function snapRayToLine(ray, line) {
+  // Variables to record and compare
 
-    var u = ray.direction; 
-    var A = ray.origin;
-    var v = line.direction; 
-    var B = line.origin; 
+  var u = ray.direction
+  var A = ray.origin
+  var v = line.direction
+  var B = line.origin
 
-    let n=crossProduct(v,u)
-    let AB=substractVector(B,A)
-    let dot=dotProduct(n,AB)
-    let nLength=vectorLength(n)
-    let distance=Math.abs(dot/nLength)
+  let n = crossProduct(v, u)
+  let AB = substractVector(B, A)
+  let dot = dotProduct(n, AB)
+  let nLength = vectorLength(n)
+  let distance = Math.abs(dot / nLength)
 
-    let t1=dotProduct(crossProduct(v,n),AB)/dotProduct(n,n)
-    let t2=dotProduct(crossProduct(u,n),AB)/dotProduct(n,n)
+  let t1 = dotProduct(crossProduct(v, n), AB) / dotProduct(n, n)
+  let t2 = dotProduct(crossProduct(u, n), AB) / dotProduct(n, n)
 
-    let M=addVector(A,multiplyVector(t1,u))
-    let N=addVector(B,multiplyVector(t2,v))
+  let M = addVector(A, multiplyVector(t1, u))
+  let N = addVector(B, multiplyVector(t2, v))
 
-    return {distance,pointOnRay:M,pointOnLine:N}
-}
+  return { distance, pointOnRay: M, pointOnLine: N }
+}