diff --git a/.github/workflows/ci-cd-develop.yml b/.github/workflows/ci-cd-develop.yml index eab021d..a97abc3 100644 --- a/.github/workflows/ci-cd-develop.yml +++ b/.github/workflows/ci-cd-develop.yml @@ -9,11 +9,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Clone repo (shallow) - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Set up node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 16 - name: Install dependencies @@ -24,11 +24,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Clone repo (shallow) - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Set up node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 16 - name: Install dependencies @@ -39,11 +39,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Clone repo (shallow) - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Set up node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 16 - name: Install dependencies @@ -59,7 +59,7 @@ jobs: if: ${{ github.ref == 'refs/heads/develop' }} steps: - name: Cloning repo - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/.github/workflows/deploy-main.yml b/.github/workflows/deploy-main.yml index 7d5cbd8..212140c 100644 --- a/.github/workflows/deploy-main.yml +++ b/.github/workflows/deploy-main.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cloning repo - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/src/api/data-model/ProblemSolverInfo.ts b/src/api/data-model/ProblemSolverInfo.ts index dc83213..37d55e7 100644 --- a/src/api/data-model/ProblemSolverInfo.ts +++ b/src/api/data-model/ProblemSolverInfo.ts @@ -1,4 +1,5 @@ export interface ProblemSolverInfo { id: string; name: string; + description: string; } diff --git a/src/components/landing-page/DemonstratorChooser.tsx b/src/components/landing-page/DemonstratorChooser.tsx index ede48b3..f44a8e5 100644 --- a/src/components/landing-page/DemonstratorChooser.tsx +++ b/src/components/landing-page/DemonstratorChooser.tsx @@ -10,6 +10,12 @@ export const DemonstratorChooser = (props: GridProps) => ( title="Mixed Integer Programming" description="The MIP problem is a mathematical optimization problem where some or all of the variables are restricted to be integers." /> + ); diff --git a/src/components/layout/Footer.tsx b/src/components/layout/Footer.tsx index 5996431..8d9eada 100644 --- a/src/components/layout/Footer.tsx +++ b/src/components/layout/Footer.tsx @@ -5,7 +5,7 @@ export const Footer = () => ( - ProvideQ is made possible by these partners: + ProvideQ contributors: @@ -17,27 +17,11 @@ export const Footer = () => ( - - - - - - - - - - - + + KIT - - - - + GAMS diff --git a/src/components/solvers/Graph/ProblemNode.tsx b/src/components/solvers/Graph/ProblemNode.tsx index a01214d..8538df7 100644 --- a/src/components/solvers/Graph/ProblemNode.tsx +++ b/src/components/solvers/Graph/ProblemNode.tsx @@ -133,7 +133,10 @@ export function ProblemNode(props: NodeProps) { // Type id is the same for all problems const typeId = props.data.problemDtos[0].typeId; const solverId = props.data.problemDtos[0].solverId; - const solverName = solvers[typeId]?.find((s) => s.id === solverId)?.name; + const solver = solvers[typeId]?.find((s) => s.id === solverId); + const solverName = solver?.name; + const solverDescription = + solver?.description ?? "Solves the ${typeId} Problem."; // Fetch solvers for type if necessary getSolvers(typeId); @@ -342,10 +345,10 @@ export function ProblemNode(props: NodeProps) { marginTop="-10px" > dto.id)} solver={{ id: solverId, name: solverName, + description: solverDescription, }} button={problemButton()} /> diff --git a/src/components/solvers/Graph/SolverNode.tsx b/src/components/solvers/Graph/SolverNode.tsx index 47eff6c..c543547 100644 --- a/src/components/solvers/Graph/SolverNode.tsx +++ b/src/components/solvers/Graph/SolverNode.tsx @@ -4,7 +4,6 @@ import { ProblemSolverInfo } from "../../../api/data-model/ProblemSolverInfo"; import { SolverNodeContent } from "./SolverNodeContent"; export interface SolverNodeData { - problemId: string[]; problemSolver: ProblemSolverInfo; selectCallback: (problemSolver: ProblemSolverInfo) => void; } @@ -45,7 +44,6 @@ export function SolverNode(props: NodeProps) { { - const { updateProblem } = useGraphUpdates(); - return ( @@ -29,17 +40,28 @@ export const SolverNodeContent = (props: SolverNodeContentProps) => { {props.solver.name} - {props.problemIds !== undefined && ( - { - for (let problemId of props.problemIds) { - updateProblem(problemId); - } - }} - /> - )} + + +
+ +
+
+ + + + + + {props.solver.name} + + + {props.solver.description} + + + {props.solver.id} + + + +
{ + const [svg, setSvg] = useState(null); + + return ( + + Molecule Energy Simulator + + This demonstrator will compute the ground state energy for a given + molecule using VQE algorithm. The molecule input is given in XYZ Format. + + + + + {svg && ( + +
+ + )} + + ); +}; + +export default MoleculeEnergySimulator; diff --git a/src/pages/solve/FeatureModelAnomaly.tsx b/src/pages/solve/FeatureModelAnomaly.tsx index 6d22ed1..fc3f772 100644 --- a/src/pages/solve/FeatureModelAnomaly.tsx +++ b/src/pages/solve/FeatureModelAnomaly.tsx @@ -49,7 +49,7 @@ const FeatureModelAnomaly: NextPage = () => { { problemTypeId="vrp" text={vrp} setText={setVrp} - textPlaceholder={"Enter your Vehicle Routing problem in vrp format"} + textPlaceholder={"Enter your problem in vrp format"} />