fix ci

pantor · Jan 11, 2021 · 23f91f5 · 23f91f5
1 parent f7e7932
commit 23f91f5
Show file tree

Hide file tree

Showing 4 changed files with 218 additions and 136 deletions.
diff --git a/notebooks/ruckig-step1.nb b/notebooks/ruckig-step1.nb
@@ -10,10 +10,10 @@
 NotebookFileLineBreakTest
 NotebookFileLineBreakTest
 NotebookDataPosition[       158,          7]
-NotebookDataLength[     33330,        837]
-NotebookOptionsPosition[     31321,        799]
-NotebookOutlinePosition[     31715,        815]
-CellTagsIndexPosition[     31672,        812]
+NotebookDataLength[     36558,        923]
+NotebookOptionsPosition[     34324,        881]
+NotebookOutlinePosition[     34717,        897]
+CellTagsIndexPosition[     34674,        894]
 WindowFrame->Normal*)
 
 (* Beginning of Notebook Content *)
@@ -45,7 +45,7 @@ Cell[BoxData[{
       RowBox[{"-", "jMax"}]}], "}"}]}], ";"}], 
   "\[IndentingNewLine]"}], "\[IndentingNewLine]", 
  RowBox[{
-  RowBox[{"jerkProfile", "=", "jerkProfileUDUD"}], 
+  RowBox[{"jerkProfile", "=", "jerkProfileUDDU"}], 
   ";"}], "\[IndentingNewLine]", 
  RowBox[{
   RowBox[{
@@ -251,8 +251,10 @@ Cell[BoxData[{
    3.8176136118348*^9, 3.8176136203885107`*^9}, 3.817613860612129*^9, 
    3.817615902502871*^9, 3.817628855244062*^9, 3.817628926525811*^9, 
    3.817630327779182*^9, 3.817630856882971*^9, 3.817631232893464*^9, 
-   3.817631310598453*^9, 3.817640134759371*^9, 3.818009215253849*^9},
- CellLabel->"In[1]:=",ExpressionUUID->"d346b209-9dd3-47cf-8f1e-f04bc3bf980a"],
+   3.817631310598453*^9, 3.817640134759371*^9, 3.818009215253849*^9, {
+   3.819365329290554*^9, 3.819365331663157*^9}},
+ CellLabel->
+  "In[316]:=",ExpressionUUID->"d346b209-9dd3-47cf-8f1e-f04bc3bf980a"],
 
 Cell[BoxData[
  RowBox[{
@@ -386,7 +388,8 @@ Cell[BoxData[
    3.817629174090706*^9, {3.817629395753993*^9, 3.817629397914218*^9}, {
    3.817629903651003*^9, 3.81762990789653*^9}, 3.817630008980739*^9, {
    3.8176308336239557`*^9, 3.8176308355038147`*^9}, 3.8176412855214357`*^9},
- CellLabel->"In[26]:=",ExpressionUUID->"ccba75f7-892e-4119-93ec-41811b2e330e"],
+ CellLabel->
+  "In[341]:=",ExpressionUUID->"ccba75f7-892e-4119-93ec-41811b2e330e"],
 
 Cell["\<\
 Information Roots are max. 4th Order
@@ -424,6 +427,85 @@ Print Cases 1-5
 
 Cell[CellGroupData[{
 
+Cell[BoxData[
+ RowBox[{
+  RowBox[{"resultT", "[", 
+   RowBox[{"[", "5", "]"}], "]"}], "/.", 
+  RowBox[{"{", 
+   RowBox[{
+    RowBox[{"p0", "\[Rule]", 
+     RowBox[{"-", "0.87567"}]}], ",", 
+    RowBox[{"v0", "\[Rule]", "0.277424"}], ",", 
+    RowBox[{"a0", "\[Rule]", "0.187957"}], ",", 
+    RowBox[{"pf", "\[Rule]", 
+     RowBox[{"-", "0.311679"}]}], ",", 
+    RowBox[{"vf", "\[Rule]", 
+     RowBox[{"-", "0.99338"}]}], ",", 
+    RowBox[{"af", "\[Rule]", "0.0"}], ",", 
+    RowBox[{"vMax", "\[Rule]", "2.35082"}], ",", 
+    RowBox[{"aMax", "\[Rule]", "8.59414"}], ",", 
+    RowBox[{"jMax", "\[Rule]", "3.44654"}]}], "}"}]}]], "Input",
+ CellChangeTimes->{{3.819365342364354*^9, 3.819365355267416*^9}},
+ CellLabel->
+  "In[342]:=",ExpressionUUID->"7391ad0b-f60a-4bd1-8f57-6a79fe2db12b"],
+
+Cell[BoxData[
+ RowBox[{"{", 
+  RowBox[{
+   RowBox[{"{", 
+    RowBox[{
+     RowBox[{"t1", "\[Rule]", 
+      RowBox[{"-", "0.8311138336514194`"}]}], ",", 
+     RowBox[{"t2", "\[Rule]", "0"}], ",", 
+     RowBox[{"t3", "\[Rule]", 
+      RowBox[{"-", "0.7765788507410222`"}]}], ",", 
+     RowBox[{"t4", "\[Rule]", "1.681594998080763`"}], ",", 
+     RowBox[{"t5", "\[Rule]", 
+      RowBox[{"-", "0.9850413454612307`"}]}], ",", 
+     RowBox[{"t6", "\[Rule]", "0"}], ",", 
+     RowBox[{"t7", "\[Rule]", 
+      RowBox[{"-", "0.9850413454612308`"}]}]}], "}"}], ",", 
+   RowBox[{"{", 
+    RowBox[{
+     RowBox[{"t1", "\[Rule]", 
+      RowBox[{"-", "0.8311138336514194`"}]}], ",", 
+     RowBox[{"t2", "\[Rule]", "0"}], ",", 
+     RowBox[{"t3", "\[Rule]", 
+      RowBox[{"-", "0.7765788507410222`"}]}], ",", 
+     RowBox[{"t4", "\[Rule]", "0.5440051154160818`"}], ",", 
+     RowBox[{"t5", "\[Rule]", "0.9850413454612307`"}], ",", 
+     RowBox[{"t6", "\[Rule]", "0"}], ",", 
+     RowBox[{"t7", "\[Rule]", "0.9850413454612306`"}]}], "}"}], ",", 
+   RowBox[{"{", 
+    RowBox[{
+     RowBox[{"t1", "\[Rule]", "0.722043867830625`"}], ",", 
+     RowBox[{"t2", "\[Rule]", "0"}], ",", 
+     RowBox[{"t3", "\[Rule]", "0.7765788507410222`"}], ",", 
+     RowBox[{"t4", "\[Rule]", 
+      RowBox[{"-", "0.051467208619958314`"}]}], ",", 
+     RowBox[{"t5", "\[Rule]", 
+      RowBox[{"-", "0.9850413454612307`"}]}], ",", 
+     RowBox[{"t6", "\[Rule]", "0"}], ",", 
+     RowBox[{"t7", "\[Rule]", 
+      RowBox[{"-", "0.9850413454612308`"}]}]}], "}"}], ",", 
+   RowBox[{"{", 
+    RowBox[{
+     RowBox[{"t1", "\[Rule]", "0.722043867830625`"}], ",", 
+     RowBox[{"t2", "\[Rule]", "0"}], ",", 
+     RowBox[{"t3", "\[Rule]", "0.7765788507410222`"}], ",", 
+     RowBox[{"t4", "\[Rule]", 
+      RowBox[{"-", "1.1890570912846394`"}]}], ",", 
+     RowBox[{"t5", "\[Rule]", "0.9850413454612307`"}], ",", 
+     RowBox[{"t6", "\[Rule]", "0"}], ",", 
+     RowBox[{"t7", "\[Rule]", "0.9850413454612306`"}]}], "}"}]}], 
+  "}"}]], "Output",
+ CellChangeTimes->{3.819365355712121*^9},
+ CellLabel->
+  "Out[342]=",ExpressionUUID->"acca772c-d87e-40b1-b86c-4c5d730dc816"]
+}, Open  ]],
+
+Cell[CellGroupData[{
+
 Cell[BoxData[{
  RowBox[{
   RowBox[{"tmpResult", "=", 
@@ -798,7 +880,7 @@ Cell[BoxData[""], "Input",
 66c7bc16539e"]
 },
 WindowSize->{872, 937},
-WindowMargins->{{Automatic, 222}, {28, Automatic}},
+WindowMargins->{{75, Automatic}, {Automatic, 25}},
 FrontEndVersion->"12.1 for Mac OS X x86 (64-bit) (June 19, 2020)",
 StyleDefinitions->"Default.nb",
 ExpressionUUID->"c8b287f8-8b4a-4e98-ab1e-df7dcd999be5"
@@ -815,30 +897,34 @@ CellTagsIndex->{}
 (*NotebookFileOutline
 Notebook[{
 Cell[558, 20, 250, 8, 81, "Text",ExpressionUUID->"f0efc888-777d-4c66-b8e6-2db88daacc31"],
-Cell[811, 30, 7190, 224, 875, "Input",ExpressionUUID->"d346b209-9dd3-47cf-8f1e-f04bc3bf980a"],
-Cell[8004, 256, 5618, 132, 325, "Input",ExpressionUUID->"ccba75f7-892e-4119-93ec-41811b2e330e"],
-Cell[13625, 390, 1221, 23, 242, "Text",ExpressionUUID->"e82cb2e9-b4f4-4bc2-9a74-547157d3c4dc"],
-Cell[14849, 415, 249, 7, 58, "Text",ExpressionUUID->"2bb13fa1-f9ef-4a5d-ac3b-101e020ad421"],
+Cell[811, 30, 7245, 226, 875, "Input",ExpressionUUID->"d346b209-9dd3-47cf-8f1e-f04bc3bf980a"],
+Cell[8059, 258, 5622, 133, 325, "Input",ExpressionUUID->"ccba75f7-892e-4119-93ec-41811b2e330e"],
+Cell[13684, 393, 1221, 23, 242, "Text",ExpressionUUID->"e82cb2e9-b4f4-4bc2-9a74-547157d3c4dc"],
+Cell[14908, 418, 249, 7, 58, "Text",ExpressionUUID->"2bb13fa1-f9ef-4a5d-ac3b-101e020ad421"],
+Cell[CellGroupData[{
+Cell[15182, 429, 784, 20, 52, "Input",ExpressionUUID->"7391ad0b-f60a-4bd1-8f57-6a79fe2db12b"],
+Cell[15969, 451, 2120, 52, 146, "Output",ExpressionUUID->"acca772c-d87e-40b1-b86c-4c5d730dc816"]
+}, Open  ]],
 Cell[CellGroupData[{
-Cell[15123, 426, 1796, 38, 115, "Input",ExpressionUUID->"f20278fb-5b15-4c9c-bd38-9f1d3931e2f3"],
-Cell[16922, 466, 942, 13, 34, "Output",ExpressionUUID->"d3d06386-dc01-4a4e-ab6e-96f532c5d53c"],
-Cell[17867, 481, 973, 15, 54, "Output",ExpressionUUID->"44ab03ef-9010-4438-9728-59e5a07bb808"]
+Cell[18126, 508, 1796, 38, 115, "Input",ExpressionUUID->"f20278fb-5b15-4c9c-bd38-9f1d3931e2f3"],
+Cell[19925, 548, 942, 13, 34, "Output",ExpressionUUID->"d3d06386-dc01-4a4e-ab6e-96f532c5d53c"],
+Cell[20870, 563, 973, 15, 54, "Output",ExpressionUUID->"44ab03ef-9010-4438-9728-59e5a07bb808"]
 }, Open  ]],
-Cell[18855, 499, 166, 3, 35, "Text",ExpressionUUID->"8d7af2fe-a47e-4ef4-b28a-db0dc764dd0f"],
+Cell[21858, 581, 166, 3, 35, "Text",ExpressionUUID->"8d7af2fe-a47e-4ef4-b28a-db0dc764dd0f"],
 Cell[CellGroupData[{
-Cell[19046, 506, 2080, 49, 159, "Input",ExpressionUUID->"ca8158ca-2cc6-4c2b-92b0-ae9728cb14cd"],
-Cell[21129, 557, 2388, 60, 125, "Output",ExpressionUUID->"f542bf2e-909f-4382-b877-d01cf719c719"]
+Cell[22049, 588, 2080, 49, 159, "Input",ExpressionUUID->"ca8158ca-2cc6-4c2b-92b0-ae9728cb14cd"],
+Cell[24132, 639, 2388, 60, 102, "Output",ExpressionUUID->"f542bf2e-909f-4382-b877-d01cf719c719"]
 }, Open  ]],
 Cell[CellGroupData[{
-Cell[23554, 622, 1282, 26, 94, "Input",ExpressionUUID->"02ddacce-ea40-40b5-bbc9-e4e0e8a8500b"],
-Cell[24839, 650, 1304, 29, 58, "Output",ExpressionUUID->"77115233-e544-4ee6-a2f9-7f5622bcfff6"]
+Cell[26557, 704, 1282, 26, 94, "Input",ExpressionUUID->"02ddacce-ea40-40b5-bbc9-e4e0e8a8500b"],
+Cell[27842, 732, 1304, 29, 58, "Output",ExpressionUUID->"77115233-e544-4ee6-a2f9-7f5622bcfff6"]
 }, Open  ]],
 Cell[CellGroupData[{
-Cell[26180, 684, 1671, 37, 94, "Input",ExpressionUUID->"bbf1a9de-0221-4992-b9c6-d1f769287d62"],
-Cell[27854, 723, 2462, 53, 98, "Output",ExpressionUUID->"105051c1-dd97-49a1-a1ea-1856a027794e"],
-Cell[30319, 778, 829, 13, 34, "Output",ExpressionUUID->"ee561e7d-9711-4560-80d9-d30648c0977e"]
+Cell[29183, 766, 1671, 37, 94, "Input",ExpressionUUID->"bbf1a9de-0221-4992-b9c6-d1f769287d62"],
+Cell[30857, 805, 2462, 53, 98, "Output",ExpressionUUID->"105051c1-dd97-49a1-a1ea-1856a027794e"],
+Cell[33322, 860, 829, 13, 34, "Output",ExpressionUUID->"ee561e7d-9711-4560-80d9-d30648c0977e"]
 }, Open  ]],
-Cell[31163, 794, 154, 3, 30, "Input",ExpressionUUID->"f0b1e6e6-f499-4d6a-bda7-66c7bc16539e"]
+Cell[34166, 876, 154, 3, 30, "Input",ExpressionUUID->"f0b1e6e6-f499-4d6a-bda7-66c7bc16539e"]
 }
 ]
 *)