Directory branches/budaev/papers/paper-welfare/

Directory Created:
2018-12-07 15:14
Directory Deleted:
2021-01-21 08:24
Total Files:
0
Deleted Files:
4
Lines of Code:
0

[root]/branches/budaev/papers/paper-welfare

Lines of Code

branches/budaev/papers/paper-welfare/ Lines of Code

Developers

Author Changes Lines of Code Lines per Change
sbu062 214 (100.0%) 22569 (100.0%) 105.4

Most Recent Commits

sbu062 2021-01-21 08:24 Rev.: 10188

more convenient when PAPERS go first in folders and lists

0 lines of code changed in 4 files:

  • branches/budaev/papers/paper-welfare: Makefile (del), paper.adoc (del), paper.fodt (del), paper.txt (del)
sbu062 2020-12-17 12:01 Rev.: 10112

v3.8-post-proof: checking proof, fixed refs
References [120-123] in "The link between decision-making and integrated self" were broken, the visible text was not updated due to probably manual edit, while the reference field code was in fact updated. So references in the list were correct but the ref in the text was wrong. At the proof stage I also deleted reference to MacDonald [122] in the manuscript, [270] in the page proof

908 lines of code changed in 2 files:

  • branches/budaev/papers/paper-welfare: paper.fodt (+727 -726), paper.txt (+181 -183)
sbu062 2020-11-16 14:51 Rev.: 9988

v3.8: fixed some refs, added encyclopedia of consciousness for ref. 3

109 lines of code changed in 2 files:

  • branches/budaev/papers/paper-welfare: paper.fodt (+94 -87), paper.txt (+15 -13)
sbu062 2020-11-16 13:38 Rev.: 9987

v3.8: reviewer 3, small fix, refs fix `Science (80-. ).` -> `Science`

710 lines of code changed in 2 files:

  • branches/budaev/papers/paper-welfare: paper.fodt (+703 -746), paper.txt (+7 -7)
sbu062 2020-11-16 12:02 Rev.: 9986

v3.8: recent section numbering style for RSOC

452 lines of code changed in 2 files:

  • branches/budaev/papers/paper-welfare: paper.fodt (+436 -435), paper.txt (+16 -19)
sbu062 2020-11-16 11:52 Rev.: 9985

v3.8: reviewers 1 and 2 fixed comments

967 lines of code changed in 3 files:

  • branches/budaev/papers/paper-welfare: Makefile (+1 -1), paper.fodt (+924 -955), paper.txt (+42 -55)
sbu062 2020-11-10 09:24 Rev.: 9984

use Id tag

508 lines of code changed in 1 file:

  • branches/budaev/papers/paper-welfare: paper.fodt (+508 -453)
sbu062 2020-10-21 07:53 Rev.: 9936

added only notes

14 lines of code changed in 1 file:

  • branches/budaev/papers/paper-welfare: Makefile (+14 -6)
sbu062 2020-10-21 07:43 Rev.: 9935

v3.7: added note on Digital Life Norway

373 lines of code changed in 2 files:

  • branches/budaev/papers/paper-welfare: paper.fodt (+370 -370), paper.txt (+3 -3)
sbu062 2020-10-21 07:26 Rev.: 9934

test placeholder text 0000 for tag in master ODT document

7 lines of code changed in 1 file:

  • branches/budaev/papers/paper-welfare: paper.fodt (+7 -4)
sbu062 2020-10-21 07:22 Rev.: 9933

v3.7: svn style for tag added, no text changed
NOTE: there should be no style changes within the $ Revision $ tag for it to be processed as a whole

748 lines of code changed in 2 files:

  • branches/budaev/papers/paper-welfare: paper.fodt (+747 -886), paper.txt (+1 -2)
sbu062 2020-10-21 07:00 Rev.: 9932

test keywords: revision tag in Title

28 lines of code changed in 1 file:

  • branches/budaev/papers/paper-welfare: paper.fodt (+28 -28)
sbu062 2020-10-21 06:58 Rev.: 9931

test keywords, added revision to properties-comments

465 lines of code changed in 1 file:

  • branches/budaev/papers/paper-welfare: paper.fodt (+465 -447)
sbu062 2020-10-21 06:56 Rev.: 9930

test keywords, there should be no formatting changes within the `$Revision XXX$` tag for it to autoupdate

148 lines of code changed in 1 file:

  • branches/budaev/papers/paper-welfare: paper.fodt (+148 -110)
sbu062 2020-10-21 06:54 Rev.: 9929

test keywords update

497 lines of code changed in 1 file:

  • branches/budaev/papers/paper-welfare: paper.fodt (+497 -437)
sbu062 2020-10-20 22:04 Rev.: 9928

v3.7: reformatted svn tag

88 lines of code changed in 2 files:

  • branches/budaev/papers/paper-welfare: paper.fodt (+87 -87), paper.txt (+1 -1)
sbu062 2020-10-20 21:55 Rev.: 9927

