Commit d5d5ec5a authored by Dave Cooper's avatar Dave Cooper
Browse files

added cardinal-spline, removed old asd files, fixed display error for...

added cardinal-spline, removed old asd files, fixed display error for global-filleted-polyline and related primitives.
parent b091fadd
(:cl-fad ;;:gdl-base :gdl-cl-lite :gdl-geom-base
)
(:gdl-geom-base)
......@@ -4,7 +4,7 @@
:author
"Genworks and Dave Cooper unless otherwise indicated"
:license "AGPL unless otherwise indicated" :serial t
:version "2012050300" :depends-on (:cl-fad)
:version "2012090900" :depends-on (:gdl-geom-base)
:components
((:file "source/package") (:file "source/genworks")
(:file "source/app") (:file "source/distro")))
\ No newline at end of file
((:lisp "source/package") (:lisp "source/genworks")
(:lisp "source/app") (:lisp "source/distro")))
\ No newline at end of file
(asdf:defsystem #:gdl-aero-demo-1 :description
"Auto-generated asdf defsys from Genworks GDL cl-lite."
:author
"Genworks and Ke-Works unless otherwise indicated"
:license "AGPL unless otherwise indicated" :serial t
:version "2011111800" :depends-on (:gdl-surf :gdl-gwl-graphics) :components
((:file "source/package")
(:file "source/interior-ref-surf")
(:file "source/material")
(:file "source/parameters")
(:file "source/ref-surface")
(:file "source/surface-trim")
(:file "source/utilities")))
\ No newline at end of file
(asdf:defsystem #:gdl-wind-demo-1 :description
"Auto-generated asdf defsys from Genworks GDL cl-lite."
:author
"Genworks and Dave Cooper unless otherwise indicated"
:license "AGPL unless otherwise indicated" :serial t
:version "2012031300" :depends-on nil :components
((:file "source/package") (:file "source/parameters")
(:file "source/assembly")
(:file "source/blade-tanase-new")
(:file "source/edge-blend-surface-wind")
(:file "source/flaps-blade") (:file "source/hub")
(:file "source/nacelle")
(:file "source/profile-curv")
(:file "source/rotor-assembly")
(:file "source/support")
(:file "source/surface-general-rotation")
(:file "source/test") (:file "source/wt-demo-1")))
\ No newline at end of file
......@@ -103,24 +103,42 @@
(dolist (cell row)
(htm (:td (str cell)))))))))))))
(define-object text-form (base-ajax-sheet)
:computed-slots
((main-sheet-body
(with-cl-who-string ()
(with-html-form (:cl-who? t)
(:p (str (the number-input html-string)) :br
((:input :type :submit :value "ok")))
(:p (str (the result))))))
(the main-area main-div))
(result (* (the number-input value) 2))
)
(result (* (the number-input value) 2)))
:objects ((number-input :type 'text-form-control
:functions ((restore-defaults!
()
(the number-input :restore-defaults!)))
:objects ((reset :type 'button-form-control
:label "Reset"
:onclick (the (gdl-ajax-call :function-key :restore-defaults!)))
(number-input :type 'text-form-control
:prompt "Enter a number"
:default 42
)))
)
(main-area :type 'sheet-section
;;
;; FLAG -- use :inner-html instead of :main-view starting in 1581!
;;
:main-view (with-cl-who-string ()
(with-html-form (:cl-who? t)
(:p (str (the number-input html-string)) :br
((:input :type :submit :value "ok"))
" "
(str (the reset form-control-string)))
(:p (str (the result))))))))
(publish-gwl-app "/text-form"
......
......@@ -310,7 +310,7 @@
(with-cl-who ()
(let ((*display-controls* (the display-controls-hash)))
(let ((image-format (if (the 2d-boxes?) (the image-format) :png)))
(ecase (the image-format)
(ecase image-format
(:links (the (write-geometry-links)))
(:raphael (write-the vector-graphics))
((:png :jpeg) (write-the raster-graphics))
......
(asdf:defsystem #:gdl-translators
:description
"Auto-generated asdf defsys from Genworks GDL cl-lite."
:author
"Genworks and Dave Cooper unless otherwise indicated"
:license
"AGPL unless otherwise indicated"
:serial
t
:version
"2012031500"
:depends-on
nil
:components
((:file "xml/source/package")
(:file "xml/source/genworks")
(:file "xml/source/definition-tree")
(:file "xml/source/gdl2xml")
(:file "xml/source/xml2gdl")))
\ No newline at end of file
(asdf:defsystem #:gdl-xml
:description
"Auto-generated asdf defsys from Genworks GDL cl-lite."
:author
"Genworks and Dave Cooper unless otherwise indicated"
:license
"AGPL unless otherwise indicated"
:serial
t
:version
"2012031500"
:depends-on
nil
:components
((:file "source/package")
(:file "source/genworks")
(:file "source/definition-tree")
(:file "source/gdl2xml")
(:file "source/xml2gdl")))
\ No newline at end of file
......@@ -151,15 +151,14 @@ loadScript(xdom_script.src);
(raphael-canvas-id (format nil "raphael-~a" (the base64-encoded-root-path)))
(raphael-string (unless (the no-graphics?)
(with-output-to-string (ss)
(with-format (raphael ss
:page-width (the view-object page-width)
:page-length (the view-object page-length)
:background-color (the background-color)
:foreground-color (the foreground-color))
(write-the view-object cad-output)))))
(with-error-handling ()
(with-output-to-string (ss)
(with-format (raphael ss
:page-width (the view-object page-width)
:page-length (the view-object page-length)
:background-color (the background-color)
:foreground-color (the foreground-color))
(write-the view-object cad-output))))))
("String of valid HTML. This can be used to
......
......@@ -139,6 +139,7 @@
(declare (ignore prev-end))
(mapc
#'(lambda(line-index-pair)
;;(setq move? t)
(destructuring-bind (start-index end-index) line-index-pair
(let ((start (svref 2d-vertices start-index))
(end (svref 2d-vertices end-index))
......@@ -209,6 +210,7 @@
(curve-strings
(mapcar
#'(lambda(curve)
(setq move? t)
(destructuring-bind (start c1 c2 end) curve
(when (and prev-end (coincident-point? start prev-end))
(setq move? nil))
......
(in-package :gdl-user)
(define-object bad-box (box)
:computed-slots
((length 10)
(height 20)
(width (div (the height) 0))))
(((#(-7.773502691896258 10.0 0.0)
#(-7.75720302109858 10.0 0.005508906204967898)
#(-7.740130238567397 10.0 0.007512531990573305)
#(-7.723312660735872 10.0 0.009389084110142337)
#(-7.706495082904348 10.0 0.011265636229711369)
#(-7.689662754827711 10.0 0.013486086190146098)
#(-7.672694174163594 10.0 0.015888459487970942)
#(-7.6387570128353595 10.000000000000002 0.02069320608362063)
#(-7.60535478715376 9.999999999999998 0.024745818150224655)
#(-7.571692358735774 10.0 0.028819280178703853)
#(-7.538029930317788 10.000000000000002 0.03289274220718305)
#(-7.503937023492169 10.0 0.037150997739690904)
#(-7.470373820070232 10.0 0.041157958289341705)
#(-7.436810616648295 10.0 0.0451649188389925)
#(-7.4029135135808 10.0 0.04903457344418648)
#(-7.3691521962047215 10.0 0.052792854004172156)
#(-7.3016295614525655 10.0 0.06030941512414352)
#(-7.233991372830615 9.999999999999998 0.06740637865926773)
#(-7.166274510818496 10.0 0.07398847749873158)
#(-7.0308407867942595 10.000000000000005 0.08715267517765929)
#(-6.896010988165702 10.000000000000005 0.09839626376145132)
#(-6.760028452245113 10.0 0.10676313680154932)
#(-6.6240459163245236 9.999999999999995 0.11513000984164733)
#(-6.487607929684804 9.999999999999991 0.1206935573045556)
#(-6.352150130318781 10.000000000000002 0.11996020031943386)
#(-6.284421230635768 10.000000000000007 0.119593521826873)
#(-6.216191130813162 10.0 0.11762624591337664)
#(-6.1482720301510465 10.0 0.11302990523476085)
#(-6.080352929488931 10.0 0.10843356455614506)
#(-6.01211538711849 9.999999999999996 0.10151574545044109)
#(-5.94575505783107 10.0 0.08864634663465115)
#(-5.91257489318736 10.000000000000002 0.0822116472267562)
#(-5.879164310479417 10.0 0.07429753386580915)
#(-5.847498958576427 10.0 0.06246782610805402)
#(-5.831666282624932 10.0 0.05655297222917645)
#(-5.815888257757295 10.0 0.04962825637897741)
#(-5.801732155716707 10.0 0.04010167981287849)
#(-5.78757605367612 10.0 0.03057510324677957)
#(-5.773512626579065 10.0 0.016927155414108983)
#(-5.77350372489622 10.0 -5.432357e-10))
(1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0
1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0
1.0 1.0 1.0 1.0 1.0 1.0)
(0.0 0.0 0.0 0.0 0.025 0.025 0.025 0.05 0.05 0.05 0.1 0.1 0.1
0.15000000000000002 0.15000000000000002 0.15000000000000002 0.2 0.2
0.2 0.3 0.3 0.3 0.5 0.5 0.5 0.7 0.7 0.7 0.8 0.8 0.8 0.9 0.9 0.9 0.95
0.95 0.95 0.975 0.975 0.975 1.0 1.0 1.0 1.0)
3))
\ No newline at end of file
((((#(10.0 0.0 0.0) #(7.0710678118654755 7.0710678118654755 0.0)
#(6.123031769111886e-16 10.0 0.0)
#(-7.0710678118654755 7.0710678118654755 0.0)
#(-10.0 1.2246063538223773e-15 0.0)
#(-7.071067811865477 -7.071067811865475 0.0)
((((#(10.0 0.0 0.0) #(10.0 10.0 0.0) #(6.123031769111886e-16 10.0 0.0)
#(-10.0 10.0 0.0) #(-10.0 1.2246063538223773e-15 0.0)
#(-10.000000000000002 -9.999999999999998 0.0)
#(-1.836909530733566e-15 -10.0 0.0)
#(7.071067811865475 -7.071067811865477 0.0) #(10.0 0.0 0.0))
#(9.999999999999998 -10.000000000000002 0.0) #(10.0 0.0 0.0))
(1.0 0.7071067811865476 1.0 0.7071067811865476 1.0
0.7071067811865476 1.0 0.7071067811865476 1.0)
(0.0 0.0 0.0 0.25 0.25 0.5 0.5 0.75 0.75 1.0 1.0 1.0) 2)
......
This diff is collapsed.
((938.4943938400954 1913.2227828477585 1913.2227828477585
((938.4943938400955 1913.2227828477608 1913.2227828477608
(:area-static-moments
#(-0.0013629417066672311 1.6198646470336635e-6 9.977362752806584e-4)
#(-0.0013629417065913751 1.6198647629468795e-6 9.97736274825911e-4)
:area-moments-of-inertia
#(39523.676874343306 14198.196494987447 13542.898007592948)
#(39523.676874343284 14198.196494987445 13542.898007592968)
:area-products-of-inertia
#(-0.0018828402592603352 -0.037139405760552496 8.313554775540449e-5)
#(-0.001882840257803139 -0.037139405756004676 8.313554961068861e-5)
:area-second-moment-about-coordinate-axii
#(27741.094502580396 53066.57488193624 53721.87336933075)
#(27741.094502580414 53066.57488193627 53721.87336933073)
:volume-static-moments
#(0.005159512360833419 -1.6488974733046927e-11
-0.008454931310552638)
#(0.005159512310650089 -1.4933979830370864e-11
-0.008454931317828596)
:volume-moments-of-inertia
#(58655.79971754321 15943.523190398104 15354.64606292959)
#(58655.799717544054 15943.523190398104 15354.646062929378)
:volume-products-of-inertia
#(0.031705992415964335 0.22438885777332493 2.800036740133387e-10)
#(0.03170599242879308 0.22438885797794703 2.616230668089265e-10)
:volume-second-moment-about-coordinate-axii
#(31298.169253327695 74010.4457804728 74599.3229079413))
(#(10.0 5.0 1.232595164407831e-32)
#(10.00003771771249 4.999999999999987 -1.725448266703644)
#(9.523010835693334 4.999999999999973 -3.5057368269750304)
#(8.660254037844387 5.0 -4.999999999999998))
#(31298.169253327476 74010.44578047344 74599.32290794216))
(#(10.0 5.0 -1.232595164407831e-32)
#(10.00003771771249 4.999999999999987 -1.7254482667036448)
#(9.523010835693373 4.999999999999973 -3.5057368269750397)
#(8.660254037844386 5.0 -5.000000000000001))
(#(8.660254037844378 5.0 5.000000000000012)
#(9.523010835693352 4.999999999999987 3.5057368269750446)
#(10.000037717712447 4.999999999999987 1.7254482667036497)
#(10.0 5.0 2.4492127076447545e-15))
(#(-8.660254037844387 5.0 -5.000000000000001)
#(-9.215894073003374 4.999999999999997 -4.037936099691518)
#(-9.631341375577472 4.999999999999997 -2.933553759355057)
#(-9.841092358652233 4.999999999999998 -1.7716384566836374))
(#(-9.841092358652233 4.999999999999998 -1.7716384566836374)
#(-9.966942948497088 4.999999999999998 -1.0744892750807855)
#(-10.018742863322181 4.999999999999998 -0.3566282270373488)
#(-9.991871471723508 4.999999999999997 0.35600017549842783))
(#(-9.991871471723508 4.999999999999997 0.35600017549842783)
#(-9.929171557993273 4.999999999999997 2.01879978141524)
#(-9.438150087066973 4.999999999999996 3.6531105395681265)
#(-8.660254037844386 5.0 5.0))
(#(-8.660254037844387 -5.0 -5.000000000000001)
#(-9.215894073003374 -4.999999999999997 -4.037936099691518)
#(-9.631341375577472 -4.999999999999997 -2.933553759355057)
#(-9.841092358652233 -4.999999999999998 -1.7716384566836374))
(#(-9.841092358652233 -4.999999999999998 -1.7716384566836374)
#(-9.966942948497088 -4.999999999999998 -1.0744892750807855)
#(-10.018742863322181 -4.999999999999998 -0.3566282270373488)
#(-9.991871471723508 -4.999999999999997 0.35600017549842783))
(#(-9.991871471723508 -4.999999999999997 0.35600017549842783)
#(-9.929171557993273 -4.999999999999997 2.01879978141524)
#(-9.438150087066973 -4.999999999999996 3.6531105395681265)
#(-8.660254037844386 -5.0 5.0))
(#(10.0 -5.0 1.232595164407831e-32)
(#(-8.660254037844387 5.0 -4.999999999999999)
#(-9.438150087066969 4.999999999999995 -3.653110539568123)
#(-9.929171557993277 4.999999999999995 -2.0187997814152387)
#(-9.991871471723512 4.9999999999999964 -0.3560001754984277))
(#(-9.991871471723512 4.9999999999999964 -0.3560001754984277)
#(-10.018742863322183 4.999999999999997 0.3566282270373482)
#(-9.966942948497088 4.999999999999998 1.0744892750807842)
#(-9.841092358652233 4.999999999999999 1.7716384566836358))
(#(-9.841092358652233 4.999999999999999 1.7716384566836358)
#(-9.631341375577472 4.999999999999999 2.933553759355055)
#(-9.215894073003376 4.999999999999997 4.0379360996915175)
#(-8.660254037844386 5.0 5.000000000000002))
(#(-8.660254037844387 -5.0 -4.999999999999999)
#(-9.438150087066969 -4.999999999999995 -3.653110539568123)
#(-9.929171557993277 -4.999999999999995 -2.0187997814152387)
#(-9.991871471723512 -4.9999999999999964 -0.3560001754984277))
(#(-9.991871471723512 -4.9999999999999964 -0.3560001754984277)
#(-10.018742863322183 -4.999999999999997 0.3566282270373482)
#(-9.966942948497088 -4.999999999999998 1.0744892750807842)
#(-9.841092358652233 -4.999999999999999 1.7716384566836358))
(#(-9.841092358652233 -4.999999999999999 1.7716384566836358)
#(-9.631341375577472 -4.999999999999999 2.933553759355055)
#(-9.215894073003376 -4.999999999999997 4.0379360996915175)
#(-8.660254037844386 -5.0 5.000000000000002))
(#(10.0 -5.0 -1.232595164407831e-32)
#(10.00003771771249 -4.999999999999987 -1.7254482667036448)
#(9.523010835693373 -4.999999999999973 -3.5057368269750397)
#(8.660254037844386 -5.0 -5.000000000000001))
......@@ -58,11 +58,11 @@
#(10.000037717712447 -4.999999999999987 1.7254482667036497)
#(10.0 -5.0 2.4492127076447545e-15))
(#(10.0 -5.0 0.0) #(10.0 5.0 0.0))
(#(8.660254037844386 -5.0 5.0) #(8.660254037844386 5.0 5.0))
(#(8.660254037844387 -5.0 5.0) #(8.660254037844387 5.0 5.0))
(#(-8.660254037844387 -5.0 5.0) #(-8.660254037844387 5.0 5.0))
(#(-8.660254037844387 -5.0 -5.0) #(-8.660254037844387 5.0 -5.0))
(#(8.660254037844387 -5.0 -5.0) #(8.660254037844387 5.0 -5.0))
(#(-8.660254037844387 5.0 5.0) #(8.660254037844386 5.0 5.0))
(#(-8.660254037844387 5.0 -5.0) #(8.660254037844386 5.0 -5.0))
(#(-8.660254037844387 -5.0 -5.0) #(8.660254037844386 -5.0 -5.0))
(#(-8.660254037844387 -5.0 5.0) #(8.660254037844386 -5.0 5.0))))
\ No newline at end of file
(#(-8.660254037844387 5.0 5.0) #(8.660254037844387 5.0 5.0))
(#(-8.660254037844386 5.0 -5.0) #(8.660254037844387 5.0 -5.0))
(#(-8.660254037844386 -5.0 -5.0) #(8.660254037844387 -5.0 -5.0))
(#(-8.660254037844387 -5.0 5.0) #(8.660254037844387 -5.0 5.0))))
\ No newline at end of file
((2200.0 6000.0 6000.0
((2200.0000000000005 6000.000000000001 6000.000000000001
(:area-static-moments
#(-2.5988969469799507e-13 -1.3642420526593924e-12
-2.598503294591239e-12)
#(1.8189894035458565e-12 -7.192579865034077e-13
2.911981391042821e-12)
:area-moments-of-inertia
#(113333.33333333331 38333.33333333333 225000.0)
#(113333.33333333336 38333.33333333334 225000.0000000001)
:area-products-of-inertia
#(-3.902776512375361e-12 2.38589546982599e-12 2.849809914815033e-12)
#(-7.932316267117346e-12 1.316974956488493e-11
-1.8021353744236478e-12)
:area-second-moment-about-coordinate-axii
#(263333.3333333333 338333.3333333333 151666.66666666666)
#(263333.33333333343 338333.33333333343 151666.6666666667)
:volume-static-moments
#(1.071212000573935e-12 -1.0841097444634331e-11
-1.4480999331536795e-13)
:volume-moments-of-inertia #(200000.0 50000.0 450000.0)
#(4.588583604489896e-12 2.0852523919016926e-12
7.273625059221562e-12)
:volume-moments-of-inertia
#(200000.00000000006 50000.00000000003 450000.0000000001)
:volume-products-of-inertia
#(8.541330774631959e-11 -2.2017062234043086e-11
2.9897850596677335e-12)
#(2.4155904369414284e-11 2.1780530663901118e-11
7.796919790998078e-13)
:volume-second-moment-about-coordinate-axii
#(500000.0 650000.0 250000.0))
(#(10.0 -5.0 15.0) #(10.0 5.0 15.0))
(#(-10.0 5.0 15.0) #(10.0 5.0 15.0))
#(500000.0000000001 650000.0000000002 250000.0000000001))
(#(-10.0 -5.0 -15.0) #(10.0 -5.0 -15.0))
(#(-10.0 -5.0 -15.0) #(-10.0 5.0 -15.0))
(#(-10.0 -5.0 15.0) #(-10.0 5.0 15.0))
(#(-10.0 5.0 -15.0) #(10.0 5.0 -15.0))
(#(10.0 -5.0 -15.0) #(10.0 5.0 -15.0))
(#(10.0 5.0 -15.0) #(10.0 5.0 15.0))
(#(-10.0 -5.0 15.0) #(10.0 -5.0 15.0))
(#(-10.0 -5.0 15.0) #(-10.0 5.0 15.0))
(#(-10.0 5.0 15.0) #(10.0 5.0 15.0))
(#(10.0 -5.0 15.0) #(10.0 5.0 15.0))
(#(-10.0 -5.0 -15.0) #(-10.0 -5.0 15.0))
(#(-10.0 -5.0 -15.0) #(10.0 -5.0 -15.0))
(#(10.0 -5.0 -15.0) #(10.0 -5.0 15.0))
(#(-10.0 -5.0 15.0) #(10.0 -5.0 15.0))
(#(-10.0 5.0 -15.0) #(-10.0 5.0 15.0))
(#(-10.0 5.0 -15.0) #(10.0 5.0 -15.0))))
\ No newline at end of file
(#(10.0 5.0 -15.0) #(10.0 5.0 15.0))))
\ No newline at end of file
......@@ -23,66 +23,66 @@
#(5.4381197773005585 1.5835180398672515 3.5)
#(5.791670868938754 1.5923681307735338 3.5)
#(6.029921411977141 1.5983320183536593 3.5)
#(6.268841781538739 1.5927610618330075 3.5)
#(6.50640222916747 1.5736842975478482 3.5)
#(6.743733306344178 1.5546259523475616 3.5)
#(6.268841781538739 1.5927610618330075 3.5000000000000004)
#(6.50640222916747 1.5736842975478482 3.5000000000000004)
#(6.743733306344178 1.5546259523475616 3.5000000000000004)
#(6.980358085994664 1.5218407146586503 3.5)
#(7.213923904373452 1.4756209223540888 3.5)
#(7.371409228088238 1.4444565208006503 3.5)
#(7.52791978744558 1.4076086551686187 3.5)
#(7.682459299645924 1.3641300825308842 3.5)
#(7.836366752412447 1.320829335237707 3.5)
#(7.988651826101313 1.2707829571673621 3.5000000000000004)
#(8.137376466569403 1.2121021251106814 3.5000000000000004)
#(8.28524887080958 1.1537575515973426 3.5000000000000004)
#(8.430259599115876 1.086680478411612 3.5)
#(8.568413678648403 1.0080434165212786 3.5)
#(8.705631133527882 0.9299394797551458 3.5)
#(8.837521330975996 0.839701078475706 3.4999999999999996)
#(8.954562648350143 0.7337285117931245 3.4999999999999996)
#(9.071351562541253 0.6279844781939481 3.4999999999999996)
#(9.176357171372171 0.5029009629214997 3.5)
#(9.245831679635192 0.3614981913030706 3.5)
#(9.27758970681678 0.29686048206432464 3.5)
#(9.302194105818366 0.22797110956047964 3.5)
#(9.316925065905327 0.15747568729055128 3.5)
#(9.331847600521527 0.08606347974287437 3.5)
#(9.336734985289663 0.011776574640211307 3.5)
#(9.330881612183509 -0.06094291002163381 3.5)
#(9.324932595670044 -0.13485062225155436 3.5)
#(9.307846339342829 -0.20846089998113157 3.5000000000000004)
#(9.28192388323463 -0.27792864065158046 3.5000000000000004)
#(9.255713482332423 -0.34816802403188746 3.5000000000000004)
#(9.22023938552963 -0.41533551796765666 3.5000000000000004)
#(9.178749885509228 -0.4777789121831956 3.5000000000000004)
#(9.137120353796751 -0.5404330598218084 3.5000000000000004)
#(9.089068430255958 -0.5990670891796617 3.499999999999999)
#(9.037117518911817 -0.6534698734598292 3.499999999999999)
#(8.95814003546806 -0.7361747747524952 3.499999999999999)
#(8.869447877874538 -0.8100272645887461 3.5)
#(8.7761933600998 -0.8762174338251159 3.5)
#(8.683527721910076 -0.9419896282510193 3.5)
#(8.585647851672967 -1.0007014411762658 3.5)
#(8.485102132750367 -1.0536491556410574 3.5)
#(8.385126379447811 -1.1062967242893165 3.5)
#(7.37140922808824 1.44445652080065 3.5)
#(7.5279197874455805 1.4076086551686187 3.5)
#(7.6824592996459256 1.3641300825308837 3.5)
#(7.836366752412448 1.3208293352377067 3.5)
#(7.9886518261013135 1.270782957167361 3.5)
#(8.137376466569403 1.2121021251106807 3.5)
#(8.28524887080958 1.153757551597342 3.5)
#(8.43025959911588 1.0866804784116109 3.5000000000000004)
#(8.568413678648405 1.0080434165212773 3.5000000000000004)
#(8.705631133527884 0.9299394797551443 3.5000000000000004)
#(8.837521330975996 0.8397010784757051 3.5)
#(8.954562648350143 0.7337285117931236 3.5)
#(9.071351562541253 0.6279844781939472 3.5)
#(9.176357171372171 0.5029009629214989 3.5)
#(9.245831679635192 0.3614981913030698 3.5)
#(9.27758970681678 0.29686048206432386 3.5)
#(9.302194105818362 0.22797110956047845 3.4999999999999996)
#(9.316925065905323 0.15747568729055006 3.4999999999999996)
#(9.331847600521524 0.08606347974287312 3.4999999999999996)
#(9.336734985289665 0.01177657464021044 3.5)
#(9.33088161218351 -0.060942910021634676 3.5)
#(9.324932595670045 -0.13485062225155522 3.5)
#(9.307846339342825 -0.2084608999811322 3.5000000000000004)
#(9.281923883234626 -0.27792864065158107 3.5000000000000004)
#(9.25571348233242 -0.3481680240318875 3.5000000000000004)
#(9.220239385529629 -0.41533551796765533 3.4999999999999996)
#(9.178749885509228 -0.4777789121831939 3.4999999999999996)
#(9.137120353796751 -0.5404330598218073 3.4999999999999996)
#(9.089068430255958 -0.5990670891796617 3.5)
#(9.037117518911817 -0.6534698734598297 3.5)
#(8.95814003546806 -0.7361747747524959 3.5)
#(8.869447877874538 -0.8100272645887474 3.5)
#(8.776193360099798 -0.8762174338251174 3.5)
#(8.683527721910075 -0.9419896282510204 3.5)
#(8.585647851672967 -1.0007014411762667 3.5)
#(8.485102132750367 -1.0536491556410579 3.5)
#(8.385126379447811 -1.1062967242893167 3.5)
#(8.282133353424506 -1.1534264446997735 3.5)
#(8.177481750865446 -1.1960287898794384 3.5)
#(8.177481750865446 -1.1960287898794382 3.5)
#(8.019217196721216 -1.2604562902758438 3.5)
#(7.856652318484567 -1.314781204306996 3.5)
#(7.6922490566633694 -1.361365959413697 3.5)
#(7.529036378331773 -1.407613354788707 3.5)
#(7.363598308140614 -1.4464467163457317 3.5000000000000004)
#(7.197098335260452 -1.4789268483967435 3.5000000000000004)
#(7.0308651579514345 -1.5113549350616118 3.5000000000000004)
#(6.863166127361912 -1.5370298154450923 3.5)
#(6.69483060046984 -1.555689944838107 3.5)
#(6.438326655920163 -1.5841236146847841 3.5)
#(7.856652318484566 -1.3147812043069964 3.5)
#(7.692249056663368 -1.3613659594136975 3.5)
#(7.529036378331771 -1.4076133547887075 3.5)
#(7.363598308140613 -1.4464467163457317 3.5000000000000004)
#(7.197098335260451 -1.4789268483967435 3.5000000000000004)
#(7.030865157951434 -1.5113549350616118 3.5000000000000004)
#(6.863166127361911 -1.5370298154450923 3.5)
#(6.694830600469839 -1.555689944838107 3.5)
#(6.438326655920162 -1.5841236146847841 3.5)
#(6.179645550540531 -1.5963383759290313 3.5000000000000004)
#(5.921577228327097 -1.594470698109791 3.5000000000000004)
#(5.664303152834322 -1.5926087683690846 3.5000000000000004)
#(5.406899153161434 -1.5768936440435313 3.5)
#(5.151003735823032 -1.5502299592226672 3.5)
#(4.896248559224971 -1.5236850847346983 3.5)
#(5.406899153161435 -1.5768936440435315 3.5)
#(5.151003735823033 -1.5502299592226674 3.5)
#(4.896248559224972 -1.5236850847346985 3.5)
#(4.642485009679849 -1.4862765547319885 3.5)
#(4.390480905767466 -1.440464307718683 3.5)
#(4.139590014162951 -1.3948544334304027 3.5)
......@@ -98,7 +98,7 @@
#(1.0931388767296097 -0.45533291107013296 3.5)
#(0.7389173580547592 -0.3112791892675908 3.5)
#(0.49133860428029885 -0.21059462031800158 3.5)
#(0.24506299296317774 -0.10666185459201882 3.5)
#(0.24506299296317777 -0.10666185459201882 3.5)
#(4.163336342344337e-17 -1.3877787807814457e-17 3.5))
(1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0
1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0
......@@ -114,20 +114,20 @@
4.978989341151035 6.039974867239154 6.039974867239154
6.039974867239154 6.754950393336653 6.754950393336653
6.754950393336653 7.469235592987793 7.469235592987793
7.469235592987793 7.950853308595946 7.950853308595946
7.950853308595946 8.430501230095711 8.430501230095711
7.469235592987793 7.950853308595949 7.950853308595949
7.950853308595949 8.430501230095711 8.430501230095711
8.430501230095711 8.907400626979385 8.907400626979385
8.907400626979385 9.38106685308985 9.38106685308985
9.38106685308985 9.853711603486868 9.853711603486868
9.853711603486868 10.069765883043864 10.069765883043864
10.069765883043864 10.288629924941654 10.288629924941654
10.288629924941654 10.511070178764662 10.511070178764662
10.511070178764662 10.735981283065675 10.735981283065675
10.735981283065675 10.96165148743987 10.96165148743987
10.96165148743987 11.304722751611683 11.304722751611683
11.304722751611683 11.645627604241223 11.645627604241223
11.645627604241223 11.984599962401708 11.984599962401708
11.984599962401708 12.497227651033727 12.497227651033727
10.511070178764662 10.735981283065673 10.735981283065673
10.735981283065673 10.96165148743987 10.96165148743987
10.96165148743987 11.304722751611685 11.304722751611685
11.304722751611685 11.645627604241223 11.645627604241223
11.645627604241223 11.984599962401706 11.984599962401706
11.984599962401706 12.497227651033727 12.497227651033727
12.497227651033727 13.006142967687012 13.006142967687012
13.006142967687012 13.514242810618457 13.514242810618457
13.514242810618457 14.288468051975546 14.288468051975546
......
(((#(3.5355339059327364 3.5355339059327364 0.0)
#(-1.0733053916783618e-15 -4.575347555383189e-16 0.0)
#(-1.517883041479706e-15 -6.47051856539349e-16 0.0)
#(3.535533905932735 -3.535533905932738 0.0)