From 3f0510629e422e979b57d3f93791937912a4183a Mon Sep 17 00:00:00 2001
From: Ian Jauslin <ian@jauslin.org>
Date: Tue, 14 Jun 2022 09:26:07 +0200
Subject: Update to v1.5.

  The update to version 1.5 is rather substantial, and introduces some minor
  backward-incompatibilities:
    * The header "#!symbols" has been replaced by "#!virtual_fields"
    * Multiplying polynomials using the '*' symbol is no longer supported (or,
      rather, the symbolic capabilities of meankondo were enhanced, and the
      syntax has been changed).
    * 'meantools exp' has been removed (its functionality is now handled by
      other means)
    * 'meantoolds derive' has been replaced by 'meantools differentiate'

  * The symbolic capabilities were enhanced: polynomials can now be
    multiplied, added, exponentiated, and their logarithms can be taken
    directly in the configuration file.

  * The flow equation can now be processed after being computed using the
    various "#!postprocess_*" entries.

  * Deprecated kondo_preprocess.

  * Compute the mean using an LU decomposition if possible.

  * More detailed checks for syntax errors in configuration file.

  * Check that different '#!group' entries are indeed uncorrelated.

  * New flags in meankondo: '-p' and '-A'.

  * New tool: meantools expand.

  * Improve conversion to LaTeX using meantools-convert

  * Assign terms randomly to different threads.

  * Created vim files to implement syntax highlighting for configuration
    files.

  * Multiple bug fixes
---
 src/flow.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 65 insertions(+), 8 deletions(-)

(limited to 'src/flow.c')

diff --git a/src/flow.c b/src/flow.c
index b294bb0..10c5ae0 100644
--- a/src/flow.c
+++ b/src/flow.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2015 Ian Jauslin
+Copyright 2015-2022 Ian Jauslin
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -25,14 +25,20 @@ limitations under the License.
 #include "array.h"
 #include "coefficient.h"
 #include "rcc.h"
+#include "grouped_polynomial.h"
 
 
 // compute flow numerically, no exponentials
-int numerical_flow(Grouped_Polynomial flow_equation, RCC init, Labels labels, int niter, int display_mode){
+int numerical_flow(Grouped_Polynomial flow_equation, RCC init, Grouped_Polynomial postprocess_flow_equation, Labels labels, int niter, int display_mode){
   // running coupling contants
   RCC rccs=init;
+  // for printing
+  RCC rcc_print;
   int i,j;
 
+  // init printing rcc
+  init_RCC(&rcc_print, rccs.length);
+
   if(display_mode==DISPLAY_NUMERICAL){
     // print labels
     printf("%5s  ","n");
@@ -42,9 +48,25 @@ int numerical_flow(Grouped_Polynomial flow_equation, RCC init, Labels labels, in
     printf("\n\n");
 
     // print initial values
+    RCC_cpy_noinit(rccs,&rcc_print);
+    if(postprocess_flow_equation.length>0){
+      // ignore constants
+      for(j=0;j<rcc_print.length;j++){
+	if(rcc_print.indices[j]<0){
+	  rcc_print.values[j]=1.;
+	}
+      }
+      evaleq(rcc_print, rcc_print, postprocess_flow_equation);
+    }
     printf("%5d  ",0);
-    for(j=0;j<rccs.length;j++){
-      printf("% 14.7Le  ",rccs.values[j]);
+    for(j=0;j<rcc_print.length;j++){
+      // use constants from rcc
+      if(rcc_print.indices[j]<0){
+	printf("% 14.7Le  ",rccs.values[j]);
+      }
+      else{
+	printf("% 14.7Le  ",rcc_print.values[j]);
+      }
     }
     printf("\n");
   }
@@ -52,12 +74,32 @@ int numerical_flow(Grouped_Polynomial flow_equation, RCC init, Labels labels, in
   for(i=0;i<niter;i++){
     // compute a single step
     step_flow(&rccs, flow_equation);
-    // convert ls to alphas
+
+    // print
+    if(postprocess_flow_equation.length>0){
+      RCC_cpy_noinit(rccs,&rcc_print);
+      // ignore constants
+      for(j=0;j<rcc_print.length;j++){
+	if(rcc_print.indices[j]<0){
+	  rcc_print.values[j]=1.;
+	}
+      }
+      evaleq(rcc_print, rcc_print, postprocess_flow_equation);
+    }
+    else{
+      RCC_cpy_noinit(rccs,&rcc_print);
+    }
     if(display_mode==DISPLAY_NUMERICAL){
       // print the result
       printf("%5d  ",i+1);
-      for(j=0;j<rccs.length;j++){
-	printf("% 14.7Le  ",rccs.values[j]);
+      for(j=0;j<rcc_print.length;j++){
+	// use constants from rcc
+	if(rcc_print.indices[j]<0){
+	  printf("% 14.7Le  ",rccs.values[j]);
+	}
+	else{
+	  printf("% 14.7Le  ",rcc_print.values[j]);
+	}
       }
       printf("\n");
     }
@@ -74,9 +116,24 @@ int numerical_flow(Grouped_Polynomial flow_equation, RCC init, Labels labels, in
   }
 
   if(display_mode==DISPLAY_FINAL){
-    RCC_print(rccs);
+    if(postprocess_flow_equation.length>0){
+      RCC_cpy_noinit(rccs,&rcc_print);
+      // ignore constants
+      for(j=0;j<rcc_print.length;j++){
+	if(rcc_print.indices[j]<0){
+	  rcc_print.values[j]=1.;
+	}
+      }
+      evaleq(rcc_print, rcc_print, postprocess_flow_equation);
+    }
+    else{
+      RCC_cpy_noinit(rccs,&rcc_print);
+    }
+    RCC_print(rcc_print);
   }
 
+  free_RCC(rcc_print);
+
   return(0);
 }
 
-- 
cgit v1.2.3-70-g09d2