From d91d65404df3864e65f7b5900eb276af7c3b7718 Mon Sep 17 00:00:00 2001
From: Jan Gruis <gruis@cst.rwth-aachen.de>
Date: Fri, 22 Sep 2023 13:45:05 +0200
Subject: [PATCH] started combininf tlm ctlm
---
README.md | 39 ---------------------------------------
evaluation.py | 7 +++++--
2 files changed, 5 insertions(+), 41 deletions(-)
diff --git a/README.md b/README.md
index 41d4084..d477eef 100644
--- a/README.md
+++ b/README.md
@@ -1,48 +1,9 @@
# labcode
-
-
## Getting started
To make it easy for you to get started with GitLab, here's a list of recommended next steps.
-Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)!
-
-## Add your files
-
-- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files
-- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command:
-
-```
-cd existing_repo
-git remote add origin https://git-ce.rwth-aachen.de/cst/labcode.git
-git branch -M main
-git push -uf origin main
-```
-
-## Integrate with your tools
-
-- [ ] [Set up project integrations](https://git-ce.rwth-aachen.de/cst/labcode/-/settings/integrations)
-
-## Collaborate with your team
-
-- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/)
-- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html)
-- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
-- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/)
-- [ ] [Automatically merge when pipeline succeeds](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html)
-
-## Test and Deploy
-
-Use the built-in continuous integration in GitLab.
-
-- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html)
-- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing(SAST)](https://docs.gitlab.com/ee/user/application_security/sast/)
-- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html)
-- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/)
-- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html)
-
-***
# Editing this README
diff --git a/evaluation.py b/evaluation.py
index 71ab0f3..2d4aa43 100644
--- a/evaluation.py
+++ b/evaluation.py
@@ -8,6 +8,7 @@ import pandas as pd
import numpy as np
import altair as alt
import datetime
+import matplotlib.pyplot as plt
@@ -75,9 +76,11 @@ class LinearRegressionFitting:
)
self.df = pd.DataFrame({'x': self.x,'f(x)': self.model(self.x)})
- self.chart = alt.Chart(self.df).mark_line().encode(x="x", y='f(x)')
-class RT_Evaluation(LinearRegressionFitting):
+ plot = plt.subplot()
+ #self.chart = alt.Chart(self.df).mark_line().encode(x="x", y='f(x)')
+
+class TLM_Evaluation(LinearRegressionFitting):
def __init__(self, PandaDataFrame, contactlenght):
super().__init__(PandaDataFrame)
#self.input
--
GitLab