more data
This commit is contained in:
William Ball
parent
6148ee8e36
commit
5913cf16a6
7 changed files with 1480 additions and 2468 deletions
510
Presentation.nb
510
Presentation.nb
|
|
@ -10,10 +10,10 @@
|
|||
NotebookFileLineBreakTest
|
||||
NotebookFileLineBreakTest
|
||||
NotebookDataPosition[ 158, 7]
|
||||
NotebookDataLength[ 98276, 2280]
|
||||
NotebookOptionsPosition[ 95330, 2226]
|
||||
NotebookOutlinePosition[ 95731, 2242]
|
||||
CellTagsIndexPosition[ 95688, 2239]
|
||||
NotebookDataLength[ 94069, 2200]
|
||||
NotebookOptionsPosition[ 91256, 2149]
|
||||
NotebookOutlinePosition[ 91657, 2165]
|
||||
CellTagsIndexPosition[ 91614, 2162]
|
||||
WindowFrame->Normal*)
|
||||
|
||||
(* Beginning of Notebook Content *)
|
||||
|
|
@ -56,8 +56,7 @@ Cell[BoxData[
|
|||
3.8309610006696243`*^9}, {3.8309610406625767`*^9, 3.830961145400291*^9}, {
|
||||
3.830974193183652*^9, 3.8309745378615713`*^9}, {3.831070955808754*^9,
|
||||
3.831070961297104*^9}, {3.834179746565708*^9, 3.8341797491247168`*^9}},
|
||||
CellLabel->
|
||||
"In[255]:=",ExpressionUUID->"42bda541-275e-4fa8-ad0f-dff973087409"],
|
||||
CellLabel->"In[1]:=",ExpressionUUID->"42bda541-275e-4fa8-ad0f-dff973087409"],
|
||||
|
||||
Cell[BoxData[{
|
||||
RowBox[{
|
||||
|
|
@ -937,191 +936,19 @@ Cell[BoxData[{
|
|||
RowBox[{"0", ",", "0", ",", "0", ",", "0", ",", "1"}], "}"}]}], "}"}],
|
||||
".", "cFin"}]}], "]"}]}]}], "Input",
|
||||
CellChangeTimes->{{3.834179528431576*^9, 3.8341796307976007`*^9}},
|
||||
CellLabel->
|
||||
"In[256]:=",ExpressionUUID->"c77ea1b4-464a-475d-935a-6ddd3139e407"],
|
||||
|
||||
Cell[CellGroupData[{
|
||||
CellLabel->"In[2]:=",ExpressionUUID->"c77ea1b4-464a-475d-935a-6ddd3139e407"],
|
||||
|
||||
Cell[BoxData[
|
||||
RowBox[{
|
||||
RowBox[{"G", "=",
|
||||
RowBox[{"GramMaker", "[",
|
||||
RowBox[{
|
||||
RowBox[{"myAntiPyramid", "[", "5", "]"}], ",", "14", ",", "10000"}],
|
||||
"]"}]}]], "Input",
|
||||
"]"}]}], ";"}]], "Input",
|
||||
CellChangeTimes->{{3.8341795407019453`*^9, 3.834179541264065*^9}, {
|
||||
3.834179796934347*^9, 3.834179809094207*^9}},
|
||||
CellLabel->
|
||||
"In[292]:=",ExpressionUUID->"2acb2df6-0250-4f93-a487-d393ec6948a7"],
|
||||
|
||||
Cell[BoxData[
|
||||
RowBox[{"{",
|
||||
RowBox[{
|
||||
RowBox[{"{",
|
||||
RowBox[{"1.0000000000000009`", ",",
|
||||
RowBox[{"-", "4.2360679774997845`"}], ",",
|
||||
RowBox[{"-", "12.708203932499332`"}], ",",
|
||||
RowBox[{"-", "12.708203932499343`"}], ",",
|
||||
RowBox[{"-", "4.23606797749978`"}], ",",
|
||||
RowBox[{"-", "1.000000000000066`"}], ",",
|
||||
RowBox[{"-", "1.0000000000000626`"}], ",",
|
||||
RowBox[{"-", "9.47213595499963`"}], ",",
|
||||
RowBox[{"-", "14.708203932499408`"}], ",",
|
||||
RowBox[{"-", "9.472135954999644`"}], ",",
|
||||
RowBox[{"-", "1.0000000000000089`"}], ",",
|
||||
RowBox[{"-", "2.236067977499884`"}]}], "}"}], ",",
|
||||
RowBox[{"{",
|
||||
RowBox[{
|
||||
RowBox[{"-", "4.2360679774997845`"}], ",", "1.0000000000000009`", ",",
|
||||
RowBox[{"-", "4.236067977499781`"}], ",",
|
||||
RowBox[{"-", "12.70820393249936`"}], ",",
|
||||
RowBox[{"-", "12.70820393249936`"}], ",",
|
||||
RowBox[{"-", "9.472135954999644`"}], ",",
|
||||
RowBox[{"-", "1.0000000000000655`"}], ",",
|
||||
RowBox[{"-", "1.0000000000000668`"}], ",",
|
||||
RowBox[{"-", "9.472135954999642`"}], ",",
|
||||
RowBox[{"-", "14.70820393249945`"}], ",",
|
||||
RowBox[{"-", "1.0000000000000098`"}], ",",
|
||||
RowBox[{"-", "2.236067977499888`"}]}], "}"}], ",",
|
||||
RowBox[{"{",
|
||||
RowBox[{
|
||||
RowBox[{"-", "12.708203932499332`"}], ",",
|
||||
RowBox[{"-", "4.236067977499781`"}], ",", "0.9999999999999996`", ",",
|
||||
RowBox[{"-", "4.236067977499778`"}], ",",
|
||||
RowBox[{"-", "12.708203932499332`"}], ",",
|
||||
RowBox[{"-", "14.708203932499396`"}], ",",
|
||||
RowBox[{"-", "9.47213595499961`"}], ",",
|
||||
RowBox[{"-", "1.0000000000000635`"}], ",",
|
||||
RowBox[{"-", "1.000000000000064`"}], ",",
|
||||
RowBox[{"-", "9.472135954999635`"}], ",",
|
||||
RowBox[{"-", "1.0000000000000084`"}], ",",
|
||||
RowBox[{"-", "2.236067977499882`"}]}], "}"}], ",",
|
||||
RowBox[{"{",
|
||||
RowBox[{
|
||||
RowBox[{"-", "12.708203932499343`"}], ",",
|
||||
RowBox[{"-", "12.70820393249936`"}], ",",
|
||||
RowBox[{"-", "4.236067977499778`"}], ",", "0.9999999999999993`", ",",
|
||||
RowBox[{"-", "4.236067977499778`"}], ",",
|
||||
RowBox[{"-", "9.472135954999626`"}], ",",
|
||||
RowBox[{"-", "14.708203932499394`"}], ",",
|
||||
RowBox[{"-", "9.472135954999635`"}], ",",
|
||||
RowBox[{"-", "1.0000000000000648`"}], ",",
|
||||
RowBox[{"-", "1.0000000000000657`"}], ",",
|
||||
RowBox[{"-", "1.0000000000000093`"}], ",",
|
||||
RowBox[{"-", "2.236067977499884`"}]}], "}"}], ",",
|
||||
RowBox[{"{",
|
||||
RowBox[{
|
||||
RowBox[{"-", "4.23606797749978`"}], ",",
|
||||
RowBox[{"-", "12.70820393249936`"}], ",",
|
||||
RowBox[{"-", "12.708203932499332`"}], ",",
|
||||
RowBox[{"-", "4.236067977499778`"}], ",", "0.9999999999999994`", ",",
|
||||
RowBox[{"-", "1.000000000000063`"}], ",",
|
||||
RowBox[{"-", "9.47213595499962`"}], ",",
|
||||
RowBox[{"-", "14.708203932499417`"}], ",",
|
||||
RowBox[{"-", "9.472135954999626`"}], ",",
|
||||
RowBox[{"-", "1.0000000000000673`"}], ",",
|
||||
RowBox[{"-", "1.0000000000000093`"}], ",",
|
||||
RowBox[{"-", "2.236067977499884`"}]}], "}"}], ",",
|
||||
RowBox[{"{",
|
||||
RowBox[{
|
||||
RowBox[{"-", "1.000000000000066`"}], ",",
|
||||
RowBox[{"-", "9.472135954999644`"}], ",",
|
||||
RowBox[{"-", "14.708203932499396`"}], ",",
|
||||
RowBox[{"-", "9.472135954999626`"}], ",",
|
||||
RowBox[{"-", "1.000000000000063`"}], ",", "0.9999999999999998`", ",",
|
||||
RowBox[{"-", "4.236067977499778`"}], ",",
|
||||
RowBox[{"-", "12.70820393249935`"}], ",",
|
||||
RowBox[{"-", "12.708203932499341`"}], ",",
|
||||
RowBox[{"-", "4.236067977499785`"}], ",",
|
||||
RowBox[{"-", "2.236067977499885`"}], ",",
|
||||
RowBox[{"-", "1.0000000000000089`"}]}], "}"}], ",",
|
||||
RowBox[{"{",
|
||||
RowBox[{
|
||||
RowBox[{"-", "1.0000000000000626`"}], ",",
|
||||
RowBox[{"-", "1.0000000000000655`"}], ",",
|
||||
RowBox[{"-", "9.47213595499961`"}], ",",
|
||||
RowBox[{"-", "14.708203932499394`"}], ",",
|
||||
RowBox[{"-", "9.47213595499962`"}], ",",
|
||||
RowBox[{"-", "4.236067977499778`"}], ",", "0.9999999999999986`", ",",
|
||||
RowBox[{"-", "4.236067977499777`"}], ",",
|
||||
RowBox[{"-", "12.708203932499332`"}], ",",
|
||||
RowBox[{"-", "12.708203932499352`"}], ",",
|
||||
RowBox[{"-", "2.2360679774998817`"}], ",",
|
||||
RowBox[{"-", "1.0000000000000089`"}]}], "}"}], ",",
|
||||
RowBox[{"{",
|
||||
RowBox[{
|
||||
RowBox[{"-", "9.47213595499963`"}], ",",
|
||||
RowBox[{"-", "1.0000000000000668`"}], ",",
|
||||
RowBox[{"-", "1.0000000000000635`"}], ",",
|
||||
RowBox[{"-", "9.472135954999635`"}], ",",
|
||||
RowBox[{"-", "14.708203932499417`"}], ",",
|
||||
RowBox[{"-", "12.70820393249935`"}], ",",
|
||||
RowBox[{"-", "4.236067977499777`"}], ",", "1.`", ",",
|
||||
RowBox[{"-", "4.236067977499784`"}], ",",
|
||||
RowBox[{"-", "12.70820393249937`"}], ",",
|
||||
RowBox[{"-", "2.2360679774998853`"}], ",",
|
||||
RowBox[{"-", "1.0000000000000102`"}]}], "}"}], ",",
|
||||
RowBox[{"{",
|
||||
RowBox[{
|
||||
RowBox[{"-", "14.708203932499408`"}], ",",
|
||||
RowBox[{"-", "9.472135954999642`"}], ",",
|
||||
RowBox[{"-", "1.000000000000064`"}], ",",
|
||||
RowBox[{"-", "1.0000000000000648`"}], ",",
|
||||
RowBox[{"-", "9.472135954999626`"}], ",",
|
||||
RowBox[{"-", "12.708203932499341`"}], ",",
|
||||
RowBox[{"-", "12.708203932499332`"}], ",",
|
||||
RowBox[{"-", "4.236067977499784`"}], ",", "1.000000000000001`", ",",
|
||||
RowBox[{"-", "4.2360679774997845`"}], ",",
|
||||
RowBox[{"-", "2.236067977499885`"}], ",",
|
||||
RowBox[{"-", "1.0000000000000089`"}]}], "}"}], ",",
|
||||
RowBox[{"{",
|
||||
RowBox[{
|
||||
RowBox[{"-", "9.472135954999644`"}], ",",
|
||||
RowBox[{"-", "14.70820393249945`"}], ",",
|
||||
RowBox[{"-", "9.472135954999635`"}], ",",
|
||||
RowBox[{"-", "1.0000000000000657`"}], ",",
|
||||
RowBox[{"-", "1.0000000000000673`"}], ",",
|
||||
RowBox[{"-", "4.236067977499785`"}], ",",
|
||||
RowBox[{"-", "12.708203932499352`"}], ",",
|
||||
RowBox[{"-", "12.70820393249937`"}], ",",
|
||||
RowBox[{"-", "4.2360679774997845`"}], ",", "1.0000000000000002`", ",",
|
||||
RowBox[{"-", "2.2360679774998875`"}], ",",
|
||||
RowBox[{"-", "1.0000000000000107`"}]}], "}"}], ",",
|
||||
RowBox[{"{",
|
||||
RowBox[{
|
||||
RowBox[{"-", "1.0000000000000089`"}], ",",
|
||||
RowBox[{"-", "1.0000000000000098`"}], ",",
|
||||
RowBox[{"-", "1.0000000000000084`"}], ",",
|
||||
RowBox[{"-", "1.0000000000000093`"}], ",",
|
||||
RowBox[{"-", "1.0000000000000093`"}], ",",
|
||||
RowBox[{"-", "2.236067977499885`"}], ",",
|
||||
RowBox[{"-", "2.2360679774998817`"}], ",",
|
||||
RowBox[{"-", "2.2360679774998853`"}], ",",
|
||||
RowBox[{"-", "2.236067977499885`"}], ",",
|
||||
RowBox[{"-", "2.2360679774998875`"}], ",", "1.`", ",",
|
||||
RowBox[{"-", "1.7639320225002568`"}]}], "}"}], ",",
|
||||
RowBox[{"{",
|
||||
RowBox[{
|
||||
RowBox[{"-", "2.236067977499884`"}], ",",
|
||||
RowBox[{"-", "2.236067977499888`"}], ",",
|
||||
RowBox[{"-", "2.236067977499882`"}], ",",
|
||||
RowBox[{"-", "2.236067977499884`"}], ",",
|
||||
RowBox[{"-", "2.236067977499884`"}], ",",
|
||||
RowBox[{"-", "1.0000000000000089`"}], ",",
|
||||
RowBox[{"-", "1.0000000000000089`"}], ",",
|
||||
RowBox[{"-", "1.0000000000000102`"}], ",",
|
||||
RowBox[{"-", "1.0000000000000089`"}], ",",
|
||||
RowBox[{"-", "1.0000000000000107`"}], ",",
|
||||
RowBox[{"-", "1.7639320225002568`"}], ",", "0.9999999999999997`"}],
|
||||
"}"}]}], "}"}]], "Output",
|
||||
CellChangeTimes->{
|
||||
3.8341795446742983`*^9, 3.8341796342153883`*^9, 3.8341797131672173`*^9,
|
||||
3.834179811383936*^9, {3.834501061390765*^9, 3.834501076103367*^9},
|
||||
3.834501229114954*^9, 3.834502882776107*^9, 3.834568960544511*^9,
|
||||
3.83456904188068*^9, {3.83460821719843*^9, 3.8346082773639317`*^9},
|
||||
3.8346132595491343`*^9},
|
||||
CellLabel->
|
||||
"Out[292]=",ExpressionUUID->"00f58963-1bec-4f17-b581-aff807028e0f"]
|
||||
}, Open ]],
|
||||
3.834179796934347*^9, 3.834179809094207*^9}, {3.834619683964849*^9,
|
||||
3.834619687892744*^9}, {3.834619738219818*^9, 3.834619742471016*^9}},
|
||||
CellLabel->"In[38]:=",ExpressionUUID->"2acb2df6-0250-4f93-a487-d393ec6948a7"],
|
||||
|
||||
Cell[CellGroupData[{
|
||||
|
||||
|
|
@ -1134,35 +961,67 @@ Cell[BoxData[
|
|||
RowBox[{"-", "1"}], ",",
|
||||
RowBox[{"-", "1"}], ",",
|
||||
RowBox[{"-", "1"}], ",",
|
||||
RowBox[{"-", "1"}], ",",
|
||||
RowBox[{"-", "1"}]}], "}"}], ",",
|
||||
RowBox[{"{",
|
||||
RowBox[{
|
||||
RowBox[{"-", "1"}], ",", "1", ",",
|
||||
RowBox[{"-", "1"}], ",",
|
||||
RowBox[{"-", "3"}], ",",
|
||||
RowBox[{
|
||||
RowBox[{"-", "2"}], "-",
|
||||
SqrtBox["5"]}], ",",
|
||||
RowBox[{
|
||||
RowBox[{"-", "2"}], "-",
|
||||
SqrtBox["5"]}], ",",
|
||||
RowBox[{"-", "1"}]}], "}"}], ",",
|
||||
RowBox[{"{",
|
||||
RowBox[{
|
||||
RowBox[{"-", "1"}], ",",
|
||||
RowBox[{"-", "1"}], ",", "1", ",",
|
||||
RowBox[{"-", "1"}], ",",
|
||||
RowBox[{"-", "3"}]}], "}"}], ",",
|
||||
RowBox[{
|
||||
RowBox[{"-", "2"}], "-",
|
||||
SqrtBox["5"]}], ",",
|
||||
RowBox[{
|
||||
RowBox[{"-", "2"}], "-",
|
||||
SqrtBox["5"]}]}], "}"}], ",",
|
||||
RowBox[{"{",
|
||||
RowBox[{
|
||||
RowBox[{"-", "1"}], ",",
|
||||
RowBox[{"-", "3"}], ",",
|
||||
RowBox[{
|
||||
RowBox[{"-", "2"}], "-",
|
||||
SqrtBox["5"]}], ",",
|
||||
RowBox[{"-", "1"}], ",", "1", ",",
|
||||
RowBox[{"-", "1"}], ",",
|
||||
RowBox[{
|
||||
RowBox[{"-", "2"}], "-",
|
||||
SqrtBox["5"]}]}], "}"}], ",",
|
||||
RowBox[{"{",
|
||||
RowBox[{
|
||||
RowBox[{"-", "1"}], ",",
|
||||
RowBox[{
|
||||
RowBox[{"-", "2"}], "-",
|
||||
SqrtBox["5"]}], ",",
|
||||
RowBox[{
|
||||
RowBox[{"-", "2"}], "-",
|
||||
SqrtBox["5"]}], ",",
|
||||
RowBox[{"-", "1"}], ",", "1", ",",
|
||||
RowBox[{"-", "1"}]}], "}"}], ",",
|
||||
RowBox[{"{",
|
||||
RowBox[{
|
||||
RowBox[{"-", "1"}], ",",
|
||||
RowBox[{"-", "1"}], ",",
|
||||
RowBox[{"-", "3"}], ",",
|
||||
RowBox[{
|
||||
RowBox[{"-", "2"}], "-",
|
||||
SqrtBox["5"]}], ",",
|
||||
RowBox[{
|
||||
RowBox[{"-", "2"}], "-",
|
||||
SqrtBox["5"]}], ",",
|
||||
RowBox[{"-", "1"}], ",", "1"}], "}"}]}], "}"}]}]], "Input",
|
||||
CellChangeTimes->{{3.834501067162672*^9, 3.8345010680342617`*^9},
|
||||
3.83460821356898*^9, 3.834608254494473*^9, 3.834613256684762*^9},
|
||||
CellLabel->
|
||||
"In[293]:=",ExpressionUUID->"1616f30b-f817-4bed-8186-0f3e4b738bac"],
|
||||
3.83460821356898*^9, 3.834608254494473*^9, 3.834613256684762*^9,
|
||||
3.834619701731597*^9},
|
||||
CellLabel->"In[39]:=",ExpressionUUID->"1616f30b-f817-4bed-8186-0f3e4b738bac"],
|
||||
|
||||
Cell[BoxData[
|
||||
RowBox[{"{",
|
||||
|
|
@ -1172,37 +1031,69 @@ Cell[BoxData[
|
|||
RowBox[{"-", "1"}], ",",
|
||||
RowBox[{"-", "1"}], ",",
|
||||
RowBox[{"-", "1"}], ",",
|
||||
RowBox[{"-", "1"}], ",",
|
||||
RowBox[{"-", "1"}]}], "}"}], ",",
|
||||
RowBox[{"{",
|
||||
RowBox[{
|
||||
RowBox[{"-", "1"}], ",", "1", ",",
|
||||
RowBox[{"-", "1"}], ",",
|
||||
RowBox[{"-", "3"}], ",",
|
||||
RowBox[{
|
||||
RowBox[{"-", "2"}], "-",
|
||||
SqrtBox["5"]}], ",",
|
||||
RowBox[{
|
||||
RowBox[{"-", "2"}], "-",
|
||||
SqrtBox["5"]}], ",",
|
||||
RowBox[{"-", "1"}]}], "}"}], ",",
|
||||
RowBox[{"{",
|
||||
RowBox[{
|
||||
RowBox[{"-", "1"}], ",",
|
||||
RowBox[{"-", "1"}], ",", "1", ",",
|
||||
RowBox[{"-", "1"}], ",",
|
||||
RowBox[{"-", "3"}]}], "}"}], ",",
|
||||
RowBox[{
|
||||
RowBox[{"-", "2"}], "-",
|
||||
SqrtBox["5"]}], ",",
|
||||
RowBox[{
|
||||
RowBox[{"-", "2"}], "-",
|
||||
SqrtBox["5"]}]}], "}"}], ",",
|
||||
RowBox[{"{",
|
||||
RowBox[{
|
||||
RowBox[{"-", "1"}], ",",
|
||||
RowBox[{"-", "3"}], ",",
|
||||
RowBox[{
|
||||
RowBox[{"-", "2"}], "-",
|
||||
SqrtBox["5"]}], ",",
|
||||
RowBox[{"-", "1"}], ",", "1", ",",
|
||||
RowBox[{"-", "1"}], ",",
|
||||
RowBox[{
|
||||
RowBox[{"-", "2"}], "-",
|
||||
SqrtBox["5"]}]}], "}"}], ",",
|
||||
RowBox[{"{",
|
||||
RowBox[{
|
||||
RowBox[{"-", "1"}], ",",
|
||||
RowBox[{
|
||||
RowBox[{"-", "2"}], "-",
|
||||
SqrtBox["5"]}], ",",
|
||||
RowBox[{
|
||||
RowBox[{"-", "2"}], "-",
|
||||
SqrtBox["5"]}], ",",
|
||||
RowBox[{"-", "1"}], ",", "1", ",",
|
||||
RowBox[{"-", "1"}]}], "}"}], ",",
|
||||
RowBox[{"{",
|
||||
RowBox[{
|
||||
RowBox[{"-", "1"}], ",",
|
||||
RowBox[{"-", "1"}], ",",
|
||||
RowBox[{"-", "3"}], ",",
|
||||
RowBox[{
|
||||
RowBox[{"-", "2"}], "-",
|
||||
SqrtBox["5"]}], ",",
|
||||
RowBox[{
|
||||
RowBox[{"-", "2"}], "-",
|
||||
SqrtBox["5"]}], ",",
|
||||
RowBox[{"-", "1"}], ",", "1"}], "}"}]}], "}"}]], "Output",
|
||||
CellChangeTimes->{{3.8345010712331038`*^9, 3.834501076129974*^9},
|
||||
3.834501229130864*^9, 3.834502882798918*^9, 3.8345689605886927`*^9,
|
||||
3.834569041895773*^9, {3.83460821722288*^9, 3.834608277378764*^9},
|
||||
3.834613259571035*^9},
|
||||
CellLabel->
|
||||
"Out[293]=",ExpressionUUID->"71b7f1a7-5e88-4605-9406-a449116256ae"]
|
||||
3.834613259571035*^9, 3.8346197096397047`*^9, 3.8346197456640778`*^9,
|
||||
3.834619781398299*^9},
|
||||
CellLabel->"Out[39]=",ExpressionUUID->"d4886bba-f5a9-4546-a097-33ce9d228c74"]
|
||||
}, Open ]],
|
||||
|
||||
Cell[CellGroupData[{
|
||||
|
|
@ -1223,10 +1114,9 @@ Cell[BoxData[
|
|||
3.832075225240695*^9, 3.832075250655039*^9}, 3.832154275791316*^9, {
|
||||
3.834150652562565*^9, 3.8341506602368183`*^9}, {3.834179514150607*^9,
|
||||
3.834179527454651*^9}},
|
||||
CellLabel->
|
||||
"In[294]:=",ExpressionUUID->"ced1cd28-39c9-46f3-906f-472b911c83b5"],
|
||||
CellLabel->"In[40]:=",ExpressionUUID->"ced1cd28-39c9-46f3-906f-472b911c83b5"],
|
||||
|
||||
Cell[BoxData["5"], "Output",
|
||||
Cell[BoxData["6"], "Output",
|
||||
CellChangeTimes->{
|
||||
3.8311389995758657`*^9, 3.8311390332247753`*^9, {3.831139077841172*^9,
|
||||
3.8311390946047153`*^9}, {3.831139139540516*^9, 3.8311391502889767`*^9}, {
|
||||
|
|
@ -1243,9 +1133,9 @@ Cell[BoxData["5"], "Output",
|
|||
3.8341797131884813`*^9, 3.834179811405641*^9, {3.834501061407423*^9,
|
||||
3.834501076151882*^9}, 3.8345012291462593`*^9, 3.834502882817725*^9,
|
||||
3.834568960611871*^9, 3.834569041953014*^9, {3.834608217314954*^9,
|
||||
3.83460827739392*^9}, 3.8346132595933733`*^9},
|
||||
CellLabel->
|
||||
"Out[294]=",ExpressionUUID->"7d1068cd-4185-4697-a370-98c58525919d"]
|
||||
3.83460827739392*^9}, 3.8346132595933733`*^9, 3.834619709653597*^9,
|
||||
3.8346197456802607`*^9, 3.834619781410372*^9},
|
||||
CellLabel->"Out[40]=",ExpressionUUID->"86850e86-0d9a-4d04-9f00-ec892f30e1b0"]
|
||||
}, Open ]],
|
||||
|
||||
Cell[CellGroupData[{
|
||||
|
|
@ -1254,8 +1144,7 @@ Cell[BoxData[
|
|||
RowBox[{"MatrixForm", "[", "G", "]"}]], "Input",
|
||||
CellChangeTimes->{{3.8310684245019207`*^9, 3.831068430589032*^9},
|
||||
3.831070943176569*^9},
|
||||
CellLabel->
|
||||
"In[295]:=",ExpressionUUID->"c3856cfc-8a90-4b2e-a7f8-03f066ea4f67"],
|
||||
CellLabel->"In[41]:=",ExpressionUUID->"c3856cfc-8a90-4b2e-a7f8-03f066ea4f67"],
|
||||
|
||||
Cell[BoxData[
|
||||
TagBox[
|
||||
|
|
@ -1264,26 +1153,57 @@ Cell[BoxData[
|
|||
RowBox[{"-", "1"}],
|
||||
RowBox[{"-", "1"}],
|
||||
RowBox[{"-", "1"}],
|
||||
RowBox[{"-", "1"}],
|
||||
RowBox[{"-", "1"}]},
|
||||
{
|
||||
RowBox[{"-", "1"}], "1",
|
||||
RowBox[{"-", "1"}],
|
||||
RowBox[{"-", "3"}],
|
||||
RowBox[{
|
||||
RowBox[{"-", "2"}], "-",
|
||||
SqrtBox["5"]}],
|
||||
RowBox[{
|
||||
RowBox[{"-", "2"}], "-",
|
||||
SqrtBox["5"]}],
|
||||
RowBox[{"-", "1"}]},
|
||||
{
|
||||
RowBox[{"-", "1"}],
|
||||
RowBox[{"-", "1"}], "1",
|
||||
RowBox[{"-", "1"}],
|
||||
RowBox[{"-", "3"}]},
|
||||
RowBox[{
|
||||
RowBox[{"-", "2"}], "-",
|
||||
SqrtBox["5"]}],
|
||||
RowBox[{
|
||||
RowBox[{"-", "2"}], "-",
|
||||
SqrtBox["5"]}]},
|
||||
{
|
||||
RowBox[{"-", "1"}],
|
||||
RowBox[{"-", "3"}],
|
||||
RowBox[{
|
||||
RowBox[{"-", "2"}], "-",
|
||||
SqrtBox["5"]}],
|
||||
RowBox[{"-", "1"}], "1",
|
||||
RowBox[{"-", "1"}],
|
||||
RowBox[{
|
||||
RowBox[{"-", "2"}], "-",
|
||||
SqrtBox["5"]}]},
|
||||
{
|
||||
RowBox[{"-", "1"}],
|
||||
RowBox[{
|
||||
RowBox[{"-", "2"}], "-",
|
||||
SqrtBox["5"]}],
|
||||
RowBox[{
|
||||
RowBox[{"-", "2"}], "-",
|
||||
SqrtBox["5"]}],
|
||||
RowBox[{"-", "1"}], "1",
|
||||
RowBox[{"-", "1"}]},
|
||||
{
|
||||
RowBox[{"-", "1"}],
|
||||
RowBox[{"-", "1"}],
|
||||
RowBox[{"-", "3"}],
|
||||
RowBox[{
|
||||
RowBox[{"-", "2"}], "-",
|
||||
SqrtBox["5"]}],
|
||||
RowBox[{
|
||||
RowBox[{"-", "2"}], "-",
|
||||
SqrtBox["5"]}],
|
||||
RowBox[{"-", "1"}], "1"}
|
||||
},
|
||||
GridBoxAlignment->{"Columns" -> {{Center}}, "Rows" -> {{Baseline}}},
|
||||
|
|
@ -1321,17 +1241,17 @@ Cell[BoxData[
|
|||
3.834501061427705*^9, 3.834501076174374*^9}, 3.8345012291623507`*^9,
|
||||
3.8345028828382463`*^9, 3.834568960652845*^9, {3.834569033461903*^9,
|
||||
3.834569041971336*^9}, {3.834608217364354*^9, 3.834608277409753*^9},
|
||||
3.834613259617034*^9},
|
||||
3.834613259617034*^9, 3.834619709668024*^9, 3.834619745696979*^9,
|
||||
3.834619781423669*^9},
|
||||
CellLabel->
|
||||
"Out[295]//MatrixForm=",ExpressionUUID->"45374975-4620-44a5-bf25-\
|
||||
34b9631e9eef"]
|
||||
"Out[41]//MatrixForm=",ExpressionUUID->"aaac5f71-64ec-4550-aa90-\
|
||||
1e258e041bd8"]
|
||||
}, Open ]],
|
||||
|
||||
Cell[BoxData[""], "Input",
|
||||
CellChangeTimes->{{3.8310924022859507`*^9, 3.831092406878796*^9}, {
|
||||
3.8311137278056173`*^9, 3.8311137280579557`*^9}, 3.831552904141026*^9},
|
||||
CellLabel->
|
||||
"In[296]:=",ExpressionUUID->"c0fe9f2e-e239-4938-84cd-0e217d1ee57c"],
|
||||
CellLabel->"In[42]:=",ExpressionUUID->"c0fe9f2e-e239-4938-84cd-0e217d1ee57c"],
|
||||
|
||||
Cell[CellGroupData[{
|
||||
|
||||
|
|
@ -1344,8 +1264,7 @@ Cell[BoxData[
|
|||
3.831126153456332*^9}, {3.831138701611702*^9, 3.831138701838715*^9}, {
|
||||
3.831139071114275*^9, 3.8311390712579117`*^9}, {3.831139182740775*^9,
|
||||
3.831139182989287*^9}, {3.8315534621430817`*^9, 3.8315534622203608`*^9}},
|
||||
CellLabel->
|
||||
"In[297]:=",ExpressionUUID->"0fcfbb19-b2bd-4a52-925c-ac50bcdaec4f"],
|
||||
CellLabel->"In[43]:=",ExpressionUUID->"0fcfbb19-b2bd-4a52-925c-ac50bcdaec4f"],
|
||||
|
||||
Cell[BoxData["4"], "Output",
|
||||
CellChangeTimes->{{3.831077658967082*^9, 3.831077690109293*^9},
|
||||
|
|
@ -1415,9 +1334,9 @@ Cell[BoxData["4"], "Output",
|
|||
3.8341798115140533`*^9, {3.8345010614473867`*^9, 3.834501076200571*^9},
|
||||
3.834501229181724*^9, 3.834502882864852*^9, 3.834568960687703*^9,
|
||||
3.834569041992879*^9, {3.8346082174024277`*^9, 3.834608277428707*^9},
|
||||
3.8346132596494503`*^9},
|
||||
CellLabel->
|
||||
"Out[297]=",ExpressionUUID->"c7ca20bd-4c9c-483c-b50b-5698dafd9f80"]
|
||||
3.8346132596494503`*^9, 3.834619709684678*^9, 3.8346197457179537`*^9,
|
||||
3.8346197814400587`*^9},
|
||||
CellLabel->"Out[43]=",ExpressionUUID->"a881aebc-065c-4ee5-b482-321ac8b46d3a"]
|
||||
}, Open ]],
|
||||
|
||||
Cell[CellGroupData[{
|
||||
|
|
@ -1429,8 +1348,7 @@ Cell[BoxData[
|
|||
CellChangeTimes->{{3.8310687914533653`*^9, 3.831068852426504*^9}, {
|
||||
3.831069579236924*^9, 3.831069580068521*^9}, {3.831077557179717*^9,
|
||||
3.8310775573141937`*^9}, {3.831077610720077*^9, 3.8310776304729652`*^9}},
|
||||
CellLabel->
|
||||
"In[298]:=",ExpressionUUID->"66dee78e-384d-4588-9d25-04b3c7b1aea7"],
|
||||
CellLabel->"In[44]:=",ExpressionUUID->"66dee78e-384d-4588-9d25-04b3c7b1aea7"],
|
||||
|
||||
Cell[BoxData[
|
||||
RowBox[{"{",
|
||||
|
|
@ -1530,9 +1448,9 @@ Cell[BoxData[
|
|||
3.834179811535512*^9, {3.834501061468029*^9, 3.83450107622572*^9},
|
||||
3.8345012291977587`*^9, 3.834502882881853*^9, 3.834568960712244*^9,
|
||||
3.834569042005877*^9, {3.834608217439719*^9, 3.834608277444111*^9},
|
||||
3.83461325967183*^9},
|
||||
CellLabel->
|
||||
"Out[298]=",ExpressionUUID->"4d944208-efd8-4bf9-8571-ed7c9065db41"]
|
||||
3.83461325967183*^9, 3.8346197096982527`*^9, {3.834619745735023*^9,
|
||||
3.834619750445147*^9}, 3.834619781454649*^9},
|
||||
CellLabel->"Out[44]=",ExpressionUUID->"8ff17e09-3f3f-467f-8160-bff8ef3042de"]
|
||||
}, Open ]],
|
||||
|
||||
Cell[CellGroupData[{
|
||||
|
|
@ -1544,13 +1462,12 @@ Cell[BoxData[
|
|||
3.831068864549449*^9, {3.831068913060398*^9, 3.831068913704132*^9}, {
|
||||
3.831070982047958*^9, 3.8310709823617363`*^9}, {3.8341797067716312`*^9,
|
||||
3.8341797075825768`*^9}},
|
||||
CellLabel->
|
||||
"In[299]:=",ExpressionUUID->"6c7429b3-1587-4d20-991f-d99f45021537"],
|
||||
CellLabel->"In[45]:=",ExpressionUUID->"6c7429b3-1587-4d20-991f-d99f45021537"],
|
||||
|
||||
Cell[BoxData[
|
||||
RowBox[{"{",
|
||||
RowBox[{
|
||||
RowBox[{"-", "1"}], ",", "1", ",", "1", ",", "1", ",", "0"}],
|
||||
RowBox[{"-", "1"}], ",", "1", ",", "1", ",", "1", ",", "0", ",", "0"}],
|
||||
"}"}]], "Output",
|
||||
CellChangeTimes->{
|
||||
3.831069655368197*^9, {3.831069731555151*^9, 3.8310697423741207`*^9},
|
||||
|
|
@ -1642,9 +1559,9 @@ Cell[BoxData[
|
|||
3.834179635038335*^9, 3.834179714041378*^9, 3.834179811582711*^9, {
|
||||
3.8345010615381107`*^9, 3.834501076421116*^9}, 3.8345012292720633`*^9,
|
||||
3.8345028829639797`*^9, 3.834568961033568*^9, 3.834569042385539*^9, {
|
||||
3.834608217835533*^9, 3.83460827747479*^9}, 3.8346132596995*^9},
|
||||
CellLabel->
|
||||
"Out[299]=",ExpressionUUID->"b86716b8-cefa-481e-bf7a-e62f17d96863"]
|
||||
3.834608217835533*^9, 3.83460827747479*^9}, 3.8346132596995*^9,
|
||||
3.8346197097744637`*^9, 3.834619745758875*^9, 3.834619781487938*^9},
|
||||
CellLabel->"Out[45]=",ExpressionUUID->"8641f3f1-8ea5-48a4-ac9a-aef301c58a8a"]
|
||||
}, Open ]],
|
||||
|
||||
Cell[BoxData[
|
||||
|
|
@ -1680,8 +1597,7 @@ Cell[BoxData[
|
|||
3.831139083258071*^9, 3.831139092421317*^9}, {3.831139192060491*^9,
|
||||
3.831139212300468*^9}, {3.831553470591372*^9, 3.831553478545971*^9},
|
||||
3.83417970530786*^9},
|
||||
CellLabel->
|
||||
"In[300]:=",ExpressionUUID->"dd7b3324-1ab6-43b0-9e24-406f40fb34ba"],
|
||||
CellLabel->"In[46]:=",ExpressionUUID->"dd7b3324-1ab6-43b0-9e24-406f40fb34ba"],
|
||||
|
||||
Cell[BoxData[{
|
||||
RowBox[{
|
||||
|
|
@ -1730,8 +1646,7 @@ Cell[BoxData[{
|
|||
3.8310843677991743`*^9, 3.8310843903198833`*^9}, {3.831084590240316*^9,
|
||||
3.8310845937558413`*^9}, {3.831084628215064*^9, 3.831084651458681*^9}, {
|
||||
3.8341797019320917`*^9, 3.834179704491941*^9}},
|
||||
CellLabel->
|
||||
"In[301]:=",ExpressionUUID->"9e97f31a-ffaa-4f35-bb49-127a66bb73f7"],
|
||||
CellLabel->"In[47]:=",ExpressionUUID->"9e97f31a-ffaa-4f35-bb49-127a66bb73f7"],
|
||||
|
||||
Cell[BoxData[{
|
||||
RowBox[{
|
||||
|
|
@ -1806,8 +1721,7 @@ Vg0Vl8GJ3tYsEVG/6pLCm32ZHA635VEV2o89mC/+pW6rxJ7oHrJ3q8YL1aXl
|
|||
afjS+0pVpgo5HOLSZBMPsh3O21DzgyRI+k1V+q5ZMcRprp4NLb6BkDWi253A
|
||||
ghFjM2eQO846h39Zj/tn
|
||||
"],
|
||||
CellLabel->
|
||||
"In[306]:=",ExpressionUUID->"0209d30a-517c-4664-b87b-84799191f438"],
|
||||
CellLabel->"In[52]:=",ExpressionUUID->"0209d30a-517c-4664-b87b-84799191f438"],
|
||||
|
||||
Cell[CellGroupData[{
|
||||
|
||||
|
|
@ -2019,23 +1933,27 @@ Cell[BoxData[{
|
|||
3.831126219196403*^9, 3.831126229413628*^9}, {3.8346082657844973`*^9,
|
||||
3.8346082869679623`*^9}},
|
||||
NumberMarks->False,
|
||||
CellLabel->
|
||||
"In[315]:=",ExpressionUUID->"3a5095fb-bef7-4905-a187-ccc481ddd9ee"],
|
||||
CellLabel->"In[61]:=",ExpressionUUID->"3a5095fb-bef7-4905-a187-ccc481ddd9ee"],
|
||||
|
||||
Cell[BoxData[
|
||||
TagBox[
|
||||
RowBox[{"(", "\[NoBreak]", GridBox[{
|
||||
{"1.9486311405059253`", "0.8071494464601062`", "0.8071494464601062`",
|
||||
"0.8071494464601062`", "0.8071494464601062`"},
|
||||
{"1.8143598172869573`", "1.2724134731462617`", "1.2724134731462617`",
|
||||
"1.2724134731462617`", "1.2724134731462617`", "1.2724134731462617`"},
|
||||
{
|
||||
RowBox[{"-", "0.5131807550506294`"}], "1.2389279387920946`",
|
||||
"1.2389279387920946`", "1.2389279387920946`", "1.2389279387920946`"},
|
||||
{"0.`", "0.`",
|
||||
RowBox[{"-", "1.4142135623730951`"}], "0.`", "1.4142135623730951`"},
|
||||
{"0.`",
|
||||
RowBox[{"-", "1.4142135623730951`"}], "0.`", "1.4142135623730951`",
|
||||
"0.`"},
|
||||
{"0", "0", "0", "0", "0"}
|
||||
RowBox[{"-", "0.5511585907448705`"}], "1.4888455922394608`",
|
||||
"1.4888455922394608`", "1.4888455922394608`", "1.4888455922394608`",
|
||||
"1.4888455922394608`"},
|
||||
{
|
||||
RowBox[{"-", "2.769102509824876`*^-117"}], "1.0000000000000002`",
|
||||
RowBox[{"-", "1.0000000000000002`"}],
|
||||
RowBox[{"-", "1.618033988749895`"}],
|
||||
RowBox[{"-", "6.0530414692259196`*^-117"}], "1.618033988749895`"},
|
||||
{"3.890992197379559`*^-116",
|
||||
RowBox[{"-", "1.3763819204711736`"}],
|
||||
RowBox[{"-", "1.3763819204711736`"}], "0.5257311121191336`",
|
||||
"1.70130161670408`", "0.5257311121191336`"},
|
||||
{"0", "0", "0", "0", "0", "0"}
|
||||
},
|
||||
GridBoxAlignment->{"Columns" -> {{Center}}, "Rows" -> {{Baseline}}},
|
||||
GridBoxSpacings->{"Columns" -> {
|
||||
|
|
@ -2097,17 +2015,18 @@ Cell[BoxData[
|
|||
3.834150722393003*^9, 3.834179638862646*^9, 3.83417971760988*^9,
|
||||
3.834179811662073*^9, {3.83450106170175*^9, 3.834501078858068*^9},
|
||||
3.834502885610161*^9, 3.834568964784423*^9, 3.834569045834074*^9, {
|
||||
3.834608221545703*^9, 3.834608287914912*^9}, 3.834613259816371*^9},
|
||||
3.834608221545703*^9, 3.834608287914912*^9}, 3.834613259816371*^9,
|
||||
3.834619710098199*^9, 3.8346197459725227`*^9, 3.8346197817356377`*^9},
|
||||
CellLabel->
|
||||
"Out[315]//MatrixForm=",ExpressionUUID->"e0ad8c18-1b83-4146-ae6d-\
|
||||
44a1abd94479"],
|
||||
"Out[61]//MatrixForm=",ExpressionUUID->"ab3c1b2c-b9bf-410b-bdc3-\
|
||||
8c3ef889c390"],
|
||||
|
||||
Cell[BoxData[
|
||||
RowBox[{"{",
|
||||
RowBox[{
|
||||
RowBox[{"-", "0.5131807550506294`"}], ",", "1.2389279387920946`", ",",
|
||||
"1.2389279387920946`", ",", "1.2389279387920946`", ",",
|
||||
"1.2389279387920946`"}], "}"}]], "Output",
|
||||
RowBox[{"-", "0.5511585907448705`"}], ",", "1.4888455922394608`", ",",
|
||||
"1.4888455922394608`", ",", "1.4888455922394608`", ",",
|
||||
"1.4888455922394608`", ",", "1.4888455922394608`"}], "}"}]], "Output",
|
||||
CellChangeTimes->{
|
||||
3.8310808181124763`*^9, 3.831080860753619*^9, {3.8310809469470253`*^9,
|
||||
3.831080964993269*^9}, {3.831081004545352*^9, 3.8310810231079683`*^9}, {
|
||||
|
|
@ -2158,16 +2077,20 @@ Cell[BoxData[
|
|||
3.834150722393003*^9, 3.834179638862646*^9, 3.83417971760988*^9,
|
||||
3.834179811662073*^9, {3.83450106170175*^9, 3.834501078858068*^9},
|
||||
3.834502885610161*^9, 3.834568964784423*^9, 3.834569045834074*^9, {
|
||||
3.834608221545703*^9, 3.834608287914912*^9}, 3.834613259822506*^9},
|
||||
CellLabel->
|
||||
"Out[316]=",ExpressionUUID->"bd55e7f1-e7ed-4687-b2e0-1b4acec683a0"],
|
||||
3.834608221545703*^9, 3.834608287914912*^9}, 3.834613259816371*^9,
|
||||
3.834619710098199*^9, 3.8346197459725227`*^9, 3.834619781739894*^9},
|
||||
CellLabel->"Out[62]=",ExpressionUUID->"f14ecbea-5a12-446d-8cef-862d9d63cc15"],
|
||||
|
||||
Cell[BoxData[
|
||||
GraphicsBox[{CircleBox[{0., 0.}, 1.9486311405059256],
|
||||
CircleBox[{0., -1.1414816940458192}, 0.8071494464601066],
|
||||
CircleBox[{-1.1414816940458192, 0.}, 0.8071494464601066],
|
||||
CircleBox[{0., 1.1414816940458192}, 0.8071494464601066],
|
||||
CircleBox[{1.1414816940458192, 0.}, 0.8071494464601066]},
|
||||
GraphicsBox[{
|
||||
CircleBox[{5.024148323774716*^-117, -7.059659892302553*^-116},
|
||||
1.814359817286957],
|
||||
CircleBox[{0.6716613228480202, -0.9244625014477668}, 0.67166132284802],
|
||||
CircleBox[{-0.6716613228480202, -0.9244625014477668}, 0.67166132284802],
|
||||
CircleBox[{-1.086770849296813, 0.35311325422829803}, 0.67166132284802],
|
||||
CircleBox[{-4.065593840474204*^-117, 1.1426984944389376},
|
||||
0.67166132284802],
|
||||
CircleBox[{1.086770849296813, 0.35311325422829803}, 0.67166132284802]},
|
||||
ImageSize->{443.87890625, Automatic}]], "Output",
|
||||
CellChangeTimes->{
|
||||
3.8310808181124763`*^9, 3.831080860753619*^9, {3.8310809469470253`*^9,
|
||||
|
|
@ -2219,9 +2142,9 @@ Cell[BoxData[
|
|||
3.834150722393003*^9, 3.834179638862646*^9, 3.83417971760988*^9,
|
||||
3.834179811662073*^9, {3.83450106170175*^9, 3.834501078858068*^9},
|
||||
3.834502885610161*^9, 3.834568964784423*^9, 3.834569045834074*^9, {
|
||||
3.834608221545703*^9, 3.834608287914912*^9}, 3.834613259845879*^9},
|
||||
CellLabel->
|
||||
"Out[317]=",ExpressionUUID->"666c0c41-6bfc-4847-a5d2-14880c7266f6"]
|
||||
3.834608221545703*^9, 3.834608287914912*^9}, 3.834613259816371*^9,
|
||||
3.834619710098199*^9, 3.8346197459725227`*^9, 3.834619781751107*^9},
|
||||
CellLabel->"Out[63]=",ExpressionUUID->"9e378847-40a9-421b-bf5a-f6c77804a057"]
|
||||
}, Open ]]
|
||||
},
|
||||
WindowSize->{1425., 776.25},
|
||||
|
|
@ -2241,46 +2164,43 @@ CellTagsIndex->{}
|
|||
*)
|
||||
(*NotebookFileOutline
|
||||
Notebook[{
|
||||
Cell[558, 20, 318, 8, 58, "Text",ExpressionUUID->"73b90f40-aa75-45cc-9624-86406ff3f05e"],
|
||||
Cell[879, 30, 1102, 29, 29, "Input",ExpressionUUID->"42bda541-275e-4fa8-ad0f-dff973087409"],
|
||||
Cell[1984, 61, 28640, 879, 1293, "Input",ExpressionUUID->"c77ea1b4-464a-475d-935a-6ddd3139e407"],
|
||||
Cell[558, 20, 318, 8, 81, "Text",ExpressionUUID->"73b90f40-aa75-45cc-9624-86406ff3f05e"],
|
||||
Cell[879, 30, 1097, 28, 51, "Input",ExpressionUUID->"42bda541-275e-4fa8-ad0f-dff973087409"],
|
||||
Cell[1979, 60, 28635, 878, 2208, "Input",ExpressionUUID->"c77ea1b4-464a-475d-935a-6ddd3139e407"],
|
||||
Cell[30617, 940, 483, 10, 29, "Input",ExpressionUUID->"2acb2df6-0250-4f93-a487-d393ec6948a7"],
|
||||
Cell[CellGroupData[{
|
||||
Cell[30649, 944, 370, 9, 29, "Input",ExpressionUUID->"2acb2df6-0250-4f93-a487-d393ec6948a7"],
|
||||
Cell[31022, 955, 7643, 167, 261, "Output",ExpressionUUID->"00f58963-1bec-4f17-b581-aff807028e0f"]
|
||||
Cell[31125, 954, 2034, 69, 79, "Input",ExpressionUUID->"1616f30b-f817-4bed-8186-0f3e4b738bac"],
|
||||
Cell[33162, 1025, 2097, 70, 81, "Output",ExpressionUUID->"d4886bba-f5a9-4546-a097-33ce9d228c74"]
|
||||
}, Open ]],
|
||||
Cell[CellGroupData[{
|
||||
Cell[38702, 1127, 1191, 37, 29, "Input",ExpressionUUID->"1616f30b-f817-4bed-8186-0f3e4b738bac"],
|
||||
Cell[39896, 1166, 1238, 38, 33, "Output",ExpressionUUID->"71b7f1a7-5e88-4605-9406-a449116256ae"]
|
||||
Cell[35296, 1100, 1064, 16, 29, "Input",ExpressionUUID->"ced1cd28-39c9-46f3-906f-472b911c83b5"],
|
||||
Cell[36363, 1118, 1330, 19, 33, "Output",ExpressionUUID->"86850e86-0d9a-4d04-9f00-ec892f30e1b0"]
|
||||
}, Open ]],
|
||||
Cell[CellGroupData[{
|
||||
Cell[41171, 1209, 1068, 17, 29, "Input",ExpressionUUID->"ced1cd28-39c9-46f3-906f-472b911c83b5"],
|
||||
Cell[42242, 1228, 1262, 19, 33, "Output",ExpressionUUID->"7d1068cd-4185-4697-a370-98c58525919d"]
|
||||
Cell[37730, 1142, 236, 4, 29, "Input",ExpressionUUID->"c3856cfc-8a90-4b2e-a7f8-03f066ea4f67"],
|
||||
Cell[37969, 1148, 3734, 99, 145, "Output",ExpressionUUID->"aaac5f71-64ec-4550-aa90-1e258e041bd8"]
|
||||
}, Open ]],
|
||||
Cell[41718, 1250, 249, 3, 29, "Input",ExpressionUUID->"c0fe9f2e-e239-4938-84cd-0e217d1ee57c"],
|
||||
Cell[CellGroupData[{
|
||||
Cell[41992, 1257, 636, 9, 29, "Input",ExpressionUUID->"0fcfbb19-b2bd-4a52-925c-ac50bcdaec4f"],
|
||||
Cell[42631, 1268, 5091, 70, 33, "Output",ExpressionUUID->"a881aebc-065c-4ee5-b482-321ac8b46d3a"]
|
||||
}, Open ]],
|
||||
Cell[CellGroupData[{
|
||||
Cell[43541, 1252, 240, 5, 29, "Input",ExpressionUUID->"c3856cfc-8a90-4b2e-a7f8-03f066ea4f67"],
|
||||
Cell[43784, 1259, 2933, 67, 113, "Output",ExpressionUUID->"45374975-4620-44a5-bf25-34b9631e9eef"]
|
||||
}, Open ]],
|
||||
Cell[46732, 1329, 253, 4, 29, "Input",ExpressionUUID->"c0fe9f2e-e239-4938-84cd-0e217d1ee57c"],
|
||||
Cell[CellGroupData[{
|
||||
Cell[47010, 1337, 640, 10, 29, "Input",ExpressionUUID->"0fcfbb19-b2bd-4a52-925c-ac50bcdaec4f"],
|
||||
Cell[47653, 1349, 5021, 70, 33, "Output",ExpressionUUID->"c7ca20bd-4c9c-483c-b50b-5698dafd9f80"]
|
||||
Cell[47759, 1343, 419, 7, 29, "Input",ExpressionUUID->"66dee78e-384d-4588-9d25-04b3c7b1aea7"],
|
||||
Cell[48181, 1352, 7176, 100, 33, "Output",ExpressionUUID->"8ff17e09-3f3f-467f-8160-bff8ef3042de"]
|
||||
}, Open ]],
|
||||
Cell[CellGroupData[{
|
||||
Cell[52711, 1424, 423, 8, 29, "Input",ExpressionUUID->"66dee78e-384d-4588-9d25-04b3c7b1aea7"],
|
||||
Cell[53137, 1434, 7084, 100, 33, "Output",ExpressionUUID->"4d944208-efd8-4bf9-8571-ed7c9065db41"]
|
||||
Cell[55394, 1457, 371, 7, 29, "Input",ExpressionUUID->"6c7429b3-1587-4d20-991f-d99f45021537"],
|
||||
Cell[55768, 1466, 6880, 97, 33, "Output",ExpressionUUID->"8641f3f1-8ea5-48a4-ac9a-aef301c58a8a"]
|
||||
}, Open ]],
|
||||
Cell[62663, 1566, 1912, 33, 29, "Input",ExpressionUUID->"dd7b3324-1ab6-43b0-9e24-406f40fb34ba"],
|
||||
Cell[64578, 1601, 1944, 47, 133, "Input",ExpressionUUID->"9e97f31a-ffaa-4f35-bb49-127a66bb73f7"],
|
||||
Cell[66525, 1650, 2599, 73, 216, "Input",ExpressionUUID->"0209d30a-517c-4664-b87b-84799191f438"],
|
||||
Cell[CellGroupData[{
|
||||
Cell[60258, 1539, 375, 8, 29, "Input",ExpressionUUID->"6c7429b3-1587-4d20-991f-d99f45021537"],
|
||||
Cell[60636, 1549, 6802, 97, 33, "Output",ExpressionUUID->"b86716b8-cefa-481e-bf7a-e62f17d96863"]
|
||||
}, Open ]],
|
||||
Cell[67453, 1649, 1916, 34, 29, "Input",ExpressionUUID->"dd7b3324-1ab6-43b0-9e24-406f40fb34ba"],
|
||||
Cell[69372, 1685, 1948, 48, 113, "Input",ExpressionUUID->"9e97f31a-ffaa-4f35-bb49-127a66bb73f7"],
|
||||
Cell[71323, 1735, 2603, 74, 195, "Input",ExpressionUUID->"0209d30a-517c-4664-b87b-84799191f438"],
|
||||
Cell[CellGroupData[{
|
||||
Cell[73951, 1813, 8586, 209, 408, "Input",ExpressionUUID->"3a5095fb-bef7-4905-a187-ccc481ddd9ee"],
|
||||
Cell[82540, 2024, 4709, 78, 113, "Output",ExpressionUUID->"e0ad8c18-1b83-4146-ae6d-44a1abd94479"],
|
||||
Cell[87252, 2104, 3956, 58, 56, "Output",ExpressionUUID->"bd55e7f1-e7ed-4687-b2e0-1b4acec683a0"],
|
||||
Cell[91211, 2164, 4103, 59, 460, "Output",ExpressionUUID->"666c0c41-6bfc-4847-a5d2-14880c7266f6"]
|
||||
Cell[69149, 1727, 8582, 208, 498, "Input",ExpressionUUID->"3a5095fb-bef7-4905-a187-ccc481ddd9ee"],
|
||||
Cell[77734, 1937, 5082, 84, 117, "Output",ExpressionUUID->"ab3c1b2c-b9bf-410b-bdc3-8c3ef889c390"],
|
||||
Cell[82819, 2023, 4052, 58, 56, "Output",ExpressionUUID->"f14ecbea-5a12-446d-8cef-862d9d63cc15"],
|
||||
Cell[86874, 2083, 4366, 63, 460, "Output",ExpressionUUID->"9e378847-40a9-421b-bf5a-f6c77804a057"]
|
||||
}, Open ]]
|
||||
}
|
||||
]
|
||||
|
|
|
|||
|
|
@ -1,5 +1,25 @@
|
|||
{{{1., 0., 0., 0., 0.}, {0., 1., 0., 0., 0.}, {4., 3., 0., -1., 3.}, {4., 2., 0., -1., 4.}, {0., 0., 0., 0., 1.}}, {{1., 0., 0., 0., 0.}, {0., 1., 0., 0., 0.}, {0., 0., 1., 0., 0.}, {4., 3., 3., 0., -1.}, {4., 4., 2., 0., -1.}}, {{1., 0., 0., 0., 0.}, {4., -1., 4., 2., 0.}, {0., 0., 1., 0., 0.}, {0., 0., 0., 1., 0.}, {4., -1., 3., 3., 0.}}, {{1., 0., 0., 0., 0.}, {4., 0., -1., 3., 3.}, {4., 0., -1., 4., 2.}, {0., 0., 0., 1., 0.}, {0., 0., 0., 0., 1.}}, {{-1., 1., 0., 1., 0.}, {0., 1., 0., 0., 0.}, {0., 1., 0., 1., -1.}, {0., 0., 0., 1., 0.}, {0., 0., 0., 0., 1.}}}
|
||||
{{{1., 0., 0., 0., 0., 0.}, {0., 1., 0., 0., 0., 0.}, {4., 3., 0., -1., 3., 0.}, {4., 2., 0., -1., 4., 0.}, {0., 0., 0., 0., 1.,
|
||||
0.}, {3., 3., 0., -1., 4., 0.}}, {{1., 0., 0., 0., 0., 0.}, {0.,
|
||||
1., 0., 0., 0., 0.}, {0., 0., 1., 0., 0., 0.}, {4., 2., 4., -1.,
|
||||
0., 0.}, {4., 3., 3., -1., 0., 0.}, {3., 3., 4., -1., 0.,
|
||||
0.}}, {{1., 0., 0., 0., 0., 0.}, {3., 0., 4., 3., 0., -1.}, {0.,
|
||||
0., 1., 0., 0., 0.}, {0., 0., 0., 1., 0., 0.}, {3., 0., 3., 4.,
|
||||
0., -1.}, {2., 0., 4., 4., 0., -1.}}, {{1., 0., 0., 0., 0.,
|
||||
0.}, {3., 0., 0., 3., 4., -1.}, {3., 0., 0., 4., 3., -1.}, {0., 0.,
|
||||
0., 1., 0., 0.}, {0., 0., 0., 0., 1., 0.}, {2., 0., 0., 4.,
|
||||
4., -1.}}, {{-1., 4., 4., 0., 0., 2.}, {0., 1., 0., 0., 0.,
|
||||
0.}, {0., 0., 1., 0., 0., 0.}, {-1., 3., 4., 0., 0., 3.}, {-1., 4.,
|
||||
3., 0., 0., 3.}, {0., 0., 0., 0., 0., 1.}}, {{0., 3., 0., -1., 4.,
|
||||
3.}, {0., 1., 0., 0., 0., 0.}, {0., 3., 0., -1., 3., 4.}, {0., 2.,
|
||||
0., -1., 4., 4.}, {0., 0., 0., 0., 1., 0.}, {0., 0., 0., 0., 0.,
|
||||
1.}}, {{0., -1., 4., 3., 0., 3.}, {0., -1., 4., 2., 0., 4.}, {0.,
|
||||
0., 1., 0., 0., 0.}, {0., 0., 0., 1., 0., 0.}, {0., -1., 3., 3.,
|
||||
0., 4.}, {0., 0., 0., 0., 0., 1.}}, {{0., 0., -1., 4., 3.,
|
||||
3.}, {0., 0., -1., 3., 3., 4.}, {0., 0., -1., 4., 2., 4.}, {0., 0.,
|
||||
0., 1., 0., 0.}, {0., 0., 0., 0., 1., 0.}, {0., 0., 0., 0., 0.,
|
||||
1.}}}
|
||||
|
||||
{-0.513181, 1.23893, 1.23893, 1.23893, 1.23893}
|
||||
{-1, 2, 2, 4, 4, 7}
|
||||
|
||||
{{0, 1, 4}, {0, 2, 1}, {0, 3, 2}, {0, 4, 3}, {1, 2, 3, 4}}
|
||||
{{0, 1, 4}, {0, 2, 1}, {0, 3, 2}, {0, 4, 3}, {1, 2, 5}, {1, 5, 4}, {2,
|
||||
3, 5}, {3, 4, 5}}
|
||||
|
|
|
|||
25
fractal_dimension/circle_counting_new/pentagonal_pyramid.txt
Normal file
25
fractal_dimension/circle_counting_new/pentagonal_pyramid.txt
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{{{1., 0., 0., 0., 0., 0.}, {0., 1., 0., 0., 0., 0.}, {5.23607,
|
||||
4.23607, 0., -0.618034, 0., 2.61803}, {8.47214, 5.23607, 0., -1.,
|
||||
0., 5.23607}, {5.23607, 2.61803, 0., -0.618034, 0., 4.23607}, {0.,
|
||||
0., 0., 0., 0., 1.}}, {{1., 0., 0., 0., 0., 0.}, {0., 1., 0., 0.,
|
||||
0., 0.}, {0., 0., 1., 0., 0., 0.}, {5.23607, 3.61803, 3.61803, 0.,
|
||||
0., -1.}, {8.47214, 6.8541, 4.23607, 0., 0., -1.61803}, {5.23607,
|
||||
5.23607, 2., 0., 0., -1.}}, {{1., 0., 0., 0., 0., 0.}, {5.23607,
|
||||
0., 4.23607, 2.61803, 0., -0.618034}, {0., 0., 1., 0., 0.,
|
||||
0.}, {0., 0., 0., 1., 0., 0.}, {5.23607, 0., 2.61803, 4.23607,
|
||||
0., -0.618034}, {8.47214, 0., 5.23607, 5.23607, 0., -1.}}, {{1.,
|
||||
0., 0., 0., 0., 0.}, {8.47214, -1., 0., 5.23607, 5.23607,
|
||||
0.}, {5.23607, -0.618034, 0., 4.23607, 2.61803, 0.}, {0., 0., 0.,
|
||||
1., 0., 0.}, {0., 0., 0., 0., 1., 0.}, {5.23607, -0.618034, 0.,
|
||||
2.61803, 4.23607, 0.}}, {{1., 0., 0., 0., 0., 0.}, {5.23607, -1.,
|
||||
0., 0., 2., 5.23607}, {8.47214, -1.61803, 0., 0., 4.23607,
|
||||
6.8541}, {5.23607, -1., 0., 0., 3.61803, 3.61803}, {0., 0., 0., 0.,
|
||||
1., 0.}, {0., 0., 0., 0., 0., 1.}}, {{-1., 0.763932, 0., 0.,
|
||||
0.763932, -0.472136}, {0., 1., 0., 0., 0., 0.}, {0., 1.61803, 0.,
|
||||
0., 1., -1.61803}, {0., 1., 0., 0., 1.61803, -1.61803}, {0., 0.,
|
||||
0., 0., 1., 0.}, {0., 0., 0., 0., 0., 1.}}}
|
||||
|
||||
{-0.551159, 1.48885, 1.48885, 1.48885, 1.48885, 1.48885}
|
||||
|
||||
{{0, 1, 5}, {0, 2, 1}, {0, 3, 2}, {0, 4, 3}, {0, 5, 4}, {1, 2, 3, 4,
|
||||
5}}
|
||||
5
fractal_dimension/circle_counting_new/square_pyramid.txt
Normal file
5
fractal_dimension/circle_counting_new/square_pyramid.txt
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
{{{1., 0., 0., 0., 0.}, {0., 1., 0., 0., 0.}, {4., 3., 0., -1., 3.}, {4., 2., 0., -1., 4.}, {0., 0., 0., 0., 1.}}, {{1., 0., 0., 0., 0.}, {0., 1., 0., 0., 0.}, {0., 0., 1., 0., 0.}, {4., 3., 3., 0., -1.}, {4., 4., 2., 0., -1.}}, {{1., 0., 0., 0., 0.}, {4., -1., 4., 2., 0.}, {0., 0., 1., 0., 0.}, {0., 0., 0., 1., 0.}, {4., -1., 3., 3., 0.}}, {{1., 0., 0., 0., 0.}, {4., 0., -1., 3., 3.}, {4., 0., -1., 4., 2.}, {0., 0., 0., 1., 0.}, {0., 0., 0., 0., 1.}}, {{-1., 1., 0., 1., 0.}, {0., 1., 0., 0., 0.}, {0., 1., 0., 1., -1.}, {0., 0., 0., 1., 0.}, {0., 0., 0., 0., 1.}}}
|
||||
|
||||
{-1, 2, 2, 4, 4}
|
||||
|
||||
{{0, 1, 4}, {0, 2, 1}, {0, 3, 2}, {0, 4, 3}, {1, 2, 3, 4}}
|
||||
|
|
@ -9,6 +9,7 @@ pub fn fractal_dimension(
|
|||
upper_bound: f64,
|
||||
n: usize,
|
||||
debug: bool,
|
||||
generations: usize
|
||||
) -> Result<f64, linregress::Error> {
|
||||
let mut totals = vec![root.len(); n];
|
||||
let mut current = vec![(root, std::usize::MAX)];
|
||||
|
|
@ -54,7 +55,11 @@ pub fn fractal_dimension(
|
|||
}
|
||||
std::mem::swap(&mut current, &mut next);
|
||||
|
||||
|
||||
i += 1;
|
||||
if generations != 0 && i > generations {
|
||||
break;
|
||||
}
|
||||
if debug {
|
||||
println!("Generation {}:", i);
|
||||
println!("\tnumber of leaves:\t{}", current.len());
|
||||
|
|
|
|||
|
|
@ -32,12 +32,17 @@ struct Opt {
|
|||
/// Whether or not to time excecution (automatically enabled by --debug)
|
||||
#[structopt(short, long)]
|
||||
time: bool,
|
||||
|
||||
/// Cap on the number of generations (0 means no cap)
|
||||
#[structopt(short, long, default_value = "0")]
|
||||
generations: usize,
|
||||
}
|
||||
|
||||
fn main() {
|
||||
let opt = Opt::from_args();
|
||||
let debug = opt.debug;
|
||||
let time = debug || opt.time;
|
||||
let generations = opt.generations;
|
||||
|
||||
let beginning = std::time::Instant::now();
|
||||
|
||||
|
|
@ -92,7 +97,7 @@ fn main() {
|
|||
println!("{:?}\n", faces);
|
||||
}
|
||||
|
||||
let delta = fractal_dimension(generators, root, faces, opt.max, opt.n, debug).unwrap();
|
||||
let delta = fractal_dimension(generators, root, faces, opt.max, opt.n, debug, generations).unwrap();
|
||||
let after_computing = std::time::Instant::now();
|
||||
if time {
|
||||
let duration1 = after_computing.duration_since(after_parsing);
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue