Skip to content

Commit c69909b

Browse files
committed
fix tests due to changes in the regularization package
1 parent b796aae commit c69909b

File tree

8 files changed

+4844
-1441
lines changed

8 files changed

+4844
-1441
lines changed

DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Package: jaspRem
22
Type: Package
33
Title: REM
4-
Version: 0.19.0
5-
Date: 2024-06-05
4+
Version: 0.19.3
5+
Date: 2025-03-06
66
Author: JASP Team
77
Website: jasp-stats.org
88
Maintainer: JASP Team <[email protected]>

inst/Description.qml

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,14 @@ Description
66
name : "jaspRem"
77
title : qsTr("REM")
88
description : qsTr("This module offers methods for relational event modeling.")
9-
version : "0.19.0"
9+
version : "0.19.3"
1010
author : "JASP Team"
1111
maintainer : "JASP Team <[email protected]>"
1212
website : "https://jasp-stats.org"
1313
license : "GPL (>= 2)"
1414
icon : "logoFreq.png"
15-
requiresData: false
1615
hasWrappers : false
17-
18-
// GroupTitle
19-
// {
20-
// title: qsTr("")
21-
// icon: "logo.png"
22-
// }
16+
preloadData: false
2317

2418
Analysis
2519
{
@@ -28,19 +22,10 @@ Description
2822
qml: "RelationalEventModeling.qml"
2923
requiresData: true
3024

31-
// icon: "logoFreq.png"
3225
}
3326

3427

3528

3629
}
3730

3831

39-
40-
// GroupTitle
41-
// {
42-
// title: qsTr("")
43-
// icon: "logoBay.png"
44-
// }
45-
46-

inst/qml/.gitkeep

Whitespace-only changes.

inst/qml/RelationalEventModeling.qml

Lines changed: 30 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,25 @@
1-
import QtQuick 2.8
2-
import QtQuick.Layouts 1.3
3-
import QtQuick.Controls 2.12
4-
import JASP.Controls 1.0
5-
import JASP 1.0
1+
//
2+
// Copyright (C) 2013-2018 University of Amsterdam
3+
//
4+
// This program is free software: you can redistribute it and/or modify
5+
// it under the terms of the GNU Affero General Public License as
6+
// published by the Free Software Foundation, either version 3 of the
7+
// License, or (at your option) any later version.
8+
//
9+
// This program is distributed in the hope that it will be useful,
10+
// but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
// GNU Affero General Public License for more details.
13+
//
14+
// You should have received a copy of the GNU Affero General Public
15+
// License along with this program. If not, see
16+
// <http://www.gnu.org/licenses/>.
17+
//
18+
import QtQuick
19+
import QtQuick.Layouts
20+
import QtQuick.Controls
21+
import JASP.Controls
22+
import JASP
623

724
Form
825
{
@@ -11,12 +28,12 @@ Form
1128
{
1229
preferredHeight: 300 * preferencesModel.uiScale
1330
AvailableVariablesList{ name: "allVariables"; id: allVariables}
14-
AssignedVariablesList { name: "timeVariable"; title: qsTr("Time Variable"); suggestedColumns: ["scale","ordinal", "nominal"]; singleVariable: true ; id: assignedVariableTime}
15-
AssignedVariablesList { name: "actorVariableSender"; title: qsTr("Actor Variable Sender"); suggestedColumns: ["scale","ordinal", "nominal"]; singleVariable: true}
16-
AssignedVariablesList { name: "actorVariableReceiver"; title: qsTr("Actor Variable Receiver"); suggestedColumns: ["scale","ordinal", "nominal"]; singleVariable: true}
31+
AssignedVariablesList { name: "timeVariable"; title: qsTr("Time Variable"); allowedColumns: ["scale","ordinal", "nominal"]; singleVariable: true ; id: assignedVariableTime}
32+
AssignedVariablesList { name: "actorVariableSender"; title: qsTr("Actor Variable Sender"); allowedColumns: ["scale","ordinal", "nominal"]; singleVariable: true}
33+
AssignedVariablesList { name: "actorVariableReceiver"; title: qsTr("Actor Variable Receiver"); allowedColumns: ["scale","ordinal", "nominal"]; singleVariable: true}
1734

18-
AssignedVariablesList { name: "weightVariable"; title: qsTr("Weight Variable"); suggestedColumns: ["scale"]; singleVariable: true }
19-
AssignedVariablesList { name: "typeVariable"; title: qsTr("Type Variable"); suggestedColumns: ["nominal"]; singleVariable: true; id:typeVar}
35+
AssignedVariablesList { name: "weightVariable"; title: qsTr("Weight Variable"); allowedColumns: ["scale"]; singleVariable: true }
36+
AssignedVariablesList { name: "typeVariable"; title: qsTr("Type Variable"); allowedColumns: ["nominal"]; singleVariable: true; id:typeVar}
2037

2138
CheckBox
2239
{
@@ -25,9 +42,9 @@ Form
2542
label: qsTr("<b>Start/Sync Analysis</b>")
2643
checked: false
2744
Component.onCompleted:
28-
{
29-
background.color = "#ff8600"
30-
}
45+
{
46+
background.color = "#ff8600"
47+
}
3148
}
3249

3350
}

jaspRem.Rproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
Version: 1.0
2+
ProjectId: 8e9a41af-5996-49ce-982c-f43f73e9958b
23

34
RestoreWorkspace: Default
45
SaveWorkspace: Default

0 commit comments

Comments
 (0)