-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
* main: (151 commits) Created a small script to set repository configuration Major improvements to correlation diagrams merged correctly test fixed yarn lock moved around added new links locations changes merged with start Added gap-bound packages Updated correlation diagram Removed unused label Slightly simplified Duplicated components for scale Starting point to separate scale Hoisted some data fetching Updated column types Brought column module into the system Made everything more compact Updated column colors ...
- Loading branch information
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| # Initialize the development environment with common settings | ||
| all: | ||
| git config --local submodule.recurse true | ||
| git submodule update --init --recursive | ||
| yarn install |
This file was deleted.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| { | ||
| "name": "@macrostrat-web/utility-functions", | ||
| "version": "1.0.0", | ||
| "main": "src/index.ts" | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| export type AgeRange = [number, number]; | ||
|
|
||
| enum MergeMode { | ||
| Inner, | ||
| Outer, | ||
| } | ||
|
|
||
| export function mergeAgeRanges( | ||
| ranges: AgeRange[], | ||
| mergeMode: MergeMode = MergeMode.Outer | ||
| ): AgeRange { | ||
| /** Merge a set of age ranges to get the inner or outer bounds */ | ||
| let min = Infinity; | ||
| let max = 0; | ||
| // Negative ages are not handled | ||
|
|
||
| if (mergeMode === MergeMode.Inner) { | ||
| min = Math.min(...ranges.map((d) => d[0])); | ||
| max = Math.max(...ranges.map((d) => d[1])); | ||
| } else { | ||
| min = Math.max(...ranges.map((d) => d[0])); | ||
| max = Math.min(...ranges.map((d) => d[1])); | ||
| } | ||
|
|
||
| // Age ranges should start with the oldest (largest) age | ||
| if (min < max) { | ||
| return [max, min]; | ||
| } | ||
| return [min, max]; | ||
| } | ||
|
|
||
| enum AgeRangeRelationship { | ||
| Disjoint, | ||
| Contains, | ||
| Contained, | ||
| Identical, | ||
| } | ||
|
|
||
| function convertToForwardOrdinal(a: AgeRange): AgeRange { | ||
| /** Age ranges are naturally expressed as [b_age, t_age] where | ||
| * b_age is the older age and t_age is the younger age. This function | ||
| * converts the age range to [min, max] where min is the oldest age, | ||
| * expressed as negative numbers. This assists with intuitive ordering | ||
| * in certain cases. | ||
| */ | ||
| return [-a[0], -a[1]]; | ||
| } | ||
|
|
||
| export function compareAgeRanges( | ||
| a: AgeRange, | ||
| b: AgeRange | ||
| ): AgeRangeRelationship { | ||
| const a1 = convertToForwardOrdinal(a); | ||
| const b1 = convertToForwardOrdinal(b); | ||
| /** Compare two age ranges */ | ||
| if (a1[0] > b1[1] || a1[1] < b1[0]) { | ||
| return AgeRangeRelationship.Disjoint; | ||
| } | ||
| if (a1[0] === b1[0] && a1[1] === b1[1]) { | ||
| return AgeRangeRelationship.Identical; | ||
| } | ||
| if (a1[0] <= b1[0] && a1[1] >= b1[1]) { | ||
| return AgeRangeRelationship.Contains; | ||
| } | ||
| if (a1[0] >= b1[0] && a1[1] <= b1[1]) { | ||
| return AgeRangeRelationship.Contained; | ||
| } | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| export * from "./chronostratigraphy"; |