diff --git a/data/tissue_example_curved_big.txt b/data/tissue_example_curved_big.txt index f70f84fd7e6dc817b0d263e776b4527cb1cab905..9682b3b1ba327f64d9af5d8d1a3093caa844ce62 100644 --- a/data/tissue_example_curved_big.txt +++ b/data/tissue_example_curved_big.txt @@ -1,4 +1,4 @@ -220 points: +219 points: -0.9841499318329869 -2.8399450977184304 -0.3802904652212421 -2.126600557921819 -2.5837801988464446 -0.4621028549586636 -1.4655507835789603 -2.286683575186369 -0.3159565047439172 @@ -129,8 +129,7 @@ -2.644285626010531 -1.6064956729191435 -0.398786660496359 -2.7904141025247458 -1.205817798835548 -0.38783374357794964 -3.406223272812658 -1.0458115169215698 -0.5237953611504618 --3.8869150292160004 -1.9453434821408968 -0.7736650305486958 --3.8698805660443663 -1.971802634903512 -0.7726159811964 +-3.8783977976301833 -1.9585730585222043 -0.7731405058725479 -1.5074766544664056 -1.0581451334646026 -0.152650527048975 -1.4036994867423616 -1.8484045597883552 -0.23742438708088567 -1.5209525192211857 -1.6435230148221742 -0.2202463862442327 @@ -220,67 +219,67 @@ -4.410689919535577 0.9859060048636965 -0.8272805875232677 -4.358570609602566 0.6903297666168743 -0.7942765539165723 61 cells: -71 184 186 68 67 69 70 -8 49 121 120 93 163 162 96 95 -6 37 92 91 153 154 86 89 88 -61 46 45 112 185 184 71 +71 183 185 68 67 69 70 +8 49 121 120 93 162 161 96 95 +6 37 92 91 152 153 86 89 88 +61 46 45 112 184 183 71 6 7 13 65 66 37 -133 134 127 126 22 1 2 +132 133 127 126 22 1 2 5 18 19 30 29 57 58 5 58 59 53 52 34 83 84 35 32 33 29 30 31 -160 161 159 158 157 156 155 210 211 -136 135 137 138 132 134 133 +159 160 158 157 156 155 154 209 210 +135 134 136 137 131 133 132 13 7 8 49 68 67 11 60 70 69 12 -62 132 138 63 140 139 -85 152 151 82 81 21 15 36 +62 131 137 63 139 138 +85 151 150 82 81 21 15 36 0 2 1 24 23 3 -203 204 201 213 212 53 59 55 -10 32 33 176 178 60 11 -32 10 137 135 31 -38 173 176 33 29 57 56 -16 17 136 133 2 0 -115 179 180 113 112 45 44 41 116 -110 168 167 103 104 118 119 109 -111 105 171 172 107 106 169 168 110 -3 23 77 148 147 78 79 28 4 +202 203 200 212 211 53 59 55 +10 32 33 175 177 60 11 +32 10 136 134 31 +38 172 175 33 29 57 56 +16 17 135 132 2 0 +115 178 179 113 112 45 44 41 116 +110 167 166 103 104 118 119 109 +111 105 170 171 107 106 168 167 110 +3 23 77 147 146 78 79 28 4 76 77 23 24 25 26 75 74 21 20 16 17 19 18 15 -159 161 141 140 139 +158 160 140 139 138 88 90 87 94 97 95 8 7 6 57 56 54 55 59 58 -128 62 139 159 158 129 -112 113 182 181 114 183 197 192 185 -22 126 130 102 142 143 145 144 +128 62 138 158 157 129 +112 113 181 180 114 182 196 191 184 +22 126 130 102 141 142 144 143 12 69 67 13 65 64 -38 39 105 111 174 173 +38 39 105 111 173 172 35 36 15 18 5 -128 127 134 132 62 +128 127 133 131 62 56 54 9 39 38 -109 119 190 189 42 43 48 47 108 -71 70 60 178 177 61 -63 140 141 66 65 64 -61 177 175 108 47 46 -17 136 135 31 30 19 +109 119 189 188 42 43 48 47 108 +71 70 60 177 176 61 +63 139 140 66 65 64 +61 176 174 108 47 46 +17 135 134 31 30 19 0 3 4 20 16 -68 186 191 200 198 121 49 -214 215 208 85 36 35 84 206 207 -44 48 43 40 117 188 187 41 -109 108 175 174 111 110 -54 9 51 123 122 202 205 203 55 -22 144 146 14 73 72 25 24 1 -185 192 191 186 184 -137 138 63 64 12 11 10 -173 174 175 177 178 176 -92 37 66 141 161 160 -9 51 125 124 50 170 171 105 39 -193 195 199 200 191 192 197 196 194 -80 149 150 81 21 20 4 28 27 +68 185 190 199 197 121 49 +213 214 207 85 36 35 84 205 206 +44 48 43 40 117 187 186 41 +109 108 174 173 111 110 +54 9 51 123 122 201 204 202 55 +22 143 145 14 73 72 25 24 1 +184 191 190 185 183 +136 137 63 64 12 11 10 +172 173 174 176 177 175 +92 37 66 140 160 159 +9 51 125 124 50 169 170 105 39 +192 194 198 199 190 191 196 195 193 +80 148 149 81 21 20 4 28 27 45 46 47 48 44 -160 211 219 218 216 217 209 91 92 -98 100 99 101 164 165 129 158 157 -127 128 129 165 166 131 130 126 +159 210 218 217 215 216 208 91 92 +98 100 99 101 163 164 129 157 156 +127 128 129 164 165 130 126 61 cell labels: 0 1 diff --git a/data/tissue_example_curved_big_WRONG.txt b/data/tissue_example_curved_big_WRONG.txt new file mode 100644 index 0000000000000000000000000000000000000000..f70f84fd7e6dc817b0d263e776b4527cb1cab905 --- /dev/null +++ b/data/tissue_example_curved_big_WRONG.txt @@ -0,0 +1,345 @@ +220 points: +-0.9841499318329869 -2.8399450977184304 -0.3802904652212421 +-2.126600557921819 -2.5837801988464446 -0.4621028549586636 +-1.4655507835789603 -2.286683575186369 -0.3159565047439172 +-1.0523571938885112 -3.3717714336030964 -0.5198224608822241 +-0.391670049083172 -3.7127306602984707 -0.5705094258056477 +2.0762164658792406 -2.4751012195578577 -0.4393473878394192 +-2.894760067180463 2.350999179545815 -0.5669902929675883 +-2.221003497829692 2.463701297476577 -0.4557592121720222 +-2.1054784682560133 2.9807390119348587 -0.5476471593034025 +3.466438370015563 -0.5683258840649129 -0.5149657869421916 +0.05264870418279954 0.11164304644244182 -0.020685706856285905 +0.027796234288491664 0.4035174083771193 -0.026281643878802042 +-0.8652583705560941 0.9087318176258394 -0.08419764548664999 +-1.8574230051013754 1.9404657560735883 -0.30992337412770526 +-2.9569513680616795 -3.3540029596421475 -0.8117351521384549 +0.9177142218530319 -3.202945467694475 -0.45867409084934035 +-0.1618124950004207 -2.528431602461683 -0.27464793887664807 +-0.06980577673904426 -2.3723902074111383 -0.24460760621461713 +0.9810830340422446 -2.3256236783167186 -0.27965833054571526 +0.9541349256731764 -2.2926790549144753 -0.2716347070612814 +0.1614826944478989 -3.362499143436206 -0.46559929901417174 +0.5862563063416809 -3.456874594491459 -0.5072138212797439 +-2.653734231704955 -2.3526323439094643 -0.5197235945379471 +-1.1365744106909692 -3.4305204556089857 -0.5415124683020995 +-2.0873783962145813 -3.1878697373560376 -0.5903264865880594 +-2.457664693417792 -3.633753350652001 -0.7860301308150301 +-2.2823367654753826 -3.859220709821925 -0.8157732643764662 +-0.13915855334288843 -4.428096966751516 -0.7990746193371757 +-0.28372150151287245 -4.370909244004821 -0.7834211805741531 +1.876463996983909 -1.2093847404704439 -0.22018005118467687 +1.0045301447011004 -1.586228927019152 -0.16080300890196672 +0.5404439273654087 -1.1278698683138542 -0.0830983509117175 +0.7478181920444025 -0.38705109801112114 -0.04893643040491837 +1.2205538215787561 -0.19566756751716266 -0.08195505931923618 +3.1542583793689585 -3.1542583793689554 -0.8084033736617964 +2.110678604423527 -2.8492718526124032 -0.5196564935156673 +1.5436078950039822 -3.4266580839382397 -0.5757416334204533 +-3.0464080785524907 1.6684917405646758 -0.4939220769761351 +2.5541471058043905 -0.3581177153958675 -0.2853843062704255 +3.4055341795055747 -0.45722128901912507 -0.4948945877024396 +3.144666670535454 3.1446666705354565 -0.8043299964422923 +2.4129276315826784 3.625898596947215 -0.7764661049774638 +3.2974397839849128 2.9070842207591565 -0.7885729667149798 +3.2394728175909293 2.9396008427200777 -0.7816767697071031 +2.1533543209077797 3.2562120079711567 -0.6203568642392135 +1.3148843528433867 3.0684241090539794 -0.4633518709971837 +1.4438613293561853 2.24453184233374 -0.3083780428283073 +2.383837294360659 2.2506296274785025 -0.44931807347052 +2.426080566235721 2.355778574617835 -0.474939200712388 +-1.4450816929800308 3.1283107572064965 -0.4859057608533519 +4.564677242413059 -0.14345076142210167 -0.8426481011836303 +4.282680985602248 -0.8786072985971197 -0.7812098872714578 +3.3229693411943204 -2.929591553049769 -0.7989519200810883 +3.41539034176154 -2.706857586447695 -0.7770644572885284 +3.2028917835245583 -1.4496232150613588 -0.5080346543510641 +3.21367729131411 -1.4745466727884071 -0.5136542240160489 +2.1174427267133242 -1.2382537311424684 -0.26498816333423353 +2.105926859723947 -1.24589459401229 -0.2643470544492296 +2.2150413951027113 -2.3032809898751636 -0.42875374416095285 +2.8534624636085724 -2.249827351482057 -0.5391896384787439 +0.4487854662206727 0.8970870941323162 -0.05617218636986899 +1.2622541435018733 2.0230146087146226 -0.2521008922443222 +-2.3360410345210836 -0.6062974380476248 -0.2515630174804526 +-1.3793818764618746 0.24317254505352098 -0.09999872920349441 +-1.0768656482811063 0.8053408936384836 -0.09372062117858845 +-1.9994081300295516 1.5377205512479422 -0.27535701973713195 +-2.3266984599575222 1.300929062644477 -0.3037305141499117 +-1.0401829322267615 2.1982010981425333 -0.25781187752915924 +-0.907579016035457 2.78587317745445 -0.36377213786794604 +-0.5629376058160905 1.6832630621829852 -0.14730790163941013 +0.06716026084068484 1.767140910661485 -0.1460442496663408 +0.3477338123085494 2.0845387960670143 -0.19997435151625062 +-2.4683797764074664 -3.6321105434572725 -0.7874485459460474 +-2.733557718430526 -3.524081375736746 -0.808215093423687 +-1.7843672509451318 -4.123429425387178 -0.81870731557031 +-2.0525167150561328 -4.02829086769409 -0.8276108460114159 +-1.490956280611014 -4.141290383912734 -0.790677735074348 +-1.487849336057199 -4.140704336344159 -0.7902764876072614 +-0.7130245340923715 -4.501859732126188 -0.8397631311591846 +-0.4197311257990886 -4.440291505292498 -0.8087599258020048 +0.1402818487866587 -4.463840807340732 -0.8100552968323628 +0.7159745244415164 -4.2907015804069095 -0.7748587763823997 +0.9669201908784762 -4.325752270362448 -0.799776649178371 +2.9331326005471468 -3.32698587116323 -0.8005819649374306 +2.719907958633214 -3.4197510459060805 -0.7805462727979245 +1.713933932096745 -4.035133623878957 -0.7850745320227304 +-3.7011945809079894 2.5153292397774876 -0.812930918067538 +-3.1574883154270394 3.157488315427038 -0.8098580009644121 +-3.365407270585461 2.7636950223364867 -0.7758360954676164 +-3.484570819235604 2.7029101892824197 -0.7930364744697485 +-3.31173287870499 2.919685278806783 -0.7944612251228353 +-3.9568612046181677 1.8211264146198312 -0.7764168110414359 +-3.4519921146446517 1.5049074795201258 -0.5813172530127738 +-1.7669548540348972 4.08319175024034 -0.8048863437040211 +-2.9484722422343608 3.344385279274731 -0.807740822975989 +-2.5001826147483235 3.5177060594624163 -0.7646664874940967 +-2.4527652181693482 3.609134418733609 -0.7792815671147617 +-2.6936936865504233 3.4726889755092776 -0.7884560046960811 +-4.39799353063947 -0.41573278999186236 -0.7957529618458572 +-4.459439325737863 -0.9968027881754186 -0.8434678280853034 +-4.473385241719883 -0.7085146178658447 -0.8304050144387248 +-4.355008673456032 -1.2652469809394138 -0.8323085303172881 +-3.8521689595426865 -2.2781663719857606 -0.8132695760669594 +4.169660587093368 1.80437326109139 -0.8348586763616638 +4.008507833621848 2.042436755728112 -0.8206668987860936 +3.6504100993205744 0.24121933058857908 -0.5530091647824966 +4.447174033514935 0.9940611705431233 -0.8393380108283703 +4.49209195081945 0.7114774695168945 -0.8364723849198538 +2.6513949272827175 1.7928096829354168 -0.42837646958424225 +3.114603011899538 1.671864454527603 -0.5163285786813682 +3.4295843248243565 1.0273092857142876 -0.5288116668791153 +3.3651268687542855 0.7441524737548455 -0.4929626991548503 +1.0510050145941234 3.3251931704339883 -0.5075553414325377 +1.3000999789327428 4.122315735900702 -0.7666884681917481 +0.7031279000740354 4.439374844102736 -0.8191419792683202 +2.0401397605363516 4.003999726727409 -0.8188598264182695 +2.263124244550056 3.8267341111023647 -0.8039711545993063 +2.96456366924681 3.362637420452153 -0.815367395703048 +3.7773083475059113 2.233893929442456 -0.7869089886536745 +3.731058191937245 2.2567045556183696 -0.7779024898907564 +-1.4778227582161 4.104810622092575 -0.7789974730266821 +-1.3694172746932551 4.088470855549164 -0.7628378153936809 +4.296859379532265 -1.2483530493545603 -0.8127826885696464 +4.30159541644546 -0.9615204942845522 -0.7923684491908892 +4.5407559078487605 -0.42922780788345377 -0.8407119692082635 +4.4254018783305815 -0.7009147997105394 -0.8150687266479861 +-2.7520972667003756 -2.0508885510406505 -0.4868611607840947 +-2.644285626010531 -1.6064956729191435 -0.398786660496359 +-2.7904141025247458 -1.205817798835548 -0.38783374357794964 +-3.406223272812658 -1.0458115169215698 -0.5237953611504618 +-3.8869150292160004 -1.9453434821408968 -0.7736650305486958 +-3.8698805660443663 -1.971802634903512 -0.7726159811964 +-1.5074766544664056 -1.0581451334646026 -0.152650527048975 +-1.4036994867423616 -1.8484045597883552 -0.23742438708088567 +-1.5209525192211857 -1.6435230148221742 -0.2202463862442327 +-0.17194593800582333 -1.2879565468326972 -0.08895796317568197 +-0.33061844599770013 -1.6740453040540515 -0.13500176510856504 +-0.7115846565967608 -0.5586605598928994 -0.0567294517236556 +-0.9049684218944654 -0.525426315742714 -0.0682897362665991 +-2.349861808133673 -0.4712510856721856 -0.2477531901798786 +-2.019202897532837 0.17651384682773588 -0.18348837142423882 +-2.4673292428475446 0.7461881614504262 -0.28367464814467824 +-3.746241779778969 -2.5459432845171888 -0.8303533108407237 +-3.568516464840164 -2.768025106619713 -0.8261191447752378 +-3.1904900112342216 -2.98437066120009 -0.7800199880559014 +-3.328031961433609 -2.9340548531788015 -0.8013570311584829 +-3.12876035676932 -3.1287603567693223 -0.7974280016689093 +-0.9992213949725661 -4.470259550553282 -0.84715727804827 +-1.2626660831068406 -4.346125164848243 -0.8293984716232411 +0.4182884127165955 -4.425029195087186 -0.8034917849782963 +0.6832917922562399 -4.314134588322845 -0.7804485117707214 +1.247448621230364 -4.293746317509799 -0.8117085460413536 +1.5081455108450925 -4.189035307624429 -0.8058196936717772 +-3.9448079157020493 2.0099800264172663 -0.7982817826438796 +-3.856940556592307 2.280988286614446 -0.8147837562628963 +-4.54249397454249 0.14275362414429232 -0.8353169007148168 +-4.510532176886434 -0.1417491841879304 -0.8250705906513458 +-4.395693976443018 -0.41146554211726205 -0.7948392890692244 +-3.6326652675464293 -0.37690520818881373 -0.550510945843141 +-3.3853495814835206 0.040088597169589874 -0.47741239040260103 +-3.482651169850408 0.5640081653599219 -0.5197420562698418 +-3.3804689756632706 0.44998708249047176 -0.48872539797859393 +-2.265037952233909 3.82997001407592 -0.8050410864939902 +-2.0333248020931203 3.990624617692136 -0.8140754279366388 +-4.167112756161287 -1.5002529066659795 -0.7991808865868372 +-3.97561438487909 -1.6437362227977006 -0.7603972916761985 +-3.965038008534071 -1.7158251642724724 -0.7660215440697062 +4.251071938462028 1.5304800722500533 -0.8267927848237301 +4.25059264667733 1.3221975843392846 -0.8052512369801944 +4.314571610046517 1.2534989280115802 -0.8188983454572967 +4.4956161420886165 0.14128042891006304 -0.8204802055716408 +4.398510088550761 0.31066215865795516 -0.79249829802305 +4.447411779712131 0.4204041898973785 -0.8108733033739406 +2.273014566598295 0.1290446578929801 -0.22882222466845628 +2.4931798912950613 0.5635207172185973 -0.2773428992052815 +2.2483580490073636 1.1941250218647164 -0.2719157664137336 +1.4582267927885275 0.141611417105004 -0.10881520337703199 +1.411460545316754 1.2820228863923933 -0.165456669064911 +1.1809976296346585 0.8931363083516248 -0.10878269340368177 +1.779394772769966 4.111938706302473 -0.8146705274532609 +1.49274124528805 4.146248314033658 -0.7921263192927104 +0.974004028594066 4.357443538545874 -0.8098544138400888 +1.2209224697552608 4.202442705260358 -0.783035927397809 +0.4200248883258643 4.443399188216272 -0.8093071993629949 +0.24240006671130507 2.4842598116476817 -0.26268798327001686 +0.7270991351475689 3.290841999041272 -0.47060791531808427 +-0.5646666903778828 3.0019188634522416 -0.39163075018010557 +2.46048638073484 3.6204957644349176 -0.7833385704861381 +2.7329597985211684 3.5233105420343716 -0.8079561978441943 +3.503060499057843 2.717252255086404 -0.7998643018057355 +3.6540894312808696 2.4833166131481414 -0.7952140004631901 +-0.37099727410553157 3.482367080456413 -0.5082688126779755 +0.08918391275624182 3.6324895507977417 -0.5423844985948703 +-0.42976362357014103 4.546424245734026 -0.8425856144938632 +-0.14352445131197406 4.5670220927292755 -0.8434310451308914 +-0.7021734400204562 4.4333486204937165 -0.8176015290252113 +0.14122699767152266 4.493915932510309 -0.8199628577545064 +0.2851335738718014 4.409157929884411 -0.7949095758304688 +-1.2059208505089642 4.150806793127998 -0.7665051729554169 +-0.9471639305806838 4.23736784252316 -0.7735083803244838 +-0.9900453607064781 4.184108763616391 -0.7598367834235661 +3.8434412760104615 -2.2730048343332654 -0.8098155389717921 +4.217220895470226 -1.5182929468676023 -0.8151795090505782 +3.9564218201046466 -1.8636145630081455 -0.7812550825501593 +3.9409912590708 -2.008035342731663 -0.7968909714464336 +4.06585736960595 -1.759453597694968 -0.7991533121043565 +2.6978082947815296 -3.4779934964776635 -0.7907962013609954 +2.5299453921209287 -3.722701595970574 -0.8213087338418487 +1.748229217219229 -4.039919356727212 -0.7908859301751714 +-4.055262633464059 1.754868845961956 -0.7960147011827048 +-4.486892430799473 0.4241362102182096 -0.8232106855883984 +-4.353444114083862 0.6787631072921427 -0.792066812627523 +3.4605698096014286 -2.684293097864686 -0.7838933587244822 +3.6808618734522 -2.501511146059532 -0.8052348132359134 +2.308557317491559 -3.903557241964983 -0.8321719566786202 +2.043488861857439 -4.0105727081641716 -0.8213581562043691 +-4.376207132591703 1.2714057026396572 -0.8393940880157321 +-4.255181771721684 1.531959703269054 -0.8282428299520327 +-4.410689919535577 0.9859060048636965 -0.8272805875232677 +-4.358570609602566 0.6903297666168743 -0.7942765539165723 +61 cells: +71 184 186 68 67 69 70 +8 49 121 120 93 163 162 96 95 +6 37 92 91 153 154 86 89 88 +61 46 45 112 185 184 71 +6 7 13 65 66 37 +133 134 127 126 22 1 2 +5 18 19 30 29 57 58 +5 58 59 53 52 34 83 84 35 +32 33 29 30 31 +160 161 159 158 157 156 155 210 211 +136 135 137 138 132 134 133 +13 7 8 49 68 67 +11 60 70 69 12 +62 132 138 63 140 139 +85 152 151 82 81 21 15 36 +0 2 1 24 23 3 +203 204 201 213 212 53 59 55 +10 32 33 176 178 60 11 +32 10 137 135 31 +38 173 176 33 29 57 56 +16 17 136 133 2 0 +115 179 180 113 112 45 44 41 116 +110 168 167 103 104 118 119 109 +111 105 171 172 107 106 169 168 110 +3 23 77 148 147 78 79 28 4 +76 77 23 24 25 26 75 74 +21 20 16 17 19 18 15 +159 161 141 140 139 +88 90 87 94 97 95 8 7 6 +57 56 54 55 59 58 +128 62 139 159 158 129 +112 113 182 181 114 183 197 192 185 +22 126 130 102 142 143 145 144 +12 69 67 13 65 64 +38 39 105 111 174 173 +35 36 15 18 5 +128 127 134 132 62 +56 54 9 39 38 +109 119 190 189 42 43 48 47 108 +71 70 60 178 177 61 +63 140 141 66 65 64 +61 177 175 108 47 46 +17 136 135 31 30 19 +0 3 4 20 16 +68 186 191 200 198 121 49 +214 215 208 85 36 35 84 206 207 +44 48 43 40 117 188 187 41 +109 108 175 174 111 110 +54 9 51 123 122 202 205 203 55 +22 144 146 14 73 72 25 24 1 +185 192 191 186 184 +137 138 63 64 12 11 10 +173 174 175 177 178 176 +92 37 66 141 161 160 +9 51 125 124 50 170 171 105 39 +193 195 199 200 191 192 197 196 194 +80 149 150 81 21 20 4 28 27 +45 46 47 48 44 +160 211 219 218 216 217 209 91 92 +98 100 99 101 164 165 129 158 157 +127 128 129 165 166 131 130 126 +61 cell labels: +0 +1 +1 +0 +0 +0 +0 +1 +0 +1 +0 +0 +0 +0 +1 +0 +1 +0 +0 +0 +0 +1 +1 +1 +1 +1 +0 +0 +1 +0 +0 +1 +1 +0 +0 +0 +0 +0 +1 +0 +0 +0 +0 +0 +1 +1 +1 +0 +1 +1 +0 +0 +0 +0 +1 +1 +1 +0 +1 +1 +1 diff --git a/src/bvpy/templates/domains/cellular.py b/src/bvpy/templates/domains/cellular.py index e6eaa807327b7ec9954c9c95aabcb3cddcf3c8ce..bf63510a1bc86fe811505bd41b910b71c69d5dc0 100644 --- a/src/bvpy/templates/domains/cellular.py +++ b/src/bvpy/templates/domains/cellular.py @@ -66,7 +66,7 @@ class FaceCellularDomain(AbstractDomain, OccModel): """ super(FaceCellularDomain, self).__init__(**kwargs) self.geometry(points, cells, markers) - #self.generate() + self.generate() def geometry(self, points, cells, markers): pts = np.asarray(points)