Skip to content
Snippets Groups Projects
Commit f7e7a0f5 authored by Julian Matschinske's avatar Julian Matschinske
Browse files

Fix betweenness

parent 74e7ba16
No related branches found
No related tags found
No related merge requests found
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
<p *ngIf="wrapper.data.inTrial"> <p *ngIf="wrapper.data.inTrial">
<b>In trial(s) </b> <span class="icon is-small"><i class="fas fa-check"></i></span> <b>In trial(s) </b> <span class="icon is-small"><i class="fas fa-check"></i></span>
</p> </p>
<div *ngIf="wrapper.data.trialLinks.length > 0" class="list"> <div *ngIf="wrapper.data.inTrial && wrapper.data.trialLinks.length > 0" class="list">
<div *ngFor="let link of wrapper.data.trialLinks" class="list-item"> <div *ngFor="let link of wrapper.data.trialLinks" class="list-item">
<a [href]="link" target="_blank">{{beautify(link)}}</a> <a [href]="link" target="_blank">{{beautify(link)}}</a>
</div> </div>
......
...@@ -331,6 +331,36 @@ ...@@ -331,6 +331,36 @@
</div> </div>
</div> </div>
<div class="field">
<label class="label" for="betweenness-md">Maximum degree</label>
<div class="control">
<input [(ngModel)]="betweennessMaxDeg" id="betweenness-md" class="input" type="number"
placeholder="Maximum degree" min="0" max="1" required>
</div>
<p class="help">
All nodes with degree greater than this value will be ignored. Disabled if equal to 0.
</p>
</div>
<div class="field">
<label class="label" for="betweenness-hp">Hub penalty</label>
<div class="control">
<input [(ngModel)]="betweennessHubPenalty" id="betweenness-hp" class="input" type="number"
placeholder="Maximum degree" min="0" max="1" required>
</div>
<p class="help">
Penalty parameter for hubs.
</p>
</div>
<div class="field">
<label class="label">Include non-seed viral proteins</label>
<app-toggle textOn="Include" textOff="Ignore"
tooltipOn="Include viral proteins that are not seeds."
tooltipOff="Exclude viral proteins that are not seeds."
[(value)]="betweennessIncludeViralNonSeeds"></app-toggle>
</div>
<div class="box"> <div class="box">
<article class="media"> <article class="media">
<div class="media-left"> <div class="media-left">
......
...@@ -61,6 +61,9 @@ export class LaunchAnalysisComponent implements OnInit, OnChanges { ...@@ -61,6 +61,9 @@ export class LaunchAnalysisComponent implements OnInit, OnChanges {
public proximityResultSize = 20; public proximityResultSize = 20;
// Betweenness Parameters // Betweenness Parameters
public betweennessIncludeViralNonSeeds = true;
public betweennessMaxDeg = 0;
public betweennessHubPenalty = 0.0;
public betweennessResultSize = 20; public betweennessResultSize = 20;
// Keypathwayminer Parameters // Keypathwayminer Parameters
...@@ -144,6 +147,11 @@ export class LaunchAnalysisComponent implements OnInit, OnChanges { ...@@ -144,6 +147,11 @@ export class LaunchAnalysisComponent implements OnInit, OnChanges {
parameters.hub_penalty = this.proximityHubPenalty; parameters.hub_penalty = this.proximityHubPenalty;
parameters.result_size = this.proximityResultSize; parameters.result_size = this.proximityResultSize;
} else if (this.algorithm === 'betweenness') { } else if (this.algorithm === 'betweenness') {
parameters.ignore_non_seed_baits = !this.betweennessIncludeViralNonSeeds;
if (this.betweennessMaxDeg && this.betweennessMaxDeg > 0) {
parameters.max_deg = this.betweennessMaxDeg;
}
parameters.hub_penalty = this.betweennessHubPenalty;
parameters.result_size = this.betweennessResultSize; parameters.result_size = this.betweennessResultSize;
} else if (this.algorithm === 'keypathwayminer') { } else if (this.algorithm === 'keypathwayminer') {
parameters.k = this.keypathwayminerK; parameters.k = this.keypathwayminerK;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment