Skip to content

Commit 641911e

Browse files
kpeeterskpeeters
committed
Updates for web site.
1 parent 3c8bf37 commit 641911e

File tree

6 files changed

+43
-17
lines changed

6 files changed

+43
-17
lines changed

‎core/Cleanup.cc‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include "properties/ExteriorDerivative.hh"
1111
#include "properties/DifferentialForm.hh"
1212
#include "properties/KroneckerDelta.hh"
13+
#include "properties/Matrix.hh"
1314
#include "properties/NumericalFlat.hh"
1415
#include "properties/PartialDerivative.hh"
1516
#include "properties/ImaginaryI.hh"
@@ -246,7 +247,8 @@ bool cleanup_productlike(const Kernel& k, Ex&tr, Ex::iterator& it)
246247
}
247248
}
248249

249-
// Turn wedge products containing two identical siblings of odd degree to zero.
250+
// Turn wedge products containing two identical siblings of odd degree to zero
251+
// if they are not matrix objects.
250252
if(nm=="\\wedge") {
251253
auto s1=tr.begin(it);
252254
auto s2=s1;
@@ -255,7 +257,9 @@ bool cleanup_productlike(const Kernel& k, Ex&tr, Ex::iterator& it)
255257
if(subtree_compare(0, s1, s2)==0) {
256258
auto df1 = k.properties.get<DifferentialForm>(s1);
257259
auto df2 = k.properties.get<DifferentialForm>(s2);
258-
if(df1 && df2) {
260+
auto mat1 = k.properties.get<Matrix>(s1);
261+
auto mat2 = k.properties.get<Matrix>(s2);
262+
if(df1 && df2 && !(mat1 && mat2) ) {
259263
auto degree1 = df1->degree(k.properties, s1);
260264
auto degree2 = df2->degree(k.properties, s2);
261265
if(degree1.is_rational() && degree2.is_rational()) {

‎core/algorithms/sort_product.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@ Algorithm::result_t sort_product::apply(iterator& st)
6262
compare.clear();
6363
auto es = compare.equal_subtree(one, two);
6464
if(compare.should_swap(one, es)) {
65-
// std::cerr << "should swap " << *(one->name) << " with " << *(two->name) << std::endl;
65+
// std::cerr << "should swap " << *(one->name) << " with " << *(two->name) << std::endl;
6666
int canswap=compare.can_swap(one, two, es);
67-
// std::cerr << "can swap? " << *(one->name) << " with " << *(two->name) << std::endl;
67+
// std::cerr << "can swap? " << *(one->name) << " with " << *(two->name) << std::endl;
6868
if(canswap!=0) {
69-
// std::cerr << "swapping " << Ex(one) << " with " << Ex(two) << std::endl;
69+
// std::cerr << "swapping " << Ex(one) << " with " << Ex(two) << std::endl;
7070
tr.swap(one);
7171
std::swap(one,two); // put the iterators back in order
7272
if(canswap==-1) {

‎frontend/gtkmm/NotebookWindow.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ void NotebookWindow::load_css(const std::string& text_colour)
374374
data += "*:focus { background-color: #eee; }\n";
375375
data += "*:selected { background-color: #ccc; }\n";
376376
data += "textview.error { background: transparent; -GtkWidget-cursor-aspect-ratio: 0.2; color: @theme_fg_color; }\n";
377-
data += "#ImageView { background-color: yellow; transition-property: padding, background-color; transition-duration: 1s; }\n";
377+
data += "#ImageView { transition-property: padding, background-color; transition-duration: 1s; }\n";
378378
data += "#Console { padding: 5px; }\n";
379379
// data += "scrolledwindow { kinetic-scrolling: false; }\n";
380380

‎tests/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ endforeach()
5858
#
5959
set(RTESTS
6060
index_positions
61+
forms
6162
packages
6263
modules
6364
integrals

‎tests/forms.cdb‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
2+
A::Matrix;
3+
A::DifferentialForm(degree=1);
4+
F::DifferentialForm(degree=2);
5+
6+
ex:= A ^ A ^ A;
7+
assert(ex!=0)
8+
print("Test 01 passed")
9+
10+
ex:= A ^ F ^ A;
11+
sort_product(_);
12+

‎web2/cadabra2/source/download.html‎

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,34 +30,41 @@ <h2>Binary packages</h2>
3030
<div class="packages">
3131
<div class="distrotype">
3232
<img src="static/images/ubuntulogo.png"/>
33-
<div class="distronum"><a href="https://cadabra.science/packages/ubuntu1404">Ubuntu
33+
<!-- <div class="distronum"><a href="https://cadabra.science/packages/ubuntu1404">Ubuntu
3434
Trusty Tahr 14.04</a> (no longer updated; let me know if you need
35-
a new package)</div>
35+
a new package)</div> -->
3636
<div class="distronum"><a href="https://cadabra.science/packages/ubuntu1604">Ubuntu Xenial Xerus 16.04</a></div>
37-
<div class="distronum"><a href="https://cadabra.science/packages/ubuntu1710">Ubuntu Artful Aardvark 17.10</a></div>
37+
<!-- <div class="distronum"><a href="https://cadabra.science/packages/ubuntu1710">Ubuntu --
38+
-- Artful Aardvark 17.10</a></div> -->
3839
<div class="distronum"><a href="https://cadabra.science/packages/ubuntu1804">Ubuntu Bionic Beaver 18.04</a></div>
40+
<div class="distronum"><a href="https://cadabra.science/packages/ubuntu1804">Ubuntu Cosmic Cuttlefish 18.10</a></div>
3941
<div class="distrotxt">
4042
</div>
4143
</div>
4244

4345
<div class="distrotype">
4446
<img src="static/images/fedora-logo.png"/>
45-
<div class="distronum"><a href="https://cadabra.science/packages/fedora24">Fedora 24</a>
47+
<!-- <div class="distronum"><a href="https://cadabra.science/packages/fedora24">Fedora 24</a>
4648
(no longer updated; let me know if you need a new package)</div>
47-
<div class="distronum"><a href="https://cadabra.science/packages/fedora26">Fedora 26</a></div>
49+
<div class="distronum"><a href="https://cadabra.science/packages/fedora26">Fedora
50+
26</a></div> -->
4851
<div class="distronum"><a href="https://cadabra.science/packages/fedora27">Fedora 27</a></div>
49-
<div class="distronum"><a href="https://cadabra.science/packages/fedora28">Fedora 28</a></div>
52+
<div class="distronum"><a href="https://cadabra.science/packages/fedora28">Fedora 28</a></div>
53+
<div class="distronum"><a href="https://cadabra.science/packages/fedora28">Fedora 29</a></div>
5054
<div class="distrotxt">
5155
</div>
5256
</div>
5357

5458
<div class="distrotype">
5559
<img src="static/images/mintlogo.png"/>
56-
<div class="distronum"><a href="https://cadabra.science/packages/mint18">Mint Sarah
57-
18</a></div>
60+
<div class="distronum"><a href="https://cadabra.science/packages/mint18">Mint Sarah 18</a></div>
5861
<div class="distrotxt">
5962
This should work on all Mint distributions in the 18.x series.
6063
</div>
64+
<div class="distronum"><a href="https://cadabra.science/packages/mint18">Mint Tara 19</a></div>
65+
<div class="distrotxt">
66+
This should work on all Mint distributions in the 19.x series.
67+
</div>
6168
</div>
6269

6370
<div class="distrotype">
@@ -84,21 +91,23 @@ <h2>Binary packages</h2>
8491

8592
<div class="distrotype">
8693
<img src="static/images/opensuse_logo.png"/>
87-
<div class="distronum"><a href="https://cadabra.science/packages/opensuse421">OpenSUSE
88-
Leap 42.1</a> (sorry, not yet updated for 2.2.0; coming soon)</div>
94+
<div class="distronum"><a href="https://cadabra.science/packages/opensuse423">OpenSUSE
95+
Leap 42.3</a></div>
8996
<div class="distrotxt">
9097
On OpenSUSE you first need to add the devel:libraries:c_c++
9198
repository before you can install the cadabra rpm. Start YaST,
9299
go to Software/Software Repositories/Add/Add by URL. Enter
93100
<tt>http://download.opensuse.org/repositories/devel:/libraries:/c_c++/openSUSE_Leap_42.1</tt>
94101
and confirm.
95102
</div>
103+
<div class="distronum"><a href="https://cadabra.science/packages/opensuse42">OpenSUSE
104+
Leap 15.0</a></div>
96105
</div>
97106

98107
<div class="distrotype">
99108
<img src="static/images/debian-logo.jpg"/>
100109
<div class="distronum"><a href="https://cadabra.science/packages/debian86">Debian
101-
Jessie 8.6</a> (sorry, not yet updated for 2.2.0; coming soon)</div>
110+
Jessie 8.6</a></div>
102111
<div class="distronum"><a href="https://cadabra.science/packages/debian9">Debian Stretch 9</a></div>
103112
</div>
104113

0 commit comments

Comments
 (0)