Skip to content

Commit

Permalink
Some tree algorithms removed.
Browse files Browse the repository at this point in the history
  • Loading branch information
Nyckoka committed Jul 5, 2023
1 parent 23b1a30 commit c748e16
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 37 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ const datasetDescriptions = {
[TypingDataType.MLVA]: "The dataset type MLVA is designed to analyze MLVA data using its common allelic profiles " +
"formats and adds extra distance metrics to the analyses options.",

[TypingDataType.FASTA]: "The dataset type Aligned Sequences (FASTA) is designed to analyze sequence data " +
/*[TypingDataType.FASTA]: "The dataset type Aligned Sequences (FASTA) is designed to analyze sequence data " +
"available in FASTA format. The sequences need to be all of the same size. " +
"Sequences of different sizes will be excluded.",
Expand All @@ -111,5 +111,5 @@ const datasetDescriptions = {
[TypingDataType.SNP_WITHOUT_EXPLICIT_ID]: "The dataset type Single Nucleotide Polymorphism (SNP) " +
"(without explicit ID) is designed to analyze SNP data based on the presence and absence of a SNP, and no " +
"explicit ID was attributed to the entire SNP profile. The sequences need to be all of the same size. " +
"Sequences of different sizes will be excluded."
"Sequences of different sizes will be excluded."*/
}
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ const typingDataExamples = {
" (...)\n" +
"This files should not contain missing data. If any allele missing data is found the entire line is discarded.",

[TypingDataType.FASTA]: "The data format for the typing data should be as follows. Load a text file containing " +
/*[TypingDataType.FASTA]: "The data format for the typing data should be as follows. Load a text file containing " +
"only the sequences. All the sequences should have the same length. A sequential ID identified will be " +
"attributed to each sequence based on the order of the sequences in the file. The Fasta header will be used " +
"to identify the isolate when you click on it. This format can also be used to analyze SNP data. An example " +
Expand All @@ -135,5 +135,5 @@ const typingDataExamples = {
[TypingDataType.SNP_WITHOUT_EXPLICIT_ID]: "The dataset type Single Nucleotide Polymorphism (SNP) (without " +
"explicit ID) is designed to analyze SNP data based on the presence and absence of a SNP, and no explicit ID " +
"was attributed to the entire SNP profile. The sequences need to be all of the same size. Sequences of " +
"different sizes will be excluded."
"different sizes will be excluded."*/
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import Typography from "@mui/material/Typography"
import {Button, Menu, MenuItem} from "@mui/material"
import * as React from "react"
import {useNavigate, useParams} from "react-router-dom"
import {WebUiUris} from "../../../Pages/WebUiUris"
import {TreesIcon} from "../../Shared/Icons";
import {computeTreeOptions} from "../ProjectStructure/Datasets/Dataset/Trees/useTreesTreeItem"

/**
* Card for the compute trees feature.
Expand All @@ -17,29 +17,6 @@ export function ComputeTreesCard() {
const open = Boolean(anchorEl)
const handleClose = () => setAnchorEl(null)

const computeTreeOptions = [
{
label: "goeBURST",
url: WebUiUris.computeGoeburst(projectId!, datasetId!)
},
{
label: "goeBURST Full MST",
url: WebUiUris.computeGoeburstFullMst(projectId!, datasetId!)
},
{
label: "Hierarchical Clustering",
url: WebUiUris.computeHierarchicalClustering(projectId!, datasetId!)
},
// {
// label: "Neighbor Joining",
// url: WebUiUris.computeNeighborJoining(projectId!, datasetId!)
// },
{
label: "nLV Graph",
url: WebUiUris.computeNlvGraph(projectId!, datasetId!)
}
]

return <Paper sx={{
p: 4,
display: "flex",
Expand Down Expand Up @@ -69,7 +46,7 @@ export function ComputeTreesCard() {
open={open}
onClose={handleClose}
>
{computeTreeOptions.map((option) => (
{computeTreeOptions(projectId!, datasetId!).map((option) => (
<MenuItem
key={option.label}
onClick={() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,22 @@ export const computeTreeOptions = (projectId: string, datasetId: string) => [
label: "goeBURST",
url: WebUiUris.computeGoeburst(projectId, datasetId)
},
{
/*{
label: "goeBURST Full MST",
url: WebUiUris.computeGoeburstFullMst(projectId, datasetId)
},
{
label: "Hierarchical Clustering",
url: WebUiUris.computeHierarchicalClustering(projectId, datasetId)
},
// {
// label: "Neighbor Joining",
// url: WebUiUris.computeNeighborJoining(projectId, datasetId)
// },
{
label: "Neighbor Joining",
url: WebUiUris.computeNeighborJoining(projectId, datasetId)
},
{
label: "nLV Graph",
url: WebUiUris.computeNlvGraph(projectId, datasetId)
}
}*/
]

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ export enum CreateDatasetStep {
export enum TypingDataType {
MLST = "Multi-Locus Sequence Typing (MLST)",
MLVA = "Multi-Locus Variable Number Tandem Repeat Analysis (MLVA)",
FASTA = "Aligned Sequences (FASTA)",
/*FASTA = "Aligned Sequences (FASTA)",
ALIGNED_SEQUENCES = "Aligned Sequences",
SNP = "Single Nucleotide Polymorphism (SNP)",
SNP_WITHOUT_EXPLICIT_ID = "Single Nucleotide Polymorphism (SNP) (without explicit ID)",
SNP_WITHOUT_EXPLICIT_ID = "Single Nucleotide Polymorphism (SNP) (without explicit ID)",*/
}


Expand Down

0 comments on commit c748e16

Please sign in to comment.