Fix Angular 21 change detection for simulation time, import-csv, connect-database, and ravel-select-horizontal-dim

Makefile

@@ -31,7 +31,9 @@ endif
 
 MAKEOVERRIDES+=DEBUG=$(DEBUG)
 
-ifndef MXE
+ifdef MXE
+CPLUSPLUSOVERRIDE=
+else
 ifdef GCC
 COMPILER=g++
 else
@@ -44,23 +46,27 @@ COMPILER=g++
 endif
 LINK=$(COMPILER)
 endif
-endif
 export COMPILER
 export CPLUSPLUS=$(COMPILER)
+CPLUSPLUSOVERRIDE=CPLUSPLUS="$(COMPILER)"
+endif
 
 ifneq ($(MAKECMDGOALS),clean)
 # make sure EcoLab is built first, even before starting to include Makefiles
 # disable AEGIS build here, as EcoLab 6 is still a little raw
-build_ecolab:=$(shell cd ecolab; if $(MAKE) $(MAKEOVERRIDES) CPLUSPLUS="$(COMPILER)" AEGIS= $(JOBS) only-libs >build.log 2>&1; then echo "ecolab built"; fi)
+build_ecolab:=$(shell cd ecolab; if $(MAKE) $(MAKEOVERRIDES) $(CPLUSPLUSOVERRIDE) AEGIS= $(JOBS) only-libs >build.log 2>&1; then echo "ecolab built"; fi)
 
 #$(warning $(build_ecolab))
 ifneq ($(build_ecolab),ecolab built)
 $(warning $(shell cat ecolab/build.log))
 $(error Making ecolab failed: check ecolab/build.log)
 endif
 include $(ECOLAB_HOME)/include/Makefile
+
+ifndef MXE
 # rewrite CPLUSPLUS after clobber in Makefile
 CPLUSPLUS=$(COMPILER)
+endif
 
 # link statically to ecolab (needed until all bugs in EcoLab 6 ironed out)
 LIBS:=$(subst -lecolab,$(ECOLAB_HOME)/lib/libecolab.a,$(LIBS)) 
@@ -81,7 +87,7 @@ export GCOV
 export CLASSDESC=$(shell pwd)/ecolab/classdesc/classdesc
 MAKEOVERRIDES+=FPIC=1 CLASSDESC=$(CLASSDESC)
 ifneq ($(MAKECMDGOALS),clean)
-build_ravelcapi:=$(shell cd RavelCAPI; if  $(MAKE) $(JOBS) $(MAKEOVERRIDES) CPLUSPLUS="$(COMPILER)" >build.log 2>&1; then echo "ravelcapi built"; fi) 
+build_ravelcapi:=$(shell cd RavelCAPI; if  $(MAKE) $(JOBS) $(MAKEOVERRIDES) >build.log 2>&1; then echo "ravelcapi built"; fi) 
 $(warning $(build_ravelcapi))
 ifneq ($(strip $(build_ravelcapi)),ravelcapi built)
 $(error Making RavelCAPI failed: check RavelCAPI/build.log)
@@ -285,10 +291,10 @@ endif
 ifdef MXE
 EXE=.exe
 DL=dll
-FLAGS+=-DMXE
+FLAGS+=-DMXE -D_WIN32 -DUSE_UNROLLED -Wa,-mbig-obj
+CXXFLAGS+=-std=c++20
 PYMINSKY=gui-js/dynamic_libraries/pyminsky.pyd
 PYTHONCAPI=ecolab/classdesc/pythonCAPI.o # extra python.lib shims required on Windows
-FLAGS+=-D_WIN32 -DUSE_UNROLLED -Wa,-mbig-obj
 # DLLS that need to be copied into the binary directory
 MXE_DLLS=libboost_thread-mt-x64 libbrotlidec libbrotlicommon libbz2 libcairo-2 \
 libcroco-0 libcrypto-3-x64 \
@@ -302,8 +308,6 @@ libsoci libpq libsqlite
 BINDIR=$(subst bin,$(MXE_PREFIX)/bin,$(dir $(shell which $(CPLUSPLUS))))
 $(warning $(BINDIR))
 DLLS=$(notdir $(wildcard $(MXE_DLLS:%=$(BINDIR)/%*.dll)))