v3.7: added svn tags in tracked files--fodt and txt--works well with tags
`svn propset svn:keywords "Id Date Revision HeadURL LastChangedDate" paper.*`

489 lines of code changed in 2 files:

  • branches/budaev/papers/paper-welfare: paper.fodt (+483 -566), paper.txt (+6 -5)
sbu062 2020-10-20 21:47 Rev.: 9926

test auto-update svn version tag

467 lines of code changed in 1 file:

  • branches/budaev/papers/paper-welfare: paper.fodt (+467 -459)
sbu062 2020-10-20 21:44 Rev.: 9925

test keywords in FODT file

513 lines of code changed in 1 file:

  • branches/budaev/papers/paper-welfare: paper.fodt (+513 -438)
sbu062 2020-10-20 21:23 Rev.: 9924

v3.5: added flat XML tracked version, it is produced by default `make` = `make all` command

920 lines of code changed in 1 file:

  • branches/budaev/papers/paper-welfare: paper.fodt (new 920)
sbu062 2020-10-20 21:22 Rev.: 9923

autogenerate flat XML version for svn version control

12 lines of code changed in 1 file:

  • branches/budaev/papers/paper-welfare: Makefile (+12 -1)
sbu062 2020-10-20 21:08 Rev.: 9922

added sleep to wait for libreoffice to complete the conversion: needed because libreoffice starts background job

1 lines of code changed in 1 file:

  • branches/budaev/papers/paper-welfare: Makefile (+1)
sbu062 2020-10-20 21:02 Rev.: 9921

target for fodt conversion

12 lines of code changed in 1 file:

  • branches/budaev/papers/paper-welfare: Makefile (+12)
sbu062 2020-10-20 13:08 Rev.: 9920

v3.7: **weather** fixed
---------------
> Date: Tue, 20 Oct 2020 09:48:29 +0000
> From: Jarl Giske <Jarl.Giske@uib.no>
> To: Sergei Budaev <Sergey.Budaev@uib.no>
> Subject: RE: After the submission
>
> In line 266 you still write weather instead of whether
>
> 😊

2 lines of code changed in 1 file:

  • branches/budaev/papers/paper-welfare: paper.txt (+2 -2)
sbu062 2020-10-20 11:53 Rev.: 9919

v3.7: added ref to HPI in fish, as of referee 3

147 lines of code changed in 1 file:

  • branches/budaev/papers/paper-welfare: paper.txt (+147 -143)
sbu062 2020-10-20 10:07 Rev.: 9918

v3.7: fix refs to Science

6 lines of code changed in 1 file:

  • branches/budaev/papers/paper-welfare: paper.txt (+6 -6)
sbu062 2020-10-20 10:01 Rev.: 9917

v3.7: added emotion papers to avoid impression that no empirical work was done before

126 lines of code changed in 1 file:

  • branches/budaev/papers/paper-welfare: paper.txt (+126 -126)
sbu062 2020-10-19 21:06 Rev.: 9916

v3.7: manual fix `Science (80-. ).`

6 lines of code changed in 1 file:

  • branches/budaev/papers/paper-welfare: paper.txt (+6 -6)
sbu062 2020-10-19 19:54 Rev.: 9915

v3.7: check references

17 lines of code changed in 1 file:

  • branches/budaev/papers/paper-welfare: paper.txt (+17 -17)
sbu062 2020-10-19 15:42 Rev.: 9914

v3.7: small fixes made by Jarl
----------------------
> Date: Mon, 19 Oct 2020 09:06:45 +0000
> From: Jarl Giske <Jarl.Giske@uib.no>
> To: Sergei Budaev <Sergey.Budaev@uib.no>
> Subject: RE: welfare paper v3.7-r9913
>
> Hi sergey,
> A final read-through from me, with just a few suggstions.
> Jarl

11 lines of code changed in 1 file:

  • branches/budaev/papers/paper-welfare: paper.txt (+11 -11)
sbu062 2020-10-16 17:37 Rev.: 9913

v3.7: two new refs added

290 lines of code changed in 1 file:

  • branches/budaev/papers/paper-welfare: paper.txt (+290 -286)
sbu062 2020-10-16 16:06 Rev.: 9912

v3.7: fixed Sigrunn's comment that result in renumbering refs
------------------
> Managing these basic needs in complex unpredictable
> environments is a difficult task [202,203].
This is mentioned several times in the introduction…suggest delete

194 lines of code changed in 1 file:

  • branches/budaev/papers/paper-welfare: paper.txt (+194 -194)
sbu062 2020-10-16 15:51 Rev.: 9911

v3.7: small changes after re-readig

4 lines of code changed in 1 file:

  • branches/budaev/papers/paper-welfare: paper.txt (+4 -4)
sbu062 2020-10-16 15:30 Rev.: 9910

v3.7: fixes after Sigrunn r9908 and r9909

48 lines of code changed in 2 files:

  • branches/budaev/papers/paper-welfare: Makefile (+1 -1), paper.txt (+47 -49)
sbu062 2020-10-16 12:21 Rev.: 9909

