Commit 2190b4d
committed
Merge branch 'development'
# Conflicts:
# singa-chemistry/src/test/java/bio/singa/chemistry/features/logp/LogPTest.java
# singa-mathematics/src/main/java/bio/singa/mathematics/geometry/faces/Polygons.java
# singa-mathematics/src/main/java/bio/singa/mathematics/intervals/Sampler.javaFile tree
421 files changed
+11858
-9840
lines changed- .idea/libraries
- singa-all
- singa-chemistry
- src
- main/java/bio/singa/chemistry
- algorithms
- annotations
- entities
- modification
- estimations
- features
- databases
- chebi
- pubchem
- unichem
- uniprot
- diffusivity
- logp
- molarvolume
- permeability
- reactions
- smiles
- structure3d
- variants
- test/java/bio/singa/chemistry
- algorithms
- entities
- features
- databases
- chebi
- pubchem
- uniprot
- diffusivity
- identifiers
- logp
- molarmass
- reactions
- smiles
- singa-core
- src/main
- java/bio/singa/core/utility
- resources
- singa-features
- src
- main/java/bio/singa/features
- exceptions
- formatter
- identifiers
- model
- model
- parameters
- quantities
- units
- test/java/bio/singa/features
- model
- quantities
- units
- singa-javafx
- src/main/java/bio/singa/javafx
- renderer/graphs
- viewer
- singa-mathematics
- src
- main/java/bio/singa/mathematics
- algorithms
- clustering
- graphs
- isomorphism
- primes
- voronoi/model
- combinatorics
- geometry/model
- graphs
- model
- trees
- intervals
- topology/grids/rectangular
- vectors
- test/java/bio/singa/mathematics
- algorithms/graphs/isomorphism
- combinatorics
- graphs
- model
- trees
- intervals
- topology/grids/rectangular
- vectors
- singa-sequence
- src
- main/java/bio/singa/sequence/parser/ena
- test/java/bio/singa/sequence
- algorithms/alignment
- parser/ena
- singa-simulation
- src
- main/java/bio/singa/simulation
- events
- export
- format
- reactiongraph
- reactiontable
- features
- variation
- model
- agents
- linelike
- organelles
- pointlike
- surfacelike
- volumelike
- graphs
- modules
- concentration
- functions
- imlementations
- reactions
- behaviors
- deltas
- kineticlaws
- reactants
- transport
- scope
- displacement
- implementations
- qualitative
- implementations
- parameters
- rules
- sections
- concentration
- simulation
- renderer
- trajectories
- flat
- nested
- test/java/bio/singa/simulation
- export/format
- model
- agents/pointlike
- modules
- concentration
- imlementations
- reactions
- reactants
- displacement/implementations
- qualitative/implementations
- parameters
- sections
- concentration
- simulation
- singa-structure
- src
- main/java/bio/singa/structure
- elements
- features/molarmass
- model
- identifiers
- molecules
- parser
- ncbi
- pdb
- rest/cluster
- structures
- pfam
- sifts
- test/java/bio/singa/structure
- algorithms/superimposition
- fit3d
- model
- identifiers
- molecules
- oak
- parser
- ncbi
- pdb/rest/cluster
- sifts
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
421 files changed
+11858
-9840
lines changedSome generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
This file was deleted.
Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Large diffs are not rendered by default.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
| 20 | + | |
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
10 | | - | |
| 10 | + | |
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
10 | | - | |
| 10 | + | |
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
15 | | - | |
| 15 | + | |
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
22 | 33 | | |
23 | 34 | | |
24 | 35 | | |
25 | 36 | | |
26 | | - | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
27 | 48 | | |
28 | 49 | | |
29 | 50 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
24 | | - | |
| 24 | + | |
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| |||
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
| 37 | + | |
| 38 | + | |
37 | 39 | | |
38 | 40 | | |
39 | 41 | | |
| |||
0 commit comments