diff --git a/mysite/.idea/workspace.xml b/mysite/.idea/workspace.xml
index 0ea620c291b6ced0ebebd36e61d0185e79f0c7da..93d0b48c0a13453e826f6e272bc783d884194131 100644
--- a/mysite/.idea/workspace.xml
+++ b/mysite/.idea/workspace.xml
@@ -1,7 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
- <list default="true" id="658b6621-acba-4545-97a4-8a6a2f056018" name="Default Changelist" comment="" />
+ <list default="true" id="658b6621-acba-4545-97a4-8a6a2f056018" name="Default Changelist" comment="">
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/plots/avl_tree.py" beforeDir="false" afterPath="$PROJECT_DIR$/plots/avl_tree.py" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/plots/dataset_creator.py" beforeDir="false" afterPath="$PROJECT_DIR$/plots/dataset_creator.py" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/plots/templates/plots/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/plots/templates/plots/index.html" afterDir="false" />
+ </list>
<list id="194b05bd-5a75-4b69-8ed9-92fcd25ebb95" name="added gitignore" comment="" />
<ignored path="venv/etc/jupyter/nbconfig/notebook.d/plotlywidget.json" />
<ignored path="venv/Lib/site-packages/_plotly_future_/__init__.py" />
@@ -16368,24 +16373,24 @@
<counts>
<entry key="bat" value="2" />
<entry key="gitignore" value="9" />
- <entry key="html" value="51" />
+ <entry key="html" value="52" />
<entry key="iml" value="2" />
<entry key="js" value="4" />
- <entry key="py" value="171" />
+ <entry key="py" value="175" />
<entry key="pyi" value="1" />
<entry key="python" value="2" />
<entry key="sh" value="2" />
- <entry key="txt" value="6" />
+ <entry key="txt" value="7" />
<entry key="xml" value="7" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
- <entry key="HTML" value="51" />
+ <entry key="HTML" value="52" />
<entry key="IDEA_MODULE" value="2" />
<entry key="JavaScript" value="4" />
- <entry key="PLAIN_TEXT" value="23" />
- <entry key="Python" value="169" />
+ <entry key="PLAIN_TEXT" value="24" />
+ <entry key="Python" value="173" />
<entry key="PythonStub" value="1" />
<entry key="XML" value="7" />
</counts>
@@ -16394,7 +16399,7 @@
<counts>
<entry key="dummy" value="30" />
<entry key="gitignore" value="12" />
- <entry key="html" value="5200" />
+ <entry key="html" value="5268" />
<entry key="py" value="55553" />
<entry key="sh" value="1" />
<entry key="txt" value="1304" />
@@ -16402,7 +16407,7 @@
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
- <entry key="HTML" value="5200" />
+ <entry key="HTML" value="5268" />
<entry key="PLAIN_TEXT" value="1347" />
<entry key="Python" value="55553" />
</counts>
@@ -16421,7 +16426,7 @@
<favorites_list name="mysite" />
</component>
<component name="FileEditorManager">
- <splitter split-orientation="horizontal" split-proportion="0.36290324">
+ <splitter split-orientation="horizontal" split-proportion="0.1">
<split-first>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
@@ -16490,25 +16495,21 @@
</split-first>
<split-second>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/plots/views.py">
+ <file pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/plots/urls.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="221">
- <caret line="13" column="33" lean-forward="true" selection-start-line="13" selection-start-column="33" selection-end-line="13" selection-end-column="33" />
+ <state relative-caret-position="204">
+ <caret line="12" column="99" selection-start-line="12" selection-start-column="99" selection-end-line="12" selection-end-column="99" />
<folding>
- <marker date="1606158677988" expanded="true" signature="5358:5360" ph="..." />
+ <element signature="e#0#28#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/venv/Lib/site-packages/django/utils/datastructures.py">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1292">
- <caret line="77" selection-start-line="77" selection-end-line="77" />
- </state>
- </provider>
+ <entry file="file://$PROJECT_DIR$/plots/tests.py">
+ <provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
@@ -16521,10 +16522,24 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/plots/dataset_creator.py">
+ <entry file="file://$PROJECT_DIR$/plots/templates/plots/index.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="338">
+ <caret line="59" column="118" lean-forward="true" selection-start-line="59" selection-start-column="118" selection-end-line="59" selection-end-column="118" />
+ <folding>
+ <element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#form#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/requirements/base.txt">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="3162">
- <caret line="189" selection-start-line="189" selection-end-line="189" />
+ <state relative-caret-position="204">
+ <caret line="12" column="7" selection-start-line="12" selection-start-column="7" selection-end-line="12" selection-end-column="7" />
</state>
</provider>
</entry>
@@ -16532,17 +16547,29 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/plots/polygon_creator.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="3264">
- <caret line="196" column="27" selection-start-line="196" selection-start-column="27" selection-end-line="196" selection-end-column="27" />
+ <state relative-caret-position="119">
+ <caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="7" />
+ <folding>
+ <element signature="e#375#439#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
</file>
- <file pinned="false" current-in-tab="true">
+ <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/plots/avl_tree.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="81">
- <caret line="15" column="24" lean-forward="true" selection-start-line="15" selection-start-column="24" selection-end-line="15" selection-end-column="24" />
+ <state relative-caret-position="17">
+ <caret line="1" column="35" selection-start-line="1" selection-start-column="35" selection-end-line="1" selection-end-column="35" />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/plots/admin.py">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="34">
+ <caret line="2" column="30" selection-start-line="2" selection-start-column="30" selection-end-line="2" selection-end-column="30" />
</state>
</provider>
</entry>
@@ -16557,10 +16584,13 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/plots/static/plots/js/bokeh-2.2.3.min.js">
+ <entry file="file://$PROJECT_DIR$/plots/packing_algo.py">
<provider selected="true" editor-type-id="text-editor">
- <state>
- <caret column="3" selection-start-column="3" selection-end-column="3" />
+ <state relative-caret-position="187">
+ <caret line="664" column="21" lean-forward="true" selection-start-line="664" selection-start-column="21" selection-end-line="664" selection-end-column="21" />
+ <folding>
+ <element signature="e#539#550#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
@@ -16653,13 +16683,13 @@
<option value="$PROJECT_DIR$/plots/templates/plots/packed_polygons.html" />
<option value="$PROJECT_DIR$/plots/polygon_creator.py" />
<option value="$PROJECT_DIR$/plots/views.py" />
- <option value="$PROJECT_DIR$/plots/templates/plots/index.html" />
<option value="$PROJECT_DIR$/plots/urls.py" />
<option value="$PROJECT_DIR$/plots/polygon.txt" />
- <option value="$PROJECT_DIR$/plots/avl_tree.py" />
- <option value="$PROJECT_DIR$/plots/dataset_creator.py" />
<option value="$PROJECT_DIR$/plots/packing_algo.py" />
<option value="$PROJECT_DIR$/starting_programm_linux.sh" />
+ <option value="$PROJECT_DIR$/plots/dataset_creator.py" />
+ <option value="$PROJECT_DIR$/plots/avl_tree.py" />
+ <option value="$PROJECT_DIR$/plots/templates/plots/index.html" />
</list>
</option>
</component>
@@ -16745,7 +16775,7 @@
<path>
<item name="mysite" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
<item name="" type="442cc68d:ScopeViewTreeModel$RootNode" />
- <item name="venv" type="9f88c78c:ScopeViewTreeModel$FileNode" />
+ <item name="requirements" type="9f88c78c:ScopeViewTreeModel$FileNode" />
</path>
</expand>
<select />
@@ -17084,9 +17114,10 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="1974" y="-3" width="1874" height="1096" extended-state="6" />
+ <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
+ <editor active="true" />
<layout>
- <window_info content_ui="combo" id="Project" order="0" sideWeight="0.4943182" visible="true" weight="0.18954249" />
+ <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.4943182" visible="true" weight="0.18335089" />
<window_info id="Structure" order="1" sideWeight="0.5056818" side_tool="true" weight="0.12592202" />
<window_info id="Favorites" order="2" sideWeight="0.50179857" side_tool="true" weight="0.17228661" />
<window_info anchor="bottom" id="Message" order="0" />
@@ -17097,7 +17128,7 @@
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" sideWeight="0.49947312" weight="0.329718" />
<window_info anchor="bottom" id="Version Control" order="7" sideWeight="0.6248683" weight="0.28850326" />
- <window_info active="true" anchor="bottom" id="Terminal" order="8" sideWeight="0.73919916" visible="true" weight="0.4199584" />
+ <window_info anchor="bottom" id="Terminal" order="8" sideWeight="0.73919916" visible="true" weight="0.29284164" />
<window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.26080084" side_tool="true" weight="0.23535791" />
<window_info anchor="bottom" id="Python Console" order="10" sideWeight="0.49894625" weight="0.329718" />
<window_info anchor="bottom" id="Messages" order="11" />
@@ -17284,26 +17315,6 @@
<entry file="file://$PROJECT_DIR$/plots/models.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
- <entry file="file://$PROJECT_DIR$/requirements/base.txt">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="204">
- <caret line="12" column="7" selection-start-line="12" selection-start-column="7" selection-end-line="12" selection-end-column="7" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/plots/urls.py">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="170">
- <caret line="12" column="99" selection-start-line="12" selection-start-column="99" selection-end-line="12" selection-end-column="99" />
- <folding>
- <element signature="e#0#28#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/plots/tests.py">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
<entry file="file://$PROJECT_DIR$/plots/polygon.txt">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="17">
@@ -17311,18 +17322,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/plots/templates/plots/index.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="646">
- <caret line="38" column="60" selection-start-line="38" selection-start-column="60" selection-end-line="38" selection-end-column="60" />
- <folding>
- <element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#form#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
<entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python39/Lib/ctypes/__init__.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="6324">
@@ -17337,13 +17336,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/plots/admin.py">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="34">
- <caret line="2" column="30" selection-start-line="2" selection-start-column="30" selection-end-line="2" selection-end-column="30" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/plots/__init__.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
@@ -17371,34 +17363,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/plots/templates/plots/packed_polygons.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="306">
- <caret line="18" selection-start-line="18" selection-end-line="20" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/plots/dataset_creator.py">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="3162">
- <caret line="189" selection-start-line="189" selection-end-line="189" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/plots/polygon_creator.py">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="3264">
- <caret line="196" column="27" selection-start-line="196" selection-start-column="27" selection-end-line="196" selection-end-column="27" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/plots/apps.py">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="51">
- <caret line="3" column="17" selection-start-line="3" selection-start-column="6" selection-end-line="3" selection-end-column="17" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/plots/static/plots/js/bokeh-2.2.3.min.js">
<provider selected="true" editor-type-id="text-editor">
<state>
@@ -17406,23 +17370,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/plots/avl_tree.py">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="81">
- <caret line="15" column="24" lean-forward="true" selection-start-line="15" selection-start-column="24" selection-end-line="15" selection-end-column="24" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/plots/packing_algo.py">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="187">
- <caret line="664" column="21" lean-forward="true" selection-start-line="664" selection-start-column="21" selection-end-line="664" selection-end-column="21" />
- <folding>
- <element signature="e#539#550#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/.idea/misc.xml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
@@ -17468,5 +17415,95 @@
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/plots/dataset_creator.py">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="2703">
+ <caret line="159" selection-start-line="159" selection-start-column="2" selection-end-line="161" selection-end-column="21" />
+ <folding>
+ <element signature="e#0#19#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/plots/packing_algo.py">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="187">
+ <caret line="664" column="21" lean-forward="true" selection-start-line="664" selection-start-column="21" selection-end-line="664" selection-end-column="21" />
+ <folding>
+ <element signature="e#539#550#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/plots/avl_tree.py">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="17">
+ <caret line="1" column="35" selection-start-line="1" selection-start-column="35" selection-end-line="1" selection-end-column="35" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/plots/admin.py">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="34">
+ <caret line="2" column="30" selection-start-line="2" selection-start-column="30" selection-end-line="2" selection-end-column="30" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/plots/apps.py">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="51">
+ <caret line="3" column="17" selection-start-line="3" selection-start-column="6" selection-end-line="3" selection-end-column="17" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/plots/tests.py">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/plots/polygon_creator.py">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="119">
+ <caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="7" />
+ <folding>
+ <element signature="e#375#439#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/plots/templates/plots/packed_polygons.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="306">
+ <caret line="18" selection-start-line="18" selection-end-line="20" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/plots/templates/plots/index.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="338">
+ <caret line="59" column="118" lean-forward="true" selection-start-line="59" selection-start-column="118" selection-end-line="59" selection-end-column="118" />
+ <folding>
+ <element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#form#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/requirements/base.txt">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="204">
+ <caret line="12" column="7" selection-start-line="12" selection-start-column="7" selection-end-line="12" selection-end-column="7" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/plots/urls.py">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="204">
+ <caret line="12" column="99" selection-start-line="12" selection-start-column="99" selection-end-line="12" selection-end-column="99" />
+ <folding>
+ <element signature="e#0#28#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
</component>
</project>
\ No newline at end of file
diff --git a/mysite/plots/avl_tree.py b/mysite/plots/avl_tree.py
index 2ba973bdf9600d3ad154ab404b7f7c9c93ca58f3..c486715aade9b4aa4e4106fb919496a5f27c4148 100644
--- a/mysite/plots/avl_tree.py
+++ b/mysite/plots/avl_tree.py
@@ -1,8 +1,5 @@
# AVl Quelle:https://www.programiz.com/dsa/avl-tree
-
# AVL tree implementation in Python
-
-
import sys
diff --git a/mysite/plots/dataset_creator.py b/mysite/plots/dataset_creator.py
index 0f66237495651d5667f639795daf8e4bc6a6b50d..ef4e771d5e45343463010fe5460318eb937ffcc8 100644
--- a/mysite/plots/dataset_creator.py
+++ b/mysite/plots/dataset_creator.py
@@ -4,15 +4,14 @@ from plots.packing_algo import ConvexPolygon, pack_polygons, truncate, Rectangul
from plots.polygon_creator import voronoi_polygons_wrapper, rectangle_cutter
-# def build_aprox_factors():
-
-
-def build_dataset_with_rectangle_cutter(rect_width: float, rect_height, repetition, cut_list=[], angle_steps=90, cut_min=1,
- cut_max=1, cut_steps=1, intervals=[0, 0.01, 0.05, 1], weights=[0, 0, 0.5, 1],save_container=True):
- cut_numbers=[]
+def build_dataset_with_rectangle_cutter(rect_width: float, rect_height, repetition, cut_list=[], angle_steps=90,
+ cut_min=1,
+ cut_max=1, cut_steps=1, intervals=[0, 0.01, 0.05, 1], weights=[0, 0, 0.5, 1],
+ save_container=True, create_plots=True):
+ cut_numbers = []
data_dict_list = []
if cut_list:
- cut_numbers= cut_list
+ cut_numbers = cut_list
else:
if cut_min > cut_max:
cut_max = cut_min
@@ -23,13 +22,15 @@ def build_dataset_with_rectangle_cutter(rect_width: float, rect_height, repetiti
for n in range(0, repetition):
cutted_polygons = rectangle_cutter(rect_width, rect_height, cut_count, intervals=intervals, weights=weights)
cutted_polygons_lists.append(cutted_polygons)
- dict_data = collect_rect_containers_data(rect_width, rect_height, cutted_polygons_lists, angle_steps,save_container)
+ dict_data = collect_rect_containers_data(rect_width, rect_height, cutted_polygons_lists, angle_steps,
+ save_container, create_plots=True)
data_dict_list.append(dict_data)
return data_dict_list
-def build_dataset_with_voronoi(rect_width, rect_height, repetition, cut_list=[], cut_min=5, cut_max=5, cut_steps=1, angle_steps=90, save_container=True):
- cut_numbers=[]
+def build_dataset_with_voronoi(rect_width, rect_height, repetition, cut_list=[], cut_min=5, cut_max=5, cut_steps=1,
+ angle_steps=90, save_container=True, create_plots=True):
+ cut_numbers = []
data_dict_list = []
if cut_list:
cut_numbers = cut_list
@@ -43,13 +44,14 @@ def build_dataset_with_voronoi(rect_width, rect_height, repetition, cut_list=[],
for n in range(0, repetition):
cutted_polygons = voronoi_polygons_wrapper(rect_width, rect_height, cut_count)
cutted_polygons_lists.append(cutted_polygons)
- dict_data = collect_rect_containers_data(rect_width, rect_height, cutted_polygons_lists, angle_steps,save_container)
+ dict_data = collect_rect_containers_data(rect_width, rect_height, cutted_polygons_lists, angle_steps,
+ save_container, create_plots=True)
data_dict_list.append(dict_data)
return data_dict_list
def collect_rect_containers_data(rect_width: float, rect_height: float, cutted_polygons_lists: [[ConvexPolygon]],
- angle_steps=90, save_container=True) -> {str, list}:
+ angle_steps=90, save_container=True, create_plots=True) -> {str, list}:
opt_area = rect_width * rect_height
opt_area_list = []
area_list = []
@@ -61,7 +63,7 @@ def collect_rect_containers_data(rect_width: float, rect_height: float, cutted_p
polygon_count_list = []
end_container_list_plots = []
for polygons in cutted_polygons_lists:
- cc = ConvexContainer(polygons, steps=angle_steps)
+ cc = ConvexContainer(polygons, steps=angle_steps, build_plots=create_plots)
end_container = cc.smallest_rectangular_container
end_container_angle_0 = cc.angle_0_rectangular_container
@@ -69,13 +71,13 @@ def collect_rect_containers_data(rect_width: float, rect_height: float, cutted_p
c_not_opt_area = end_container.container_not_clipped_area
c_not_r_area = end_container_angle_0.container_area
c_not_r_not_opt_area = end_container_angle_0.container_not_clipped_area
- area_list.append(truncate(c_area, 1))
- area_div_list.append(truncate(c_area / opt_area, 1))
- not_clipped_area_list.append(truncate(c_not_opt_area, 1))
- not_clipped_area_div_list.append(truncate(c_not_opt_area / opt_area, 1))
+ area_list.append(c_area)
+ area_div_list.append(c_area / opt_area)
+ not_clipped_area_list.append(c_not_opt_area)
+ not_clipped_area_div_list.append(c_not_opt_area / opt_area)
- angle_0_area_div_list.append(truncate(c_not_r_area / opt_area, 1))
- angle_0_not_clipped_area_div_list.append(truncate(c_not_r_not_opt_area / opt_area, 1))
+ angle_0_area_div_list.append(c_not_r_area / opt_area)
+ angle_0_not_clipped_area_div_list.append(c_not_r_not_opt_area / opt_area)
opt_area_list.append(opt_area)
polygon_count_list.append(len(polygons))
if save_container:
@@ -88,7 +90,7 @@ def collect_rect_containers_data(rect_width: float, rect_height: float, cutted_p
'opt-area': opt_area_list,
'polygon count': polygon_count_list}
if end_container_list_plots:
- rect_containers_data_dict['End-Container']=end_container_list_plots
+ rect_containers_data_dict['End-Container'] = end_container_list_plots
return rect_containers_data_dict
@@ -107,8 +109,8 @@ def collect_rect_containers_data(rect_width: float, rect_height: float, cutted_p
# average = sum(list_optimal_areas) / len(list_optimal_areas)
# average_list.append((rep, average))
# return average_list
-#
-#
+
+
# # deviation=0.05, accept=10
# def find_repition_factor_rectangle_cutter(cut, rep_high, deviation=0.05, accept_number=10, rep_low=1, rep_steps=1,
# display_flag=True, intervals=[0, 0.01, 0.05, 1], weights=[0, 0, 0.5, 1]):
@@ -120,16 +122,16 @@ def collect_rect_containers_data(rect_width: float, rect_height: float, cutted_p
# average_top_bound = average_canidate + average_canidate * deviation
# average_bot_bound = average_canidate - average_canidate * deviation
# for rep in range(rep_low, rep_high + rep_steps, rep_steps):
-#
+
# data = build_dataset_with_rectangle_cutter(1000, 1000, rep, cut_min=cut, cut_max=cut, cut_steps=1,
# intervals=[0, 0.01, 0.05, 1], weights=[0, 0, 0.5, 1])
# df = pd.DataFrame(data[0])
# if display_flag:
# display(df.sort_values(by="area", ascending=False))
-#
+
# list_optimal_areas = df["area/opt_area"].tolist()
# average = sum(list_optimal_areas) / len(list_optimal_areas)
-#
+
# if average_bot_bound <= average <= average_top_bound:
# accept_counter -= 1
# else:
diff --git a/mysite/plots/templates/plots/index.html b/mysite/plots/templates/plots/index.html
index 90f52fe9089873549be527a177a84d0c2bf80721..541e0b41f1fd6d8f9303a30a06143df646b84200 100644
--- a/mysite/plots/templates/plots/index.html
+++ b/mysite/plots/templates/plots/index.html
@@ -49,7 +49,7 @@
<div>
<form action="/packing_rect_container/" target="_blank" method="get">
{% csrf_token %}
- <label for="pack_rect_container"><b>Packing Rectengular Container</b></label>
+ <label for="pack_rect_container"><b>Packing axis-parallel Rectengular Container</b></label>
<input id="pack_rect_container" type="hidden" name="pack_polygon" value="test">
<button type="submit" onclick="packPolygons()">pack</button>
</form>
@@ -57,7 +57,7 @@
<div>
<form action="/packing_rotated_rect_container/" target="_blank" method="get">
{% csrf_token %}
- <label for="pack_rotated_rect_container"><b>Packing Rotated Rectengular Container</b></label>
+ <label for="pack_rotated_rect_container"><b>Packing Rectengular Container with rotating optimization 0, 90, 180, 270</b></label>
<input id="pack_rotated_rect_container" type="hidden" name="pack_polygon" value="test">
<button type="submit" onclick="packPolygons()">pack</button>
</form>
@@ -65,7 +65,7 @@
<div>
<form action="/packing_convex_container/" target="_blank" method="post">
{% csrf_token %}
- <label for="pack_convex_container"><b>Packing Convex Container (degree between 1-360)</b></label>
+ <label for="pack_convex_container"><b>Packing Rectangular Container (degree between 1-360)</b></label>
<input id="pack_convex_container" type="number" min="1" max="360" name="angle" value=10>
<button type="submit">pack</button>
</form>