v3.5: Sigrunn's part 2
------------
> Date: Thu, 15 Oct 2020 09:53:34 +0000
> From: Sigrunn Eliassen <Sigrunn.Eliassen@uib.no>
> To: Sergei Budaev <Sergey.Budaev@uib.no>
> Cc: Jarl Giske <Jarl.Giske@uib.no>, "Kristiansen, Tore" <torek@hi.no>
> Subject: paper-welfare-v3.5_SE.docx
>
> Sergey,
>
> Sorry for being late with my comments and feedback. Please find my suggestions
> in the two files attached for part 1 - including comments to page 1-4 and
> the other file for the remaining of the ms
>
> sigrunn

35 lines of code changed in 1 file:

  • branches/budaev/papers/paper-welfare: paper.txt (+35 -35)
sbu062 2020-10-16 12:19 Rev.: 9908

v3.5: Sigrunn's part 1
----------
> Date: Thu, 15 Oct 2020 09:53:34 +0000
> From: Sigrunn Eliassen <Sigrunn.Eliassen@uib.no>
> To: Sergei Budaev <Sergey.Budaev@uib.no>
> Cc: Jarl Giske <Jarl.Giske@uib.no>, "Kristiansen, Tore" <torek@hi.no>
> Subject: paper-welfare-v3.5_SE.docx
>
> Sergey,
>
> Sorry for being late with my comments and feedback. Please find my suggestions
> in the two files attached for part 1 - including comments to page 1-4 and
> the other file for the remaining of the ms
>
> sigrunn

47 lines of code changed in 1 file:

  • branches/budaev/papers/paper-welfare: paper.txt (+47 -47)
sbu062 2020-10-13 14:07 Rev.: 9897

v3.6: small fix after Tore
-----------------
> Date: Mon, 12 Oct 2020 14:16:54 +0000
> From: "Kristiansen, Tore" <torek@hi.no>
> To: Sergey Budaev <sergey.budaev@uib.no>
> Cc: Jarl Giske <Jarl.Giske@uib.no>, Sigrunn Eliassen <sigrunn.eliassen@uib.no>
> Subject: RE: Welfare paper -- revision for RSOC
>
> Hi Sergey, all
>
> I think the manuscript looks excellent and very well written, and will be
> an eye-opener for why subjective states are important survival mechanisms.
>
> I have not much to add now, but maybe we should say something
> about "motor prediction errors" (did may movement go as
> predicted?https://www.frontiersin.org/articles/10.3389/fncel.2018.00524/full
> and maybe most important "reward prediction
> errors" (was the behavior worth the effort?
> https://www.cell.com/current-biology/fulltext/S0960-9822%2817%2930266-X)
>
> In the paragraph about signs (about line 130) we could also mention
> "interpretation capacity" and "semiotic freedom"?
>
> "An animal can potentially produce a wide range of responses (including
> ignorance) to any given stimulus depending on its internal model of its
> current state and its surroundings. Signs, like the smell of a predator or
> prey, are stimuli that signify something else than itself [81]. A multitude
> of signs can be found in the environment, some are also sent from the animal
> to other organisms voluntarily or involuntarily, and all organisms live in
> a “semiosphere” of signs (and noise falsely interpreted as signs). It
> is essential for learning and prediction of the future to recognize the
> meaning of important signs among the complex sensory input. This recognition
> or INTERPRETATION CAPCITY (Semiotic freedom) is therefore also essential
> for how RICH THE ANIMAL'S PHENOMENAL WORLD IS and HOW WELL an animal copes
> with its environment, AND will directly impact its welfare IN BOTH POSITIVE
> AND NEGATIVE WAYS[81]." (attached a shorter version of Hoffmeyers theories)
>
> All the best
> Tore

3 lines of code changed in 1 file:

  • branches/budaev/papers/paper-welfare: paper.txt (+3 -3)
sbu062 2020-10-12 12:00 Rev.: 9890

v3.6: refresh and renumber references, after r9886

267 lines of code changed in 1 file:

  • branches/budaev/papers/paper-welfare: paper.txt (+267 -269)
sbu062 2020-10-12 11:54 Rev.: 9889

v3.6: added Jarl's figure legend
--------------------
> On Sat, 10 Oct 2020 10:39:04 +0000
> Jarl Giske <Jarl.Giske@uib.no> wrote:
>
> What about this one? Modified figure and modified legend.
> As simple as possible....
> We should keep in mind that the paper is about wellbeing,
> and wellbeing is what we need to explain.
> The PPT (first sheet) is also attached so you may play
> with the graphics if you want.
> -j

3 lines of code changed in 1 file:

  • branches/budaev/papers/paper-welfare: paper.txt (+3 -3)
sbu062 2020-10-12 11:41 Rev.: 9888

v3.6: accepted Jarl's changes from r9886 with some modifications

54 lines of code changed in 1 file:

  • branches/budaev/papers/paper-welfare: paper.txt (+54 -51)

(132 more)

Generated by StatSVN 0.7.0