scs 0.5.2 → 0.5.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +8 -0
- data/LICENSE.txt +1 -1
- data/lib/scs/version.rb +1 -1
- data/vendor/scs/CITATION.cff +1 -1
- data/vendor/scs/CMakeLists.txt +1 -1
- data/vendor/scs/README.md +1 -2
- data/vendor/scs/include/cones.h +2 -2
- data/vendor/scs/include/glbopts.h +9 -15
- data/vendor/scs/include/util.h +1 -0
- data/vendor/scs/linsys/external/amd/amd_1.c +1 -1
- data/vendor/scs/linsys/external/amd/amd_2.c +44 -44
- data/vendor/scs/linsys/external/amd/amd_aat.c +5 -5
- data/vendor/scs/linsys/external/amd/amd_dump.c +12 -12
- data/vendor/scs/linsys/external/amd/amd_post_tree.c +3 -3
- data/vendor/scs/linsys/external/amd/amd_postorder.c +8 -8
- data/vendor/scs/linsys/external/amd/amd_valid.c +5 -5
- data/vendor/scs/scs.mk +1 -1
- data/vendor/scs/src/cones.c +564 -753
- data/vendor/scs/src/exp_cone.c +105 -83
- data/vendor/scs/src/linalg.c +6 -0
- data/vendor/scs/src/scs.c +1 -1
- metadata +2 -2
|
@@ -67,8 +67,8 @@ GLOBAL void AMD_postorder
|
|
|
67
67
|
{
|
|
68
68
|
if (Nv [j] > 0)
|
|
69
69
|
{
|
|
70
|
-
AMD_DEBUG1 (( ""ID" : nels "ID" npiv "ID" size "ID
|
|
71
|
-
" parent "ID" maxfr "ID"\n", j, nels,
|
|
70
|
+
AMD_DEBUG1 (( "" ID " : nels " ID " npiv " ID " size "ID
|
|
71
|
+
" parent " ID " maxfr " ID "\n", j, nels,
|
|
72
72
|
Nv [j], Fsize [j], Parent [j], Fsize [j])) ;
|
|
73
73
|
/* this is an element */
|
|
74
74
|
/* dump the link list of children */
|
|
@@ -106,12 +106,12 @@ GLOBAL void AMD_postorder
|
|
|
106
106
|
|
|
107
107
|
#ifndef NDEBUG
|
|
108
108
|
Int nchild ;
|
|
109
|
-
AMD_DEBUG1 (("Before partial sort, element "ID"\n", i)) ;
|
|
109
|
+
AMD_DEBUG1 (("Before partial sort, element " ID "\n", i)) ;
|
|
110
110
|
nchild = 0 ;
|
|
111
111
|
for (f = Child [i] ; f != EMPTY ; f = Sibling [f])
|
|
112
112
|
{
|
|
113
113
|
ASSERT (f >= 0 && f < nn) ;
|
|
114
|
-
AMD_DEBUG1 ((" f: "ID" size: "ID"\n", f, Fsize [f])) ;
|
|
114
|
+
AMD_DEBUG1 ((" f: " ID " size: " ID "\n", f, Fsize [f])) ;
|
|
115
115
|
nchild++ ;
|
|
116
116
|
ASSERT (nchild <= nn) ;
|
|
117
117
|
}
|
|
@@ -139,7 +139,7 @@ GLOBAL void AMD_postorder
|
|
|
139
139
|
|
|
140
140
|
fnext = Sibling [bigf] ;
|
|
141
141
|
|
|
142
|
-
AMD_DEBUG1 (("bigf "ID" maxfrsize "ID" bigfprev "ID" fnext "ID
|
|
142
|
+
AMD_DEBUG1 (("bigf " ID " maxfrsize " ID " bigfprev " ID " fnext " ID
|
|
143
143
|
" fprev " ID"\n", bigf, maxfrsize, bigfprev, fnext, fprev)) ;
|
|
144
144
|
|
|
145
145
|
if (fnext != EMPTY)
|
|
@@ -166,11 +166,11 @@ GLOBAL void AMD_postorder
|
|
|
166
166
|
}
|
|
167
167
|
|
|
168
168
|
#ifndef NDEBUG
|
|
169
|
-
AMD_DEBUG1 (("After partial sort, element "ID"\n", i)) ;
|
|
169
|
+
AMD_DEBUG1 (("After partial sort, element " ID "\n", i)) ;
|
|
170
170
|
for (f = Child [i] ; f != EMPTY ; f = Sibling [f])
|
|
171
171
|
{
|
|
172
172
|
ASSERT (f >= 0 && f < nn) ;
|
|
173
|
-
AMD_DEBUG1 ((" "ID" "ID"\n", f, Fsize [f])) ;
|
|
173
|
+
AMD_DEBUG1 ((" " ID " " ID "\n", f, Fsize [f])) ;
|
|
174
174
|
ASSERT (Nv [f] > 0) ;
|
|
175
175
|
nchild-- ;
|
|
176
176
|
}
|
|
@@ -195,7 +195,7 @@ GLOBAL void AMD_postorder
|
|
|
195
195
|
{
|
|
196
196
|
if (Parent [i] == EMPTY && Nv [i] > 0)
|
|
197
197
|
{
|
|
198
|
-
AMD_DEBUG1 (("Root of assembly tree "ID"\n", i)) ;
|
|
198
|
+
AMD_DEBUG1 (("Root of assembly tree " ID "\n", i)) ;
|
|
199
199
|
k = AMD_post_tree (i, k, Child, Sibling, Order, Stack
|
|
200
200
|
#ifndef NDEBUG
|
|
201
201
|
, nn
|
|
@@ -61,28 +61,28 @@ GLOBAL Int AMD_valid
|
|
|
61
61
|
{
|
|
62
62
|
p1 = Ap [j] ;
|
|
63
63
|
p2 = Ap [j+1] ;
|
|
64
|
-
AMD_DEBUG2 (("\nColumn: "ID" p1: "ID" p2: "ID"\n", j, p1, p2)) ;
|
|
64
|
+
AMD_DEBUG2 (("\nColumn: " ID " p1: " ID " p2: " ID "\n", j, p1, p2)) ;
|
|
65
65
|
if (p1 > p2)
|
|
66
66
|
{
|
|
67
67
|
/* column pointers must be ascending */
|
|
68
|
-
AMD_DEBUG0 (("column "ID" pointer bad\n", j)) ;
|
|
68
|
+
AMD_DEBUG0 (("column " ID " pointer bad\n", j)) ;
|
|
69
69
|
return (AMD_INVALID) ;
|
|
70
70
|
}
|
|
71
71
|
ilast = EMPTY ;
|
|
72
72
|
for (p = p1 ; p < p2 ; p++)
|
|
73
73
|
{
|
|
74
74
|
i = Ai [p] ;
|
|
75
|
-
AMD_DEBUG3 (("row: "ID"\n", i)) ;
|
|
75
|
+
AMD_DEBUG3 (("row: " ID "\n", i)) ;
|
|
76
76
|
if (i < 0 || i >= n_row)
|
|
77
77
|
{
|
|
78
78
|
/* row index out of range */
|
|
79
|
-
AMD_DEBUG0 (("index out of range, col "ID" row "ID"\n", j, i));
|
|
79
|
+
AMD_DEBUG0 (("index out of range, col " ID " row " ID "\n", j, i));
|
|
80
80
|
return (AMD_INVALID) ;
|
|
81
81
|
}
|
|
82
82
|
if (i <= ilast)
|
|
83
83
|
{
|
|
84
84
|
/* row index unsorted, or duplicate entry present */
|
|
85
|
-
AMD_DEBUG1 (("index unsorted/dupl col "ID" row "ID"\n", j, i));
|
|
85
|
+
AMD_DEBUG1 (("index unsorted/dupl col " ID " row " ID "\n", j, i));
|
|
86
86
|
result = AMD_OK_BUT_JUMBLED ;
|
|
87
87
|
}
|
|
88
88
|
ilast = i ;
|
data/vendor/scs/scs.mk
CHANGED
|
@@ -4,7 +4,7 @@ else
|
|
|
4
4
|
UNAME = $(shell uname -s)
|
|
5
5
|
endif
|
|
6
6
|
|
|
7
|
-
#CC =
|
|
7
|
+
# CC = clang -fsanitize=address -fsanitize=undefined -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow
|
|
8
8
|
# For cross-compiling with mingw use these.
|
|
9
9
|
#CC = i686-w64-mingw32-gcc -m32
|
|
10
10
|
#CC = x86_64-w64-mingw32-gcc-4.8
|