diff --git a/notebooks/alt/Octsim/@myss2tf2/myss2tf2.m b/notebooks/alt/Octsim/@myss2tf2/myss2tf2.m deleted file mode 100644 index 393580e1a22f6fc2ad7d775155171876939bc71c..0000000000000000000000000000000000000000 --- a/notebooks/alt/Octsim/@myss2tf2/myss2tf2.m +++ /dev/null @@ -1,10 +0,0 @@ -function [num den] = myss2tf2(A,B,C) - - -n2 = -A(1,1)*B(2)*C(2)+A(1,2)*B(2)*C(1)+A(2,1)*B(1)*C(2)-A(2,2)*B(1)*C(1); -n1 = B(1)*C(1)+B(2)*C(2); -d1 = -A(1,1)-A(2,2); -d2 = A(1,1)*A(2,2)-A(1,2)*A(2,1); -num = [n1 n2]; -den = [1 d1 d2]; - diff --git a/notebooks/exam example/V6.ipynb b/notebooks/exam example/V6.ipynb index e84efa5fab5e1097b487486c4073902f5723bdcf..639b288d678905d35b9c1e56919c5b25eb1340c7 100644 --- a/notebooks/exam example/V6.ipynb +++ b/notebooks/exam example/V6.ipynb @@ -1,5 +1,13 @@ { "cells": [ + { + "cell_type": "markdown", + "id": "1f0f7673-ab1a-413f-b73c-0a248ba39ed9", + "metadata": {}, + "source": [ + "# <span style='color:OrangeRed'>V6 NORMALFORMEN IN ZUSTANDRAUMDARSTELLUNG</span>" + ] + }, { "cell_type": "markdown", "id": "9653081e-df65-4ccd-9204-e11c542a469f", @@ -14,7 +22,7 @@ "id": "880aa4ff-2004-4875-affc-5759aba8104e", "metadata": {}, "source": [ - "<img src=\"Bilder/Turbine.png\" alt=\"drawing\" width=\"600\" height=\"300\"/>" + "<img src=\"Turbine.png\" alt=\"drawing\" width=\"600\" height=\"300\"/>" ] }, { @@ -33,12 +41,12 @@ "id": "add7e04a-83e6-4685-b845-47137f44a388", "metadata": {}, "source": [ - "<img src=\"Bilder/TurbineSchema.png\" alt=\"drawing\" width=\"600\" height=\"300\"/>" + "<img src=\"TurbineSchema.png\" alt=\"drawing\" width=\"600\" height=\"300\"/>" ] }, { "cell_type": "code", - "execution_count": 2, + "execution_count": 1, "id": "e050a273-a079-40b9-ac0c-194e5e7f12e8", "metadata": {}, "outputs": [], @@ -59,7 +67,7 @@ }, { "cell_type": "code", - "execution_count": 3, + "execution_count": 2, "id": "ef3d3be5-73cd-48d2-a773-d177b638230a", "metadata": {}, "outputs": [ @@ -83,7 +91,7 @@ }, { "cell_type": "code", - "execution_count": 4, + "execution_count": 3, "id": "402f525f-8a64-4584-8d05-dbd5e42e5516", "metadata": {}, "outputs": [ @@ -127,7 +135,7 @@ }, { "cell_type": "code", - "execution_count": 5, + "execution_count": 4, "id": "1ed03ed5-3913-4107-95c9-f48e52bb50ee", "metadata": {}, "outputs": [ @@ -158,7 +166,7 @@ }, { "cell_type": "code", - "execution_count": 6, + "execution_count": 5, "id": "0d90c253-316f-47ed-9f7b-561ff0ed4868", "metadata": {}, "outputs": [ @@ -202,7 +210,7 @@ }, { "cell_type": "code", - "execution_count": 7, + "execution_count": 6, "id": "828217c8-bd90-42da-8b36-9e1f05727a24", "metadata": {}, "outputs": [ @@ -233,7 +241,7 @@ }, { "cell_type": "code", - "execution_count": 8, + "execution_count": 7, "id": "058ad783-d553-4bcc-873c-a6f521c16975", "metadata": {}, "outputs": [ @@ -264,7 +272,7 @@ }, { "cell_type": "code", - "execution_count": 9, + "execution_count": 8, "id": "0c2d94f8-536c-421a-98ae-69771c0e6ca2", "metadata": {}, "outputs": [ @@ -295,7 +303,7 @@ }, { "cell_type": "code", - "execution_count": 10, + "execution_count": 9, "id": "69e7fd06-f71a-48ec-af34-d2e406f9067c", "metadata": {}, "outputs": [ @@ -363,7 +371,7 @@ }, { "cell_type": "code", - "execution_count": 15, + "execution_count": 10, "id": "cbf41502-116d-40b5-8fec-39faf2062a03", "metadata": {}, "outputs": [ @@ -373,7 +381,7 @@ "text": [ "num =\n", "\n", - " 0.0044243 0.0037458\n", + " 0.0000000 0.0044243 0.0037458\n", "\n", "den =\n", "\n", @@ -392,7 +400,8 @@ } ], "source": [ - "[num den] = myss2tf2(Fi,Gi,C)\n", + "pkg load signal\n", + "[num den] = ss2tf(Fi,Gi,C,D)\n", "Gz = tf(num,den,Ts)" ] },