diff options
| -rw-r--r-- | frontend/src/app/_elements/annvisual/annvisual.component.ts | 13 | ||||
| -rw-r--r-- | frontend/src/app/_pages/my-models/my-models.component.html | 1 | ||||
| -rw-r--r-- | frontend/src/app/app.module.ts | 4 |
3 files changed, 12 insertions, 6 deletions
diff --git a/frontend/src/app/_elements/annvisual/annvisual.component.ts b/frontend/src/app/_elements/annvisual/annvisual.component.ts index ff5b45d6..8588537e 100644 --- a/frontend/src/app/_elements/annvisual/annvisual.component.ts +++ b/frontend/src/app/_elements/annvisual/annvisual.component.ts @@ -19,13 +19,13 @@ export class AnnvisualComponent implements OnInit { let hiddenlayerstring:string=''; let digraphstring:string='digraph {'; - for(let i=0;i<this.model.inputNeurons;i++) + for(let i=0;i<this.model.inputColumns.length;i++) { inputlayerstring=inputlayerstring+'i'+i+','; } inputlayerstring=inputlayerstring.slice(0,-1); - digraphstring=digraphstring+'->'; + digraphstring=digraphstring+inputlayerstring+'->'; for(let j=0;j<this.model.hiddenLayers;j++) { @@ -33,15 +33,18 @@ export class AnnvisualComponent implements OnInit { { hiddenlayerstring=hiddenlayerstring+'h'+j+'_'+i+','; } - hiddenlayerstring=hiddenlayerstring.slice(0,1); + hiddenlayerstring=hiddenlayerstring.slice(0,-1); digraphstring=digraphstring+hiddenlayerstring+'->'; hiddenlayerstring=''; } digraphstring=digraphstring+'o}'; - alert(digraphstring); + graphviz('#graph').renderDot(digraphstring); } - + //'digraph {i0,i1,i2->h1,h2,h3->h21,h22,h23->o}' } + + + diff --git a/frontend/src/app/_pages/my-models/my-models.component.html b/frontend/src/app/_pages/my-models/my-models.component.html index b6926771..e2533d89 100644 --- a/frontend/src/app/_pages/my-models/my-models.component.html +++ b/frontend/src/app/_pages/my-models/my-models.component.html @@ -8,6 +8,7 @@ <div class="row"> <div class="col-sm-4" style="margin-bottom: 10px;" *ngFor="let model of myModels"> <app-item-model [model]="model"></app-item-model> + <app-annvisual align-items-center [model]="model" style="width: 100%;"></app-annvisual> <div style="width: 25%; margin: auto;"> <button mat-raised-button color="primary" (click)="deleteThisModel(model)" style="margin-top: 3px; width: 100%;">ObriĊĦi</button> diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts index 5d7af9d2..4efab17e 100644 --- a/frontend/src/app/app.module.ts +++ b/frontend/src/app/app.module.ts @@ -38,6 +38,7 @@ import { DatatableComponent } from './_elements/datatable/datatable.component'; import { FilterDatasetsComponent } from './_pages/filter-datasets/filter-datasets.component'; import { ReactiveBackgroundComponent } from './_elements/reactive-background/reactive-background.component'; import { ItemModelComponent } from './_elements/item-model/item-model.component'; +import { AnnvisualComponent } from './_elements/annvisual/annvisual.component'; @NgModule({ declarations: [ @@ -65,7 +66,8 @@ import { ItemModelComponent } from './_elements/item-model/item-model.component' DatatableComponent, FilterDatasetsComponent, ReactiveBackgroundComponent, - ItemModelComponent + ItemModelComponent, + AnnvisualComponent ], imports: [ BrowserModule, |