-# Add soci support for RAVELPRO
-#DLLS+=$(wildcard $(BINDIR)/libsoci*.dll) $(BINDIR)/libpq.dll $(BINDIR)/libsqlite3-0.dll
 else
 EXE=
 DL=so
@@ -551,6 +555,9 @@ doc/Ravel/labels.pl: $(wildcard doc/*.tex)
 install-manual: doc/Ravel/labels.pl
 	rsync -r -z --progress --delete doc/minsky.html doc/Ravel $(SF_WEB)/manual
 
+desktop-manual:
+	rsync -r --delete doc/minsky.html doc/Ravel gui-js/minsky-docs
+
 # run this after every full release
 install-release: install-doxydoc install-manual upload-schema
 

doc/Reference.tex

@@ -1468,12 +1468,19 @@ \subsubsection{Linear Regression}\label{Operation:linearRegression}
 
 This operation performs linear regression of the inputs along a named
 dimension. The output has the same rank and x-vector as the $x$ input,
-and consists of the linear fitted $y$ values.
+or the x-vector of the $y$ input, and consists of the linear fitted $y$ values.
 
 The slope and intercept of the fitted line is available as a tooltip.
 
 \noindent\includegraphics[width=\textwidth]{images/linearRegression}
 
+\subsubsection{Bulk Linear Regression}\label{Operation:bulkLinearRegression}
+
+This operation performs elementwise linear regression of the inputs
+along a named dimension. The output has length along the named
+dimension, reporting the slope and intercept of the fitted line, but
+otherwise has the same dimensionality as the $x$ input.
+
 \subsection{Switch}
 
 \label{SwitchIcon}

engine/derivative.cc

@@ -650,6 +650,7 @@ namespace MathDAG
   VECTOR_DERIVATIVE_NOT_IMPLEMENTED(covariance)
   VECTOR_DERIVATIVE_NOT_IMPLEMENTED(correlation)
   VECTOR_DERIVATIVE_NOT_IMPLEMENTED(linearRegression)
+  VECTOR_DERIVATIVE_NOT_IMPLEMENTED(bulkLinearRegression)
   VECTOR_DERIVATIVE_NOT_IMPLEMENTED(sum)
   VECTOR_DERIVATIVE_NOT_IMPLEMENTED(product)
   VECTOR_DERIVATIVE_NOT_IMPLEMENTED(infimum)

engine/equationDisplayRender.cc

@@ -1009,7 +1009,7 @@ namespace MathDAG
           parenthesise(surf, [&](Surface& surf){
             arguments[0][0]->render(surf);
             print(surf.cairo(),",",Anchor::nw);
-            arguments[0][1]->render(surf);
+            arguments[1][0]->render(surf);
           });
         }
       else
@@ -1026,7 +1026,7 @@ namespace MathDAG
           parenthesise(surf, [&](Surface& surf){
             arguments[0][0]->render(surf);
             print(surf.cairo(),",",Anchor::nw);
-            arguments[0][1]->render(surf);
+            arguments[1][0]->render(surf);
           });
         }
       else
@@ -1043,7 +1043,24 @@ namespace MathDAG
           parenthesise(surf, [&](Surface& surf){
             arguments[0][0]->render(surf);
             print(surf.cairo(),",",Anchor::nw);
-            arguments[0][1]->render(surf);
+            arguments[1][0]->render(surf);
+          });
+        }
+      else
+        print(surf.cairo(),"0",Anchor::nw);
+  }      
+
+  template <>
+  void OperationDAG<OperationType::bulkLinearRegression>::render(Surface& surf) const 
+  {
+      if (!arguments.empty() && !arguments[0].empty() && arguments[0][0] &&	  
+          arguments.size()>1 && !arguments[1].empty() && arguments[1][0])
+        {
+          print(surf.cairo(),"bLinReg",Anchor::nw);
+          parenthesise(surf, [&](Surface& surf){
+            arguments[0][0]->render(surf);
+            print(surf.cairo(),",",Anchor::nw);
+            arguments[1][0]->render(surf);
           });
         }
       else

engine/minskyTensorOps.cc

@@ -1111,8 +1111,7 @@ namespace minsky
     }
   };
 
-  // OperationType template parameter is arbitrary, its going to be overridden anyway
-  template <> struct GeneralTensorOp<OperationType::linearRegression>: public ITensor, public OpState
+  struct LinearRegression: public ITensor, public OpState
   {
     TensorPtr x, y;
     std::size_t dimension;
@@ -1151,11 +1150,9 @@ namespace minsky
           hypercube({});
           return;
         }
-      m_index=y->index();
-      hypercube(y->hypercube());
 
       {
-        auto& xv=m_hypercube.xvectors;
+        auto& xv=y->hypercube().xvectors;
         dimension=rank()>1? rank(): 0;
         for (auto i=xv.begin(); i!=xv.end(); ++i)
           if (i->name==args.dimension)
@@ -1171,7 +1168,7 @@ namespace minsky
         }
       else
         {
-          if (rank()>1 && dimension>=rank()) return;
+          if (rank()>1 && dimension>=y->rank()) return;
           // construct x from y's x-vector
           auto tv=make_shared<TensorVal>();
           spreadX=tv;
@@ -1206,14 +1203,33 @@ namespace minsky
 
       assert(sumx.hypercube()==sumy.hypercube());
       assert(sumx.index()==sumy.index());
-
+      this->x=spreadX;
+      this->y=y;
       scale.index(sumx.index());
       scale.hypercube(sumx.hypercube());
       offset.index(sumx.index());
       offset.hypercube(sumx.hypercube());
+    }
 
-      this->x=spreadX;
-      this->y=y;
+    civita::ITensor::Timestamp timestamp() const override {
+      if (!y) return {};
+      if (!x) return y->timestamp();
+      return std::max(x->timestamp(), y->timestamp());
+    }
+
+
+  };
+
+  // OperationType template parameter is arbitrary, its going to be overridden anyway
+  template <> struct GeneralTensorOp<OperationType::linearRegression>: public LinearRegression
+  {
+    void setArguments(const TensorPtr& y, const TensorPtr& x,
+                      const ITensor::Args& args) override
+    {
+      LinearRegression::setArguments(y,x,args);
+      if (!y) return;
+      hypercube(y->hypercube());
+      m_index=y->index();
     }
 
     double operator[](size_t i) const override
@@ -1235,12 +1251,51 @@ namespace minsky
       return scale[0]* (*x)[i]  + offset[0];
     }
 
-    civita::ITensor::Timestamp timestamp() const override {return std::max(x->timestamp(), y->timestamp());}
-
+  };
+
+  // OperationType template parameter is arbitrary, its going to be overridden anyway
+  template <> struct GeneralTensorOp<OperationType::bulkLinearRegression>: public LinearRegression
+  {
+    void setArguments(const TensorPtr& y, const TensorPtr& x,
+                      const ITensor::Args& args) override
+    {
+      LinearRegression::setArguments(y,x,args);
+      if (!y) return;
+      if (dimension>=y->rank())
+        throw_error("Need to specify axis");
+      auto hc=y->hypercube();
+      hc.xvectors[dimension]=civita::XVector("Linear Parameters",{},{"Slope","Intercept"});
+      hypercube(hc);
+      m_index.clear();
+    }
 
+    double operator[](size_t i) const override
+    {
+      if (rank()>1 && dimension>=rank())
+        throw_error("Need to specify axis");
+      if (!x) return nan("");
+      assert(dimension<rank() || scale.size()==1);
+
+      if (timestamp()>m_timestamp) computeScaleAndOffset();
+
+      size_t param=i, hcIdx=0;
+      if (dimension<rank())
+        {
+          auto splitted=hypercube().splitIndex(i);
+          param=splitted[dimension];
+          splitted.erase(splitted.begin()+dimension);
+          hcIdx=scale.hypercube().linealIndex(splitted);
+        }
+      switch (param)
+        {
+        case 0: return scale.atHCIndex(hcIdx);
+        case 1: return offset.atHCIndex(hcIdx);
+        default: return nan("");
+        }
+    }
+
   };
 
-
   template <> struct GeneralTensorOp<OperationType::mean>: public civita::Average {};
   template <> struct GeneralTensorOp<OperationType::stdDev>: public civita::StdDeviation {};
 

engine/node_latex.cc

@@ -399,11 +399,21 @@ namespace MathDAG
     if (!arguments.empty() && !arguments[0].empty() && arguments[0][0] &&
         arguments.size()>1 && !arguments[1].empty() && arguments[1][0])
       return o<<"{\\mathrm{linReg}\\left("<<arguments[0][0]->latex()<<
-        ","<<arguments[1][0]<<"\\right)";
+        ","<<arguments[1][0]->latex()<<"\\right)}";
     return o<<"0";
   }
 
-
+   template <>
+  ostream& OperationDAG<OperationType::bulkLinearRegression>::latex(ostream& o) const
+  {
+    if (!arguments.empty() && !arguments[0].empty() && arguments[0][0] &&
+        arguments.size()>1 && !arguments[1].empty() && arguments[1][0])
+      return o<<"{\\mathrm{bLinReg}\\left("<<arguments[0][0]->latex()<<
+        ","<<arguments[1][0]->latex()<<"\\right)}";
+    return o<<"0";
+  }
+
+
 
   template <>
   ostream& OperationDAG<OperationType::size>::latex(ostream& o) const

engine/node_matlab.cc

@@ -351,6 +351,16 @@ namespace MathDAG
     return o<<"0";
   }
 
+  template <>
+  ostream& OperationDAG<OperationType::bulkLinearRegression>::matlab(ostream& o) const
+  {
+    if (!arguments.empty() && !arguments[0].empty() && arguments[0][0] &&
+        arguments.size()>1 && !arguments[1].empty() && arguments[1][0])
+      return o<<"bLinReg("<<arguments[0][0]->matlab()<<"," <<
+        arguments[1][0]->matlab()<<")";
+    return o<<"0";
+  }
+
   template <>
   ostream& OperationDAG<OperationType::size>::matlab(ostream& o) const
   {

gui-js/apps/minsky-electron/jest.config.ts

@@ -1,22 +1,19 @@
 /* eslint-disable */
+import { createRequire } from 'module';
+const require = createRequire(import.meta.url);
+
 export default {
   displayName: 'minsky-electron',
   preset: '../../jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
   coverageDirectory: '../../coverage/apps/minsky-electron',
   transform: {
-    '^.+\\.(ts|mjs|js|html)$': [
-      'jest-preset-angular',
-      {
-        tsconfig: '<rootDir>/tsconfig.spec.json',
-        stringifyContentPathRegex: '\\.(html|svg)$',
-      },
-    ],
+    '^.+\\.[tj]s$': require.resolve('ts-jest'),
   },
   transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)'],
   snapshotSerializers: [
     'jest-preset-angular/build/serializers/no-ng-attributes',
     'jest-preset-angular/build/serializers/ng-snapshot',
     'jest-preset-angular/build/serializers/html-comment',
   ],
-};
+};

gui-js/apps/minsky-electron/src/app/managers/HelpFilesManager.ts

@@ -5,6 +5,7 @@ abstract class HelpFilesManager {
   private static topicNodeMap: Record<string, string> = {};
 
   public static getHelpFileForType(type: string): string {
+    console.log(this.topicNodeMap);
     if (type in this.topicNodeMap) {
       return this.topicNodeMap[type];
     }
@@ -46,7 +47,7 @@ abstract class HelpFilesManager {
     const buffer = await fsPromises.readFile(fName);
     if (buffer) {
       const contents = buffer.toString();
-      const matches = contents.matchAll(/<A[ \t]+NAME="([^"]*)"/g);
+      const matches = contents.matchAll(/<A[ \t]+ID="([^"]*)"/g);
       for (const match of matches) {
         this.topicNodeMap[match[1]] = `minsky.html?Ravel/${path.basename(fName)}`;
       }

gui-js/jest.config.ts

@@ -2,4 +2,8 @@ import { getJestProjectsAsync } from '@nx/jest';
 
 export default async () => ({
   projects: await getJestProjectsAsync(),
-});
+  // Add any global configurations here if needed
+  transform: {
+    '^.+\\.(ts|mjs|js|html)$': 'jest-preset-angular',
+  },
+});