Commit f6f04be
authored
Typed objects block model (#216)
This PR brings block models under the same typed object envolope asrecently added objects.
Key parts of this pull requets:
* BLock models are now an OPTIONAL dependency for objects. **We want to
have a single point of entry** and block models on evo are not just
references from the perspective of the user - they are actual block
models that the user expects to interact with. If the user does not
install block models, they can interact with block model metadata
handling the current dependency in a similar way to pandas and numpy.
Evo-sdk user will get the whole package, sneaky developer who only cares
about very thin set of changes - can get evo-objects with cut down
dependencies.
* Block model dependencies were adjusted so that by default it can be
used just to parse metadata. Interaction with data is now an optional
dependency, this way for basic services that don't care about
interacting with evo-data and that user evo-objects there is no extra
dependency added.
* Block models support dataframe conversions, pretty printing via
widgets, report creation, and automated mapping/creation from
`object_from_reference/path`.
* I have shared typed definitions in Common, without going as far as
adding shared functionality that relies on numpy to avoid new depenency
on common.
* Block model in objects acts as a wrapper for a fully featured typed
objects in evo-block models that can exist by itself.
* I have not added any converters to and from block model and 3D grid...
but it is not that hard as interfaces are similar though not identical
and because the objects are different enough - we do not want to have
more shared interfaces at this stage other than common base blocks.
* OCTREE and FULLY SUBBLOCKED modes support was left out for now (via
typed Objects) - PR is large already1 parent f5cabe1 commit f6f04be
33 files changed
Lines changed: 6763 additions & 152 deletions
File tree
- code-samples
- blockmodels
- geoscience-objects/running-kriging-compute
- packages
- evo-blockmodels
- src/evo/blockmodels
- typed
- tests
- evo-objects
- docs/examples
- src/evo/objects/typed
- tests/typed
- evo-sdk-common/src/evo/common
- evo-widgets
- src/evo/widgets
- tests
Large diffs are not rendered by default.
Lines changed: 41 additions & 55 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
539 | 539 | | |
540 | 540 | | |
541 | 541 | | |
542 | | - | |
| 542 | + | |
543 | 543 | | |
544 | | - | |
545 | | - | |
546 | | - | |
| 544 | + | |
547 | 545 | | |
548 | 546 | | |
549 | 547 | | |
550 | | - | |
| 548 | + | |
| 549 | + | |
551 | 550 | | |
| 551 | + | |
552 | 552 | | |
553 | | - | |
| 553 | + | |
| 554 | + | |
| 555 | + | |
| 556 | + | |
| 557 | + | |
| 558 | + | |
| 559 | + | |
| 560 | + | |
| 561 | + | |
| 562 | + | |
| 563 | + | |
| 564 | + | |
554 | 565 | | |
555 | | - | |
| 566 | + | |
| 567 | + | |
| 568 | + | |
556 | 569 | | |
557 | 570 | | |
558 | 571 | | |
| |||
561 | 574 | | |
562 | 575 | | |
563 | 576 | | |
564 | | - | |
565 | | - | |
566 | | - | |
567 | | - | |
568 | | - | |
569 | | - | |
570 | | - | |
571 | | - | |
572 | | - | |
573 | | - | |
574 | | - | |
575 | | - | |
576 | | - | |
577 | | - | |
578 | | - | |
579 | | - | |
580 | | - | |
581 | | - | |
582 | | - | |
| 577 | + | |
| 578 | + | |
583 | 579 | | |
584 | 580 | | |
585 | 581 | | |
586 | 582 | | |
587 | 583 | | |
588 | 584 | | |
589 | | - | |
| 585 | + | |
590 | 586 | | |
591 | 587 | | |
592 | 588 | | |
| |||
597 | 593 | | |
598 | 594 | | |
599 | 595 | | |
600 | | - | |
601 | | - | |
602 | 596 | | |
603 | 597 | | |
604 | 598 | | |
605 | 599 | | |
606 | 600 | | |
607 | 601 | | |
608 | | - | |
| 602 | + | |
609 | 603 | | |
610 | 604 | | |
611 | 605 | | |
| |||
614 | 608 | | |
615 | 609 | | |
616 | 610 | | |
617 | | - | |
| 611 | + | |
618 | 612 | | |
619 | 613 | | |
620 | 614 | | |
621 | 615 | | |
622 | 616 | | |
623 | 617 | | |
624 | 618 | | |
625 | | - | |
| 619 | + | |
626 | 620 | | |
627 | 621 | | |
628 | 622 | | |
| |||
633 | 627 | | |
634 | 628 | | |
635 | 629 | | |
636 | | - | |
637 | | - | |
638 | 630 | | |
639 | 631 | | |
640 | 632 | | |
641 | 633 | | |
642 | 634 | | |
643 | 635 | | |
644 | 636 | | |
645 | | - | |
| 637 | + | |
646 | 638 | | |
647 | 639 | | |
648 | 640 | | |
649 | 641 | | |
650 | 642 | | |
651 | 643 | | |
652 | | - | |
| 644 | + | |
653 | 645 | | |
654 | 646 | | |
655 | 647 | | |
| |||
660 | 652 | | |
661 | 653 | | |
662 | 654 | | |
663 | | - | |
664 | | - | |
665 | | - | |
666 | | - | |
667 | | - | |
668 | | - | |
669 | | - | |
| 655 | + | |
| 656 | + | |
| 657 | + | |
| 658 | + | |
| 659 | + | |
670 | 660 | | |
671 | 661 | | |
672 | 662 | | |
| |||
675 | 665 | | |
676 | 666 | | |
677 | 667 | | |
678 | | - | |
679 | | - | |
680 | | - | |
681 | | - | |
682 | | - | |
683 | | - | |
684 | | - | |
685 | | - | |
| 668 | + | |
| 669 | + | |
| 670 | + | |
| 671 | + | |
| 672 | + | |
| 673 | + | |
686 | 674 | | |
687 | 675 | | |
688 | 676 | | |
689 | 677 | | |
690 | 678 | | |
691 | 679 | | |
692 | | - | |
| 680 | + | |
693 | 681 | | |
694 | 682 | | |
695 | 683 | | |
| |||
700 | 688 | | |
701 | 689 | | |
702 | 690 | | |
703 | | - | |
704 | | - | |
705 | 691 | | |
706 | 692 | | |
707 | 693 | | |
| |||
721 | 707 | | |
722 | 708 | | |
723 | 709 | | |
724 | | - | |
| 710 | + | |
725 | 711 | | |
726 | 712 | | |
727 | 713 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
| 4 | + | |
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
24 | | - | |
| 24 | + | |
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
31 | | - | |
| 31 | + | |
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
| |||
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
43 | | - | |
| 43 | + | |
44 | 44 | | |
45 | 45 | | |
46 | 46 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
36 | | - | |
| 36 | + | |
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
| |||
127 | 127 | | |
128 | 128 | | |
129 | 129 | | |
| 130 | + | |
130 | 131 | | |
131 | 132 | | |
132 | 133 | | |
| |||
311 | 312 | | |
312 | 313 | | |
313 | 314 | | |
314 | | - | |
315 | 315 | | |
316 | 316 | | |
317 | 317 | | |
| |||
368 | 368 | | |
369 | 369 | | |
370 | 370 | | |
| 371 | + | |
| 372 | + | |
| 373 | + | |
| 374 | + | |
| 375 | + | |
| 376 | + | |
| 377 | + | |
| 378 | + | |
| 379 | + | |
| 380 | + | |
| 381 | + | |
| 382 | + | |
| 383 | + | |
371 | 384 | | |
372 | 385 | | |
373 | 386 | | |
| |||
527 | 540 | | |
528 | 541 | | |
529 | 542 | | |
| 543 | + | |
| 544 | + | |
| 545 | + | |
| 546 | + | |
| 547 | + | |
| 548 | + | |
| 549 | + | |
| 550 | + | |
| 551 | + | |
| 552 | + | |
| 553 | + | |
| 554 | + | |
| 555 | + | |
| 556 | + | |
| 557 | + | |
| 558 | + | |
| 559 | + | |
| 560 | + | |
| 561 | + | |
| 562 | + | |
530 | 563 | | |
531 | 564 | | |
532 | 565 | | |
| |||
580 | 613 | | |
581 | 614 | | |
582 | 615 | | |
583 | | - | |
584 | | - | |
585 | | - | |
586 | | - | |
587 | | - | |
588 | | - | |
589 | | - | |
590 | | - | |
591 | | - | |
592 | | - | |
593 | | - | |
594 | | - | |
595 | | - | |
596 | | - | |
597 | | - | |
598 | | - | |
599 | | - | |
600 | | - | |
601 | | - | |
602 | | - | |
603 | 616 | | |
604 | 617 | | |
605 | 618 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
230 | 230 | | |
231 | 231 | | |
232 | 232 | | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
0 commit comments