Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added basic local kmeans #44

Merged
merged 4 commits into from
Oct 4, 2023
Merged

Added basic local kmeans #44

merged 4 commits into from
Oct 4, 2023

Conversation

cepurwin
Copy link
Collaborator

@cepurwin cepurwin commented Oct 3, 2023

No description provided.

david-2031
david-2031 reviewed Oct 4, 2023
View reviewed changes
Copy link
Collaborator

@david-2031 david-2031 left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

richtig nice nur ein paar Kleinigkeiten, das wichtigste in meinen Augen ist, dass dir ganze Konvertierung in einen eigenen Service ausgelagert wird und dass es gerade keinen busy indicator gibt, der Rest kann abgearbeitet werden kann man aber auch so lassen.

src/app/home/home-services/kmeans-local.service.ts
resolve(jsonResult) // Resolviere das Promise mit dem Ergebnis
}

fileReader.onerror = (error) => {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cepurwin ich kenne das, dass man error-handling mit try catch macht, was hältst du davon, wie macht ihr das?

src/app/home/home-services/kmeans-local.service.ts Outdated
})
}

csvTo2DArray (csvData: string): string[][] {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sollte das nicht lieber in einen eigenen Service ausgelagert werden, das kann ich dann zB. für meine Tabellenkomponente benutzen

src/app/home/chart-container/chart/chart.component.ts Outdated
@@ -13,17 +13,17 @@ export class ChartComponent implements AfterViewInit, OnChanges {
public chart: any
chartData: ResponseInterface = MockDaten
datasets: ChartDatasetInterface[] = []
@Input() apiResponse: ResponseInterface | undefined
@Input() KmeansResult: ResponseInterface | undefined
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Kleinigkeit aber best practice ist eigentlich das klein zu schreiben, sagt das linting was dazu?

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Linting kommt mit beidem klar. Wollen wir das Linting dahingehend härter einstellen oder so lassen?

src/app/home/input/input.component.ts Outdated
) {
}

public file?: File

submit (): void {
console.log(this.clusterInputFormGroup.value)
// console.log(this.clusterInputFormGroup.value)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

diese Testausgabe sollte nicht in main landen auch nicht mit //

@cepurwin cepurwin merged commit 5caa8f9 into main Oct 4, 2023
3 checks passed
@cepurwin cepurwin deleted the cedric/localKmeansIntegration branch October 4, 2023 13:35
REDDERD added a commit that referenced this pull request Oct 5, 2023
@REDDERD @cepurwin
@david-2031 @khuepp @Splashed01
Daniel/sync test deploy 05102023 (#50)
c86b7b6 
* Chart working with Mock-Data

* Removed unused import

* Chart working with Mock-Data

* Removed unused import

* Finalized sync-test-deploy-branch.yaml (#28)

Should work now. Was tested in separate repo

* Dave/import data format (#32)

* edited upload text

* display uploaded data

* Added HTTP Post Request and give Response to Home Component

* Removed unused imports

* Chart gets displayed after csv upload

* Testupload working

* Added Loading Spinner and simple error message

* Small fix

* Fixed reloading bug (#35)

* Update app.yaml

* Update cloudbuild.yaml

* Inputs working

* removed testing console logs

* functional fix for sidenav button bug (#40)

* Added Cocis inputs and disabled submit button if no file is uploaded

* Fixed all Linting errors (#43)

* For importing linting to main without merge-conflicts

* Autofixed ~12.000 Linting errors

* Fixed most linting errors

* Created ESLintIgnore for not linting .html-Files with TypeScript-Linter

---------

Co-authored-by: cepurwin <[email protected]>

* Added basic local kmeans (#44)

* Added basic local kmeans

* Added empty Chart and fixed daves comments

* fixed busy indicator

* Start K-Means button changed

* Deleted build-beta.yml (#45)

Co-authored-by: cepurwin <[email protected]>

* Klaas/clustering (#46)

* front without logic implemented

* läuft mit einem Fehler

* Deutsch

* Added Kmeans Service File and Test

* Sync test-deployment with main (#29)

* Installed Playwright for E2E-Testing

* Installed ESLint

* Added Linting as GitHub Action

* Removed Linting as GitHub Action

* csv inport (#24)

* front without logic implemented

* läuft mit einem Fehler

* Deutsch

* Update sync-test-deploy-branch.yaml (#25)

* Update sync-test-deploy-branch.yaml

* Update sync-test-deploy-branch.yaml

* Finalized sync-test-deploy-branch.yaml (#28)

Should work now. Was tested in separate repo

---------

Co-authored-by: david-2031 <[email protected]>

* Daniel/only https (#30)

* Installed Playwright for E2E-Testing

* Installed ESLint

* Added Linting as GitHub Action

* Removed Linting as GitHub Action

* csv inport (#24)

* front without logic implemented

* läuft mit einem Fehler

* Deutsch

* Update sync-test-deploy-branch.yaml (#25)

* Update sync-test-deploy-branch.yaml

* Update sync-test-deploy-branch.yaml

* Finalized sync-test-deploy-branch.yaml (#28)

Should work now. Was tested in separate repo

* Ensured only HTTPS is used to access

* Fixed Routing Bug (Probably)

---------

Co-authored-by: david-2031 <[email protected]>

* Inputfeld Manhattan/Euclidean, Input lokale Berechnung

* Sync test-deployment with main (#31)

* Chart working with Mock-Data

* Removed unused import

* Installed Playwright for E2E-Testing

* Installed ESLint

* Added Linting as GitHub Action

* Removed Linting as GitHub Action

* csv inport (#24)

* front without logic implemented

* läuft mit einem Fehler

* Deutsch

* Chart working with Mock-Data

* Removed unused import

* Update sync-test-deploy-branch.yaml (#25)

* Update sync-test-deploy-branch.yaml

* Update sync-test-deploy-branch.yaml

* Finalized sync-test-deploy-branch.yaml (#28)

Should work now. Was tested in separate repo

---------

Co-authored-by: cepurwin <[email protected]>
Co-authored-by: david-2031 <[email protected]>

* Inputfeld Manhattan/Euclidean; Input lokale Berechnung; Hinweis dass K optional ist

* Update cloudbuild.yaml

* Update app.yaml

* Ensured usage of HTTPS

* Optionen für die Methode zur Bestiummung von K eingebaut (Ellenbogen, Silhouette); Berechnungsmethode um Methode "Jaccard" ergänzt

Alle Optionen wurden in ein Expansion Panel eingebaut

* Daniel/fix merge conflicts1 (#36)

* Update input.component.css from main for fixing merge conflict

* Update input.component.html from main for fixing merge conflict

* Update input.component.ts from main for fixing merge conflict

* Sync test-deployment with main (#33)

* Chart working with Mock-Data

* Removed unused import

* Installed Playwright for E2E-Testing

* Installed ESLint

* Added Linting as GitHub Action

* Removed Linting as GitHub Action

* csv inport (#24)

* front without logic implemented

* läuft mit einem Fehler

* Deutsch

* Chart working with Mock-Data

* Removed unused import

* Update sync-test-deploy-branch.yaml (#25)

* Update sync-test-deploy-branch.yaml

* Update sync-test-deploy-branch.yaml

* Finalized sync-test-deploy-branch.yaml (#28)

Should work now. Was tested in separate repo

* Dave/import data format (#32)

* edited upload text

* display uploaded data

* Fixed reloading bug (#35)

* Update app.yaml

* Update cloudbuild.yaml

---------

Co-authored-by: cepurwin <[email protected]>
Co-authored-by: david-2031 <[email protected]>

* Got linting to working and added GitHub action "lint" (#39)

* Added Kmeans Service File and Test

* Fixed most linting errors

* CSV-File Reading implemented

* KMeans and JSON-result implementet

* Added Elbow Method

* Added Elbow Method

* Added Elbow Method

* changed check for ellbow method

* removed useless console.log

---------

Co-authored-by: david-2031 <[email protected]>
Co-authored-by: REDDERD <[email protected]>
Co-authored-by: david-2031 <[email protected]>
Co-authored-by: cookie.exe <[email protected]>
Co-authored-by: cepurwin <[email protected]>
Co-authored-by: Cornelius Daemberg <[email protected]>
Co-authored-by: cepurwin <[email protected]>

* table view (#47)

* Added basic local kmeans

* converting the data to table view

* flattening table not working yet

* implementing table

* working

* home left container aligned to baseline

* linting and cleanup

* merge conflicts

---------

Co-authored-by: cepurwin <[email protected]>

* Increase InitialBudget to 4 MB (#48)

---------

Co-authored-by: cepurwin <[email protected]>
Co-authored-by: david-2031 <[email protected]>
Co-authored-by: cepurwin <[email protected]>
Co-authored-by: khuepp <[email protected]>
Co-authored-by: david-2031 <[email protected]>
Co-authored-by: cookie.exe <[email protected]>
Co-authored-by: Cornelius Daemberg <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@REDDERD REDDERD REDDERD left review comments

@david-2031 david-2031 david-2031 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@cepurwin @david-2031 @REDDERD