refactor: recursive tree components

Author: TamimEhsan

src/app/recursion-tree/edge.jsx src/app/common/tree/edge.jsxsrc/app/recursion-tree/edge.jsx renamed to src/app/common/tree/edge.jsx

@@ -1,6 +1,6 @@
 import React, {Component} from 'react';
 
-class Edge extends Component {
+class TreeEdge extends Component {
     constructor() {
         super();
         this.state={
@@ -91,4 +91,4 @@ class Edge extends Component {
     }
 }
 
-export default Edge;
+export default TreeEdge;

src/app/recursion-tree/vertex.jsx src/app/common/tree/vertex.jsxsrc/app/recursion-tree/vertex.jsx renamed to src/app/common/tree/vertex.jsx

@@ -1,6 +1,6 @@
 import React, {Component} from 'react';
 
-class Vertex extends Component {
+class TreeVertex extends Component {
 
     constructor() {
         super();
@@ -80,4 +80,4 @@ function sleep(ms) {
     return new Promise(resolve => setTimeout(resolve, ms));
 }
 
-export default Vertex;
+export default TreeVertex;

src/app/recursion-tree/bst.js

@@ -1,6 +1,6 @@
 import { Component } from 'react';
-import Edge from "./edge";
-import Vertex from "./vertex";
+import TreeEdge from "../common/tree/edge";
+import TreeVertex from "../common/tree/vertex";
 
 class CanvasSvg extends Component {
     constructor() {
@@ -28,7 +28,7 @@ class CanvasSvg extends Component {
                     {
                         this.props.edges.map((edge, cellidx) => {
                             return (
-                                <Edge
+                                <TreeEdge
                                     key={cellidx}
                                     id={cellidx}
                                     pos={{
@@ -42,7 +42,7 @@ class CanvasSvg extends Component {
                     {
                         this.props.vertices.map((vertex, cellidx) => {
                             return (
-                                <Vertex
+                                <TreeVertex
                                     key={cellidx}
                                     id={cellidx}
                                     current={this.props.current === cellidx}

src/app/recursion-tree/canvasSVG.jsx

@@ -1,4 +1,5 @@
-import {Tree,buchheim} from './Tree';
+import {TreeNode,buchheim} from '@/lib/tree/Tree';
+
 export function getTree(n,algo=0,r=0){
     if(algo === 0)
         return buchheim( fib(n) );
@@ -13,7 +14,7 @@ export function getTree(n,algo=0,r=0){
 }
 
 function fib(n){
-    let tree = new Tree(n,[],n+"");
+    let tree = new TreeNode(n,[],n+"");
     if( n <2 ) return tree;
     tree.children.push( fib(n-1) );
     tree.children.push( fib(n-2) );
@@ -22,7 +23,7 @@ function fib(n){
 }
 
 function sib(n){
-    let tree = new Tree(n,[]);
+    let tree = new TreeNode(n,[]);
     if( n <3 ) return tree;
     tree.children.push( sib(n-2) );
     tree.children.push( sib(n-3) );
@@ -32,36 +33,36 @@ function sib(n){
 
 function NcR(n,r){
     if (r > n)
-        return new Tree(-1,[],"("+n+","+r+")");
+        return new TreeNode(-1,[],"("+n+","+r+")");
 
     if (n === r)
-        return new Tree(1,[],"("+n+","+r+")");
+        return new TreeNode(1,[],"("+n+","+r+")");
 
     if (r === 0)
-        return new Tree(1,[],"("+n+","+r+")");;
+        return new TreeNode(1,[],"("+n+","+r+")");;
 
     // nCr(n, r) = nCr(n - 1, r - 1) + nCr(n - 1, r)
-    let tree = new Tree(0,[],"("+n+","+r+")");
+    let tree = new TreeNode(0,[],"("+n+","+r+")");
     tree.children.push( NcR(n-1,r-1) );
     tree.children.push( NcR(n-1,r) );
     tree.node = tree.children[0].node+tree.children[1].node;
     return tree;
 }
 
 function derangement(n){
-    if( n == 0 ) return new Tree(1,[],n+"");
-    if( n == 1 ) return new Tree(0,[],n+"");
-    let tree = new Tree(0,[],n+"");
+    if( n == 0 ) return new TreeNode(1,[],n+"");
+    if( n == 1 ) return new TreeNode(0,[],n+"");
+    let tree = new TreeNode(0,[],n+"");
     tree.children.push( derangement(n-1) );
     tree.children.push( derangement(n-2) );
     tree.node = (n-1)*(tree.children[0].node+tree.children[1].node);
     return tree;
 }
 
 function bigmod(n,r){
-    if( r === 0 ) return new Tree(1,[],"("+n+","+r+")");
-    if( r === 1 ) return new Tree(n,[],"("+n+","+r+")");
-    let tree = new Tree(1,[],"("+n+","+r+")");
+    if( r === 0 ) return new TreeNode(1,[],"("+n+","+r+")");
+    if( r === 1 ) return new TreeNode(n,[],"("+n+","+r+")");
+    let tree = new TreeNode(1,[],"("+n+","+r+")");
     if( r%2 === 1 ){
         tree.children.push( bigmod(n,(r-1)/2 ) );
         tree.children.push( bigmod(n,(r-1)/2) );
@@ -77,10 +78,10 @@ function bigmod(n,r){
 }
 
 function stirling2(n,r){
-    if( n === r ) return new Tree(1,[],"("+n+","+r+")");
-    if( r === 0 ) return new Tree(0,[],"("+n+","+r+")");
+    if( n === r ) return new TreeNode(1,[],"("+n+","+r+")");
+    if( r === 0 ) return new TreeNode(0,[],"("+n+","+r+")");
 
-    let tree = new Tree(0,[],"("+n+","+r+")");
+    let tree = new TreeNode(0,[],"("+n+","+r+")");
     tree.children.push( stirling2(n-1,r) );
     tree.children.push( stirling2(n-1,r-1) );
     tree.node = tree.children[0].node*r+tree.children[1].node;

src/app/recursion-tree/fib.jsx

@@ -1,7 +1,7 @@
 // draw tree class functions start :/
 
 
-export class Tree{
+export class TreeNode {
     constructor(node=0,children=[],label="") {
         this.id = 0;
         this.node = node;