Skip to content

Rename plausible value variables only if regex does not match display… #122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
konradoberwimmer merged 1 commit into from
Mar 9, 2026
Merged

Rename plausible value variables only if regex does not match display… #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions LSAnalyzer/Services/Rservice.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,7 @@ public bool CreateBIFIEdataObject(string weight, int nmi, string? mivar, ICollec
if (!pvvar.Mandatory)
{
var optionalPvvar = StringFormats.EncapsulateRegex(pvvar.Regex, autoEncapsulatePVvars)!;
var optionalPvExists = EvaluateAndLog("any(grepl('" + optionalPvvar + "', colnames(lsanalyzer_dat_raw)))").AsLogical().First();
var optionalPvExists = _engine?.Evaluate("any(grepl('" + optionalPvvar + "', colnames(lsanalyzer_dat_raw)))").AsLogical().First() ?? false;

if (optionalPvExists)
{
Expand Down Expand Up @@ -593,7 +593,7 @@ public bool CreateBIFIEdataObject(string weight, int nmi, string? mivar, ICollec
return false;
}

foreach (var pvvar in pvvars ?? new Collection<PlausibleValueVariable>())
foreach (var pvvar in (pvvars ?? new Collection<PlausibleValueVariable>()).Where(pvvar => pvvar.Regex != pvvar.DisplayName))
{
EvaluateAndLog($"lsanalyzer_dat_BO$varnames[lsanalyzer_dat_BO$varnames == '{ pvvar.Regex }'] <- '{ pvvar.DisplayName }'");
EvaluateAndLog($"lsanalyzer_dat_BO$variables[lsanalyzer_dat_BO$variables$variable == '{ pvvar.Regex }', c('variable', 'variable_orig')] <- '{pvvar.DisplayName}'");
Expand Down
19 changes: 19 additions & 0 deletions TestLSAnalyzer/Services/TestRservice.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
using System.Threading.Tasks;
using System.Windows;
using CommunityToolkit.Mvvm.Messaging;
using LSAnalyzer.Services.Stubs;

namespace TestLSAnalyzer.Services
{
Expand Down Expand Up @@ -1983,6 +1984,24 @@ public void TestVirtualVariablesFromPVsAreHandledCorrectly()
Assert.NotEmpty(result2);
}

[Fact]
public void TestCreateBIFIEdataObjectDoesRenamePvVars()
{
Logging logger = new();

Rservice rservice = new(logger)
{
RLocation = new Configuration(string.Empty, null, new SettingsServiceStub(), new RegistryService()).GetRLocation() ?? (string.Empty, string.Empty)
};
Assert.True(rservice.Connect(), "R must also be available for tests");
Assert.True(rservice.LoadFileIntoGlobalEnvironment(Path.Combine(AssemblyDirectory, "_testData", "test_pv10_nrep5.sav")));

Assert.True(rservice.CreateBIFIEdataObject("wgt", 10, null, [ new PlausibleValueVariable { DisplayName = "x", Regex = "x", Mandatory = true }, new PlausibleValueVariable { DisplayName = "y", Regex = "y[0-9]+", Mandatory = true } ], "repwgt", 1.0));

Assert.Contains("lsanalyzer_dat_BO$varnames[lsanalyzer_dat_BO$varnames == 'y[0-9]+'] <- 'y'", logger.GetRcode());
Assert.DoesNotContain("lsanalyzer_dat_BO$varnames[lsanalyzer_dat_BO$varnames == 'x'] <- 'x'", logger.GetRcode());
}

public static string AssemblyDirectory
{
get
Expand Down
Loading