Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

O

ogs
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

203ecf06

Commit 203ecf06 authored 13 years ago by Tom Fischer

Downloads
- Plain Diff

Merge branch 'NestedDissectionPerm' of github.com:ufz/ogs into NestedDissectionPerm

Conflicts:
	Base/quicksort.h
	MathLib/LinAlg/Sparse/NestedDissectionPermutation/Cluster.cpp

parents 38b503a8 da4ece34

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

Base/printList.h 2 additions, 2 deletions

Base/printList.h
Base/quicksort.h 21 additions, 20 deletions

Base/quicksort.h
Base/swap.h 2 additions, 2 deletions

Base/swap.h
Base/uniqueListInsert.h 2 additions, 2 deletions

Base/uniqueListInsert.h
Base/wait.h 2 additions, 2 deletions

Base/wait.h
GeoLib/Polygon.cpp 3 additions, 3 deletions

GeoLib/Polygon.cpp
GeoLib/Polyline.cpp 2 additions, 2 deletions

GeoLib/Polyline.cpp
MathLib/EarClippingTriangulation.cpp 6 additions, 6 deletions

MathLib/EarClippingTriangulation.cpp
MathLib/LinAlg/Solvers/GaussAlgorithm.cpp 2 additions, 2 deletions

MathLib/LinAlg/Solvers/GaussAlgorithm.cpp
MathLib/LinAlg/Sparse/CRSMatrix.h 6 additions, 6 deletions

MathLib/LinAlg/Sparse/CRSMatrix.h
MathLib/LinAlg/Sparse/NestedDissectionPermutation/AdjMat.cpp 4 additions, 4 deletions

MathLib/LinAlg/Sparse/NestedDissectionPermutation/AdjMat.cpp
MathLib/LinAlg/Sparse/NestedDissectionPermutation/Cluster.cpp 7 additions, 6 deletions

...Lib/LinAlg/Sparse/NestedDissectionPermutation/Cluster.cpp
MathLib/LinAlg/Sparse/NestedDissectionPermutation/Separator.cpp 2 additions, 2 deletions

...b/LinAlg/Sparse/NestedDissectionPermutation/Separator.cpp

with 61 additions and 59 